Generate the ChangeLog from commit logs.

* scripts/gitlog-to-changelog: New script.  Taken from gnulib.
* scripts/git-log-fix: New file.
* scripts/git-log-footer: New file.
* doc/HACKING: Describe the ChangeLog policy
* ChangeLog: New file.
* Makefile.am (EXTRA_DIST): Add new files.
(gen-ChangeLog): New.
(dist-hook): Run gen-ChangeLog.

Rename all ChangeLog files to ChangeLog-2011.

2 files changed, 25 insertions, 12 deletions

diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog-2011
index cc42a6426..01cca41c3 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-01  Werner Koch  <[email protected]>
+
+	NB: ChangeLog files are no longer manually maintained.  Starting
+	on December 1st, 2011 we put change information only in the GIT
+	commit log, and generate a top-level ChangeLog file from logs at
+	"make dist".  See doc/HACKING for details.
+
 2011-01-20  Werner Koch  <[email protected]>
 
 	* gpgkeys_hkp.c (get_name): Remove test for KS_GETNAME.  It is
@@ -92,7 +99,7 @@
 	* curl-shim.c (curl_easy_init) [HAVE_W32_SYSTEM]: Call it.
 	* gpgkeys_finger.c: s/_WIN32/HAVE_W32_SYSTEM/.
 	(init_sockets): Remove.
-	(connect_server) [HAVE_W32_SYSTEM]: Call new function.  
+	(connect_server) [HAVE_W32_SYSTEM]: Call new function.
 
 2008-04-14  David Shaw  <[email protected]>
 
@@ -105,7 +112,7 @@
 2008-04-07  Werner Koch  <[email protected]>
 
 	* gpgkeys_kdns.c: New.
-	* Makefile.am: Support kdns. 
+	* Makefile.am: Support kdns.
 
 	* no-libgcrypt.c (gcry_strdup): Fix.  It was not used.
 
@@ -117,7 +124,7 @@
 2007-10-25  David Shaw  <[email protected]>  (wk)
 
 	From 1.4 (July):
-	
+
 	* gpgkeys_ldap.c (main): Fix bug in setting up whether to verify
 	peer SSL cert.  This used to work with older OpenLDAP, but is now
 	more strictly handled.
@@ -229,7 +236,7 @@
 	to OpenSSL.  This is considered a bug fix and forgives all
 	possible violations, pertaining to this issue, possibly occured in
 	the past.
-	
+
 	* no-libgcrypt.c: Changed license to a simple all permissive one.
 
 	* Makefile.am (gpg2keys_ldap_LDADD): For license reasons do not
@@ -245,7 +252,7 @@
 	mismatch.
 
 2006-09-19  Werner Koch  <[email protected]>
-	
+
 	* no-libgcrypt.c: New. Taken from ../tools.
 	* Makefile.am: Add no-libgcrypt to all sources.
 
@@ -714,7 +721,7 @@
 
 2004-10-28  Werner Koch  <[email protected]>
 
-	* Makefile.am (other_libs): 
+	* Makefile.am (other_libs):
 
 2004-10-18  David Shaw  <[email protected]>
 
@@ -1346,3 +1353,7 @@
  This file is distributed in the hope that it will be useful, but
  WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+Local Variables:
+buffer-read-only: t
+End:
diff --git a/keyserver/Makefile.am b/keyserver/Makefile.am
index fd046cfc0..884b8eb2d 100644
--- a/keyserver/Makefile.am
+++ b/keyserver/Makefile.am
@@ -1,5 +1,5 @@
 # Makefile.am - Makefile for keyservers
-# Copyright (C) 2001, 2002, 2004, 2005, 2006, 
+# Copyright (C) 2001, 2002, 2004, 2005, 2006,
 #               2009 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
@@ -8,12 +8,12 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # GnuPG is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 ## Process this file with automake to produce Makefile.in
@@ -26,7 +26,9 @@ EXTRA_PROGRAMS = gpg2keys_ldap gpg2keys_hkp gpg2keys_finger gpg2keys_curl \
 		 gpg2keys_kdns
 EXTRA_SCRIPTS = gpg2keys_mailto
 
-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl 
+EXTRA_DIST = ChangeLog-2011
+
+AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl
 
 AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
 
@@ -62,11 +64,11 @@ if FAKE_CURL
 gpg2keys_curl_SOURCES += curl-shim.c curl-shim.h
 gpg2keys_curl_CPPFLAGS = $(AM_CPPFLAGS)
 gpg2keys_curl_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
-	              $(other_libs) 
+	              $(other_libs)
 gpg2keys_hkp_SOURCES += curl-shim.c curl-shim.h
 gpg2keys_hkp_CPPFLAGS = $(AM_CPPFLAGS)
 gpg2keys_hkp_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(DNSLIBS) \
-	             $(other_libs) 
+	             $(other_libs)
 else
 # Note that we need to include all other libs here as well because
 # some compilers don't care about inline functions and insert