[svn] GnuPG - r4895 - in trunk: . g10

[svn author wk]

Author: wk
Date: 2008-12-09 13:32:53 +0100 (Tue, 09 Dec 2008)
New Revision: 4895

Modified:
   trunk/configure.ac
   trunk/g10/ChangeLog
   trunk/g10/gpg.c
Log:
Minor bug fix.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2008-12-09 12:31:22 UTC (rev 4894)
+++ trunk/g10/ChangeLog	2008-12-09 12:32:53 UTC (rev 4895)
@@ -1,5 +1,9 @@
 2008-12-09  Werner Koch  <wk at g10code.com>
 
+	* gpg.c (main) [IS_DEVELOPMENT_VERSION]: Fix strusage use.
+
+2008-12-09  Werner Koch  <wk at g10code.com>
+
 	* keygen.c (proc_parameter_file): Check that key and subkey usages
 	are allowed.
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2008-12-09 12:31:22 UTC (rev 4894)
+++ trunk/configure.ac	2008-12-09 12:32:53 UTC (rev 4895)
@@ -24,8 +24,8 @@
 # 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], 

Modified: trunk/g10/gpg.c
===================================================================
--- trunk/g10/gpg.c	2008-12-09 12:31:22 UTC (rev 4894)
+++ trunk/g10/gpg.c	2008-12-09 12:32:53 UTC (rev 4895)
@@ -2936,15 +2936,15 @@
 	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