[svn] GnuPG - r5421 - in branches/STABLE-BRANCH-1-4: . doc g10 scripts/conf-w32 util

[svn author wk]

Author: wk
Date: 2010-09-23 10:15:45 +0200 (Thu, 23 Sep 2010)
New Revision: 5421

Modified:
   branches/STABLE-BRANCH-1-4/ChangeLog
   branches/STABLE-BRANCH-1-4/NEWS
   branches/STABLE-BRANCH-1-4/README
   branches/STABLE-BRANCH-1-4/configure.ac
   branches/STABLE-BRANCH-1-4/doc/README.W32
   branches/STABLE-BRANCH-1-4/g10/card-util.c
   branches/STABLE-BRANCH-1-4/scripts/conf-w32/bzip2-1.diff
   branches/STABLE-BRANCH-1-4/util/argparse.c
Log:
Preparing a release candidate


Modified: branches/STABLE-BRANCH-1-4/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/ChangeLog	2010-09-16 14:32:38 UTC (rev 5420)
+++ branches/STABLE-BRANCH-1-4/ChangeLog	2010-09-23 08:15:45 UTC (rev 5421)
@@ -1,3 +1,7 @@
+2010-09-23  Werner Koch  <wk at g10code.com>
+
+	Release 1.4.11rc1.
+
 2009-09-02  Werner Koch  <wk at g10code.com>
 
 	Release 1.4.10.

Modified: branches/STABLE-BRANCH-1-4/NEWS
===================================================================
--- branches/STABLE-BRANCH-1-4/NEWS	2010-09-16 14:32:38 UTC (rev 5420)
+++ branches/STABLE-BRANCH-1-4/NEWS	2010-09-23 08:15:45 UTC (rev 5421)
@@ -1,4 +1,4 @@
-Noteworthy changes in version 1.4.11
+Noteworthy changes in version 1.4.11 (unreleased)
 -------------------------------------------------
 
     * Bug fixes.

Modified: branches/STABLE-BRANCH-1-4/README
===================================================================
--- branches/STABLE-BRANCH-1-4/README	2010-09-16 14:32:38 UTC (rev 5420)
+++ branches/STABLE-BRANCH-1-4/README	2010-09-23 08:15:45 UTC (rev 5421)
@@ -1,11 +1,11 @@
 
 		    GnuPG - The GNU Privacy Guard
 		   -------------------------------
-                            Version 1.4.10
+                            Version 1.4.11
 
 	 Copyright 1998, 1999, 2000, 2001, 2002, 2003, 
-                   2004, 2005, 2006, 2007, 2008,
-                   2009  Free Software Foundation, Inc.
+                   2004, 2005, 2006, 2007, 2008, 2009,
+                   2010  Free Software Foundation, Inc.
 
     This file is free software; as a special exception the author
     gives unlimited permission to copy and/or distribute it, with or

Modified: branches/STABLE-BRANCH-1-4/configure.ac
===================================================================
--- branches/STABLE-BRANCH-1-4/configure.ac	2010-09-16 14:32:38 UTC (rev 5420)
+++ branches/STABLE-BRANCH-1-4/configure.ac	2010-09-23 08:15:45 UTC (rev 5421)
@@ -25,8 +25,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 --force" right before creating a distribution.
-m4_define([my_version], [1.4.11])
-m4_define([my_issvn], [yes])
+m4_define([my_version], [1.4.11rc1])
+m4_define([my_issvn], [no])
 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: branches/STABLE-BRANCH-1-4/doc/README.W32
===================================================================
--- branches/STABLE-BRANCH-1-4/doc/README.W32	2010-09-16 14:32:38 UTC (rev 5420)
+++ branches/STABLE-BRANCH-1-4/doc/README.W32	2010-09-23 08:15:45 UTC (rev 5421)
@@ -81,7 +81,7 @@
 
 Until recently all official GnuPG versions have been build using the
 Mingw32/CPD kit as available at
-ftp://ftp.gnupg.org/people/werner/cpd/mingw32-cqpd-0.3.2.tar.gz .
+ftp://ftp.gnupg.org/people/werner/cpd/mingw32-cpd-0.3.2.tar.gz .
 However, for maintenance reasons we switched to Debian's mingw32 cross
 compiler package and that is now the recommended way of building GnuPG
 for W32 platforms.  It might be possible to build it nativly on a W32

Modified: branches/STABLE-BRANCH-1-4/g10/card-util.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/card-util.c	2010-09-16 14:32:38 UTC (rev 5420)
+++ branches/STABLE-BRANCH-1-4/g10/card-util.c	2010-09-23 08:15:45 UTC (rev 5421)
@@ -207,6 +207,9 @@
     case 0x0005: return "ZeitControl";
 
     case 0x002A: return "Magrathea";
+
+    case 0xF517: return "FSIJ";
+
       /* 0x00000 and 0xFFFF are defined as test cards per spec,
          0xFFF00 to 0xFFFE are assigned for use with randomly created
          serial numbers.  */

Modified: branches/STABLE-BRANCH-1-4/scripts/conf-w32/bzip2-1.diff
===================================================================
--- branches/STABLE-BRANCH-1-4/scripts/conf-w32/bzip2-1.diff	2010-09-16 14:32:38 UTC (rev 5420)
+++ branches/STABLE-BRANCH-1-4/scripts/conf-w32/bzip2-1.diff	2010-09-23 08:15:45 UTC (rev 5421)
@@ -1,5 +1,5 @@
 To include support for BZIP2 compression in GunPG for W32, the patch
-below should be applied to a stock bzip2-1.0.2 source.  The Build as
+below should be applied to a stock bzip2-1.0.6 source.  The Build as
 usual using the mingw32 cross compiler package from Debian and install
 the library and header file on top of the cross compiler installation
 (/usr/i586-mingw32msvc/lib/).  Note that for ease of maintenance we

Modified: branches/STABLE-BRANCH-1-4/util/argparse.c
===================================================================
--- branches/STABLE-BRANCH-1-4/util/argparse.c	2010-09-16 14:32:38 UTC (rev 5420)
+++ branches/STABLE-BRANCH-1-4/util/argparse.c	2010-09-23 08:15:45 UTC (rev 5421)
@@ -917,7 +917,7 @@
         break;
       case 11: p = "foo"; break;
       case 13: p = "0.0"; break;
-      case 14: p = "Copyright (C) 2009 Free Software Foundation, Inc."; break;
+      case 14: p = "Copyright (C) 2010 Free Software Foundation, Inc."; break;
       case 15: p =
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n";