diff options
| author | Werner Koch <[email protected]> | 2000-04-10 11:32:38 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2000-04-10 11:32:38 +0000 |
| commit | c6cd141bc06bd3034b72d60cc8494a0065095889 (patch) | |
| tree | 00f69867c9a2564a3a60c5b1cf0f1588dffc3db6 | |
| parent | Script to create a W32 package (diff) | |
| download | gnupg-c6cd141bc06bd3034b72d60cc8494a0065095889.tar.gz gnupg-c6cd141bc06bd3034b72d60cc8494a0065095889.zip | |
See ChangeLog: Mon Apr 10 13:34:19 CEST 2000 Werner Koch
| -rw-r--r-- | TODO | 4 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | g10/ChangeLog | 4 | ||||
| -rw-r--r-- | g10/keyedit.c | 2 | ||||
| -rwxr-xr-x | scripts/mk-w32-dist | 2 |
5 files changed, 14 insertions, 1 deletions
@@ -9,6 +9,10 @@ candidates for a keyblock first and the select one from it. The current code is too ugly (getkey.c). + * Fix localtime() in W32. + + * INFO Kommand um z.B. default-recipients herauszufinden. + Scheduled for 1.1 ----------------- * With option -i prompt before adding a key to the keyring and show some diff --git a/configure.in b/configure.in index a19697c72..290ebbc23 100644 --- a/configure.in +++ b/configure.in @@ -663,6 +663,9 @@ fi AC_SUBST(ZLIBS) +# Allow users to append something to the version string without +# flagging it as development version. The user version parts is +# considered everything after a dash. changequote(,)dnl tmp_pat='[a-zA-Z]' changequote([,])dnl diff --git a/g10/ChangeLog b/g10/ChangeLog index 4841df6ef..c0170606c 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,7 @@ +Mon Apr 10 13:34:19 CEST 2000 Werner Koch <[email protected]> + + * keyedit.c (show_key_with_all_names): s/sbb/ssb/ + Tue Mar 28 14:26:58 CEST 2000 Werner Koch <[email protected]> * trustdb.c (verify_own_keys): Do not print warning about unprotected diff --git a/g10/keyedit.c b/g10/keyedit.c index 2beae7891..17764b543 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -1099,7 +1099,7 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, || (with_subkeys && node->pkt->pkttype == PKT_SECRET_SUBKEY) ) { PKT_secret_key *sk = node->pkt->pkt.secret_key; tty_printf("%s%c %4u%c/%08lX created: %s expires: %s\n", - node->pkt->pkttype == PKT_SECRET_KEY? "sec":"sbb", + node->pkt->pkttype == PKT_SECRET_KEY? "sec":"ssb", (node->flag & NODFLG_SELKEY)? '*':' ', nbits_from_sk( sk ), pubkey_letter( sk->pubkey_algo ), diff --git a/scripts/mk-w32-dist b/scripts/mk-w32-dist index 8d0b1982f..08cdffe41 100755 --- a/scripts/mk-w32-dist +++ b/scripts/mk-w32-dist @@ -10,6 +10,8 @@ if [ -f ../README ]; then srcdir=.. elif [ -f ../../gnupg-stable/README ]; then srcdir=../../gnupg-stable +elif [ -f ../../../gnupg-stable/README ]; then + srcdir=../../../gnupg-stable else echo "cannot figure out the source dir" >&2 exit 1 |