Preparing for 1.3.5V1-3-5

7 files changed, 39 insertions, 32 deletions

diff --git a/ChangeLog b/ChangeLog
index d3f9c7afb..995961c15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-26  Werner Koch  <[email protected]>
+
+	Released 1.3.5.
+
 2004-02-25  David Shaw  <[email protected]>
 
 	* README: Update copyright.
diff --git a/NEWS b/NEWS
index 05d43fbc4..47f51dc91 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Noteworthy changes in version 1.3.5 (unreleased)
+Noteworthy changes in version 1.3.5 (2004-02-26)
 ------------------------------------------------
 
     * New --min-cert-level option to disregard key signatures that are
diff --git a/TODO b/TODO
index b42019a5c..2088ee8ee 100644
--- a/TODO
+++ b/TODO
@@ -1,10 +1,3 @@
-W32:
-
-gpgkeys_ldap.c: In function `ldap_to_gpg_err':
-gpgkeys_ldap.c:97: `LDAP_OPT_ERROR_NUMBER' undeclared (first use in this function)
-gpgkeys_ldap.c:97: (Each undeclared identifier is reported only once
-gpgkeys_ldap.c:97: for each function it appears in.)
-make[2]: *** [gpgkeys_ldap.o] Error 1
 
 
   * Reword the "Not enough entropy" messages.
diff --git a/configure.ac b/configure.ac
index dc8cf3e4e..c5f913cdb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ AC_PREREQ(2.57)
 
 # Remember to change the version number immediately *after* a release
 # and remove the "-cvs" or "rc" suffix immediately *before* a release.
-AC_INIT(gnupg, 1.3.5-cvs, [email protected])
+AC_INIT(gnupg, 1.3.5, [email protected])
 # Set development_version to yes if the minor number is odd or you
 # feel that the default check for a development version is not
 # sufficient.
diff --git a/doc/DETAILS b/doc/DETAILS
index 2a117221c..17ee998e2 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -467,9 +467,13 @@ more arguments in future versions.
         for certain external requests
 
     ERROR <error location> <error code> 
+
         This is a generic error status message, it might be followed
         by error location specific data. <error token> and
-        <error_location> should not contain a space.
+        <error_location> should not contain a space.  The error code
+        is a either a string commencing with a letter or such string
+        prefix with a numerical error code and an underscore; e.g.:
+        "151011327_EOF"
 
     ATTRIBUTE <fpr> <octets> <type> <index> <count>
 	      <timestamp> <expiredate> <flags>
diff --git a/m4/Makefile b/m4/Makefile
index 4a7214bb0..2c2d7c54a 100644
--- a/m4/Makefile
+++ b/m4/Makefile
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
 # m4/Makefile.  Generated from Makefile.in by configure.
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -50,8 +50,8 @@ BUILD_INCLUDED_LIBINTL = no
 CAPLIBS = 
 CATOBJEXT = .gmo
 CC = gcc
-CCDEPMODE = depmode=gcc
-CFLAGS = -g -O2 -Wall -Wcast-align -Wshadow -Wstrict-prototypes
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -Wall -Wcast-align -Wshadow -Wstrict-prototypes -Wformat-nonliteral
 CPP = gcc -E
 CPPFLAGS = 
 CROSS_COMPILING_FALSE = 
@@ -62,7 +62,7 @@ DEFS = -DHAVE_CONFIG_H
 DEPDIR = .deps
 DLLIBS = -ldl 
 DOCBOOK_TO_MAN = yes
-DOCBOOK_TO_TEXI = yes
+DOCBOOK_TO_TEXI = no
 ECHO_C = 
 ECHO_N = -n
 ECHO_T = 
@@ -81,11 +81,13 @@ GLIBC21 = yes
 GMSGFMT = /usr/bin/msgfmt
 GPGKEYS_HKP = gpgkeys_hkp
 GPGKEYS_LDAP = gpgkeys_ldap
+GPGKEYS_LDAP_FALSE = #
+GPGKEYS_LDAP_TRUE = 
 GPGKEYS_MAILTO = gpgkeys_mailto
 HAVE_DOCBOOK_TO_MAN_FALSE = #
 HAVE_DOCBOOK_TO_MAN_TRUE = 
-HAVE_DOCBOOK_TO_TEXI_FALSE = #
-HAVE_DOCBOOK_TO_TEXI_TRUE = 
+HAVE_DOCBOOK_TO_TEXI_FALSE = 
+HAVE_DOCBOOK_TO_TEXI_TRUE = #
 HAVE_DOSISH_SYSTEM_FALSE = 
 HAVE_DOSISH_SYSTEM_TRUE = #
 IDEA_O = idea-stub.o
@@ -105,6 +107,7 @@ LIBINTL =
 LIBOBJS = 
 LIBS = 
 LIBUSB_LIBS =  -lusb
+LN_S = ln -s
 LTLIBICONV = 
 LTLIBINTL = 
 LTLIBOBJS = 
@@ -124,9 +127,9 @@ OBJEXT = o
 PACKAGE = gnupg
 PACKAGE_BUGREPORT = [email protected]
 PACKAGE_NAME = gnupg
-PACKAGE_STRING = gnupg 1.3.4
+PACKAGE_STRING = gnupg 1.3.5-cvs
 PACKAGE_TARNAME = gnupg
-PACKAGE_VERSION = 1.3.4
+PACKAGE_VERSION = 1.3.5-cvs
 PATH_SEPARATOR = :
 PERL = /usr/bin/perl
 POSUB = po
@@ -140,7 +143,7 @@ SRVLIBS = -lresolv
 STRIP = 
 USE_INCLUDED_LIBINTL = no
 USE_NLS = yes
-VERSION = 1.3.4
+VERSION = 1.3.5-cvs
 W32LIBS = 
 WORKING_FAQPROG_FALSE = #
 WORKING_FAQPROG_TRUE = 
@@ -150,8 +153,8 @@ ac_ct_AR = ar
 ac_ct_CC = gcc
 ac_ct_RANLIB = ranlib
 ac_ct_STRIP = 
-am__fastdepCC_FALSE = 
-am__fastdepCC_TRUE = #
+am__fastdepCC_FALSE = #
+am__fastdepCC_TRUE = 
 am__include = include
 am__leading_dot = .
 am__quote = 
@@ -193,7 +196,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
-DIST_COMMON = ChangeLog Makefile.am Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am
 all: all-am
 
 .SUFFIXES:
@@ -257,7 +260,7 @@ install-am: all-am
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -265,7 +268,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -275,7 +278,7 @@ clean: clean-am
 clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
@@ -297,7 +300,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
diff --git a/m4/Makefile.in b/m4/Makefile.in
index e0734bcd4..8d6b724b1 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.6 from Makefile.am.
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -81,6 +81,8 @@ GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
 GPGKEYS_HKP = @GPGKEYS_HKP@
 GPGKEYS_LDAP = @GPGKEYS_LDAP@
+GPGKEYS_LDAP_FALSE = @GPGKEYS_LDAP_FALSE@
+GPGKEYS_LDAP_TRUE = @GPGKEYS_LDAP_TRUE@
 GPGKEYS_MAILTO = @GPGKEYS_MAILTO@
 HAVE_DOCBOOK_TO_MAN_FALSE = @HAVE_DOCBOOK_TO_MAN_FALSE@
 HAVE_DOCBOOK_TO_MAN_TRUE = @HAVE_DOCBOOK_TO_MAN_TRUE@
@@ -105,6 +107,7 @@ LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBUSB_LIBS = @LIBUSB_LIBS@
+LN_S = @LN_S@
 LTLIBICONV = @LTLIBICONV@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
@@ -193,7 +196,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
-DIST_COMMON = ChangeLog Makefile.am Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in ChangeLog Makefile.am
 all: all-am
 
 .SUFFIXES:
@@ -257,7 +260,7 @@ install-am: all-am
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -265,7 +268,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -275,7 +278,7 @@ clean: clean-am
 clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-generic
 
 dvi: dvi-am
@@ -297,7 +300,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am