Minor bug fix.
authorWerner Koch <wk@gnupg.org>
Tue, 9 Dec 2008 12:32:53 +0000 (12:32 +0000)
committerWerner Koch <wk@gnupg.org>
Tue, 9 Dec 2008 12:32:53 +0000 (12:32 +0000)
configure.ac
g10/ChangeLog
g10/gpg.c

index fa66e60..ec5361c 100644 (file)
@@ -24,8 +24,8 @@ min_automake_version="1.10"
 # Remember to change the version number immediately *after* a release.
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
-m4_define([my_version], [2.0.10rc1])
-m4_define([my_issvn], [no])
+m4_define([my_version], [2.0.10])
+m4_define([my_issvn], [yes])
 m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
           | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
 AC_INIT([gnupg], 
index 22d2397..979a681 100644 (file)
@@ -1,5 +1,9 @@
 2008-12-09  Werner Koch  <wk@g10code.com>
 
+       * gpg.c (main) [IS_DEVELOPMENT_VERSION]: Fix strusage use.
+
+2008-12-09  Werner Koch  <wk@g10code.com>
+
        * keygen.c (proc_parameter_file): Check that key and subkey usages
        are allowed.
 
index 9af97fb..4e72b87 100644 (file)
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2936,15 +2936,15 @@ main (int argc, char **argv)
        fprintf(stderr, "%s\n", strusage(15) );
     }
 #ifdef IS_DEVELOPMENT_VERSION
-    if( !opt.batch )
+    if (!opt.batch)
       {
        const char *s;
 
-       if((s=strusage(20)))
+       if((s=strusage(25)))
          log_info("%s\n",s);
-       if((s=strusage(21)))
+       if((s=strusage(26)))
          log_info("%s\n",s);
-       if((s=strusage(22)))
+       if((s=strusage(27)))
          log_info("%s\n",s);
       }
 #endif