Preparing a release candidate

8 files changed, 16 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 81c1205a8..b587598a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-23  Werner Koch  <[email protected]>
+
+	Release 1.4.11rc1.
+
 2009-09-02  Werner Koch  <[email protected]>
 
 	Release 1.4.10.
diff --git a/NEWS b/NEWS
index 480865df2..173166e7e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Noteworthy changes in version 1.4.11
+Noteworthy changes in version 1.4.11 (unreleased)
 -------------------------------------------------
 
     * Bug fixes.
diff --git a/README b/README
index 9d6160595..cc555496b 100644
--- a/README
+++ b/README
@@ -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
diff --git a/configure.ac b/configure.ac
index ac00b3f75..8639fc90b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,8 +25,8 @@ min_automake_version="1.9.3"
 # 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], 
diff --git a/doc/README.W32 b/doc/README.W32
index 8abfc24a7..7c9fe9ce1 100644
--- a/doc/README.W32
+++ b/doc/README.W32
@@ -81,7 +81,7 @@ How to build GnuPG from the source:
 
 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
diff --git a/g10/card-util.c b/g10/card-util.c
index 9bd5013a1..caf934dd2 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -207,6 +207,9 @@ get_manufacturer (unsigned int no)
     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.  */
diff --git a/scripts/conf-w32/bzip2-1.diff b/scripts/conf-w32/bzip2-1.diff
index 60036d07f..0f1576508 100644
--- a/scripts/conf-w32/bzip2-1.diff
+++ b/scripts/conf-w32/bzip2-1.diff
@@ -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
diff --git a/util/argparse.c b/util/argparse.c
index 2f1c6d250..cc4b2125b 100644
--- a/util/argparse.c
+++ b/util/argparse.c
@@ -917,7 +917,7 @@ default_strusage( int level )
         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";