[git] GPGME - branch, master, updated. gpgme-1.3.1-3-ga4c4ee1

by Werner Koch cvs at cvs.gnupg.org
Fri Dec 2 12:28:39 CET 2011


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  a4c4ee1aaea4359432bdf60dd572f549ef8dee83 (commit)
      from  3ddf4c3d4000a9b0b52180c3aa3acf1387a193bf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a4c4ee1aaea4359432bdf60dd572f549ef8dee83
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Dec 2 11:32:31 2011 +0100

    Generate the ChangeLog from commit logs.
    
    * build-aux/gitlog-to-changelog: New script.  Taken from gnulib.
    * build-aux/git-log-fix: New file.
    * build-aux/git-log-footer: New file.
    * build-aux/git-hook/commit-msg: New script.
    * doc/HACKING: New file.
    * ChangeLog: New file.
    * Makefile.am (EXTRA_DIST): Add new files.
    (gen-ChangeLog): New.
    (dist-hook): Run gen-ChangeLog.
    * autogen.sh: Install commit-msg hook for git.
    
    Rename all ChangeLog files to ChangeLog-2011.

diff --git a/.gitignore b/.gitignore
index 0b336ea..983abda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,8 @@
 /config.h.in
 /configure
 Makefile.in
+/doc/gpgme.info
+/doc/gpgme.info-1
+/doc/gpgme.info-2
+/doc/stamp-vti
+/doc/version.texi
diff --git a/ChangeLog b/ChangeLog
index e8cb265..dda15a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,1030 +1,16 @@
-2011-10-25  Marcus Brinkmann  <marcus at g10code.com>
+No more ChangeLog files
+========================
 
-	* m4/pth.m4: Removed.
-	* configure.ac: Remove check for pth and automake conditional
-	HAVE_PTH.
+Do not modify any of the ChangeLog files in GPGME.  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"
+time.  As such, there are strict requirements on the form of the
+commit log messages.  See doc/HACKING for details.  The old ChangeLog
+files have all be renamed to ChangeLog-2011.
 
-2011-06-16  Marcus Brinkmann  <marcus at g10code.com>
 
-	Release 1.3.1
 
-	* configure.ac: Set LT version to C19/A8/R0.
-
-2011-05-06  Marcus Brinkmann  <marcus at g10code.com>
-
-	* Makefile.am (SUBDIRS): Remove complus.
-
-	* configure.ac (AC_CONFIG_FILES): Remove complus/Makefile.
-	(BUILD_COMPLUS): Remove AM_CONDITIONAL.
-	* complus/: Remove very old and stale component.
-
-	* acinclude.m4 (GNUPG_FIX_HDR_VERSION): Remove.
-
-2011-04-14  Werner Koch  <wk at g10code.com>
-
-	* configure.ac: Require automake 1.11.
-
-2011-04-06  Werner Koch  <wk at g10code.com>
-
-	* autogen.sh (--build-w32): Support option --build-w64.
-	* configure.ac (HAVE_W64_SYSTEM): Define.
-	(INSERT__TYPEDEFS_FOR_GPGME_H): New.
-	(GPGME_CONFIG_HOST): New.
-
-2011-02-02  Marcus Brinkmann  <mb at g10code.com>
-
-	* configure.ac (NEED_LIBASSUAN_VERSION): Bump to 2.0.2 for system hooks.
-
-2010-12-30  Werner Koch  <wk at g10code.com>
-
-	* configure.ac: Support a git revision.
-
-2010-11-03  Werner Koch  <wk at g10code.com>
-
-	* configure.ac (AC_CHECK_HEADERS): Check for sys/types.h and
-	sys.stat.h.
-
-2010-11-02  Werner Koch  <wk at g10code.com>
-
-	* configure.ac (AC_CHECK_HEADERS): Check for sys.time.h.
-
-2010-08-19  Werner Koch  <wk at g10code.com>
-
-	* configure.ac (AH_BOTTOM): Define GPG_ERR_ENABLE_ERRNO_MACROS.
-
-2010-05-12  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Check for setlocale.
-
-2010-05-07  Werner Koch  <wk at g10code.com>
-
-	* configure.ac: Change checks to always require libassuan.
-
-2010-05-07  Marcus Brinkmann  <marcus at g10code.de>
-
-	* autogen.sh: Update the thing.
-
-	* configure.ac: Check for locale.h.
-
-2010-05-06  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Detect Windows CE.
-	(HAVE_W32CE_SYSTEM): New symbol and automake conditional.
-	* ltmain.sh, m4/libtool.m4: Patch so that it works for Windows CE.
-
-	* configure.ac: Require libgpg-error 1.8.
-
-2010-03-15  Werner Koch  <wk at g10code.com>
-
-	* configure.ac (emacs_local_vars_begin)
-	(emacs_local_vars_read_only, emacs_local_vars_end): New.
-
-2010-01-22  Werner Koch  <wk at g10code.com>
-
-	* autogen.sh (--build-w32): Add --with-libassuan-prefix.
-
-2010-01-11  Marcus Brinkmann  <marcus at g10code.de>
-
-	Release 1.3.0.
-
-2009-12-22  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Do not use echo -n.  Test for __thread.
-
-2009-12-17  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Make largefile check more robust.
-
-2009-12-10  Werner Koch  <wk at g10code.com>
-
-	* configure.ac: Check for getgid and getegid.
-
-2009-12-08  Marcus Brinkmann  <marcus at g10code.de>
-
-	Update to libtool 2.2.6a.
-	* configure.ac: Invoke AC_CONFIG_MACRO_DIR.
-	(AC_LIBTOOL_WIN32_DLL, AC_LIBTOOL_RC): Replace by ...
-	(LT_PREREQ, LT_INIT, LT_LANG): ... these.
-	* config.guess, config.sub, install-sh, ltmain.sh, m4/libtool.m4:
-	Updated to libtool 2.2.6a.
-	* m4/ltoptions.m4, m4/ltsugar.m4, m4/ltversion.m4,
-	m4/lt~obsolete.m4: New files from libtool 2.2.6a.
-
-2009-11-10  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Activate UIServer if FD passing is enabled and
-	Assuan is available.
-
-2009-10-30  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Check for argp.h and error_t.
-
-2009-10-26  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac (NEED_GPG_VERSION_DEFAULT): Bump to 1.4.0 as 1.3.0
-	was development versions only.
-
-2009-10-22  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Add support for G13.
-
-2009-10-20  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac (AC_CONFIG_FILES): Remove assuan/Makefile.
-
-2009-10-20  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Replace internal libassuan by external libassuan.
-	* m4/libassuan.m4: New file.
-	* Makefile.am (assuan): Remove variable.
-	(SUBDIRS): Remove ${assuan}.
-	* assuan/: Removed.
-
-2009-06-22  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Add AC_TYPE_UINTPTR_T.
-
-	* assuan/assuan.h [_ASSUAN_IN_GPGME_BUILD_ASSUAN]: Declare
-	_gpgme_io_connect.
-
-2009-06-18  Marcus Brinkmann  <marcus at g10code.de>
-
-	Released GPGME 1.2.0.
-
-	* configure.ac (my_version): Set to 1.2.0.
-	(LIBGPGME_LT_CURRENT, LIBGPGME_LT_AGE): Bump.
-	(LIBGPGME_LT_REVISION): Reset.
-
-2009-05-05  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Add infrastructure for compile time check of
-	_FILE_OFFSET_BITS.
-
-2009-04-19  Moritz  <moritz at gnu.org>
-
-	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Specify --with-gpg.
-
-2009-03-06  Marcus Brinkmann  <marcus at g10code.de>
-
-	* assuan/: Update to libassuan SVN 2009-03-06.
-
-2009-01-26  Werner Koch  <wk at g10code.com>
-
-	* configure.ac (AC_CONFIG_FILES): Add tests/opassuan/Makefile.
-
-2008-12-08  Marcus Brinkmann  <marcus at g10code.de>
-
-	Release GPGME 1.1.8.
-
-	* configure.ac: Bump API revision.
-
-2008-11-03  Marcus Brinkmann  <marcus at g10code.com>
-
-	* configure.ac: Replace gpgme paths with src.
-	* gpgme: Move to ...
-	* src: ... this new directory.
-
-2008-10-20  Werner Koch  <wk at g10code.com>
-
-	* configure.ac (AC_CONFIG_FILES): Add gpgme.h.
-	(GNUPG_FIX_HDR_VERSION): Remove.
-
-2008-10-17  Marcus Brinkmann  <marcus at g10code.com>
-
-	Release GPGME 1.1.7.
-
-	* configure.ac (LIBGPGME_LT_REVISION): Bump for release.
-
-2008-09-19  Moritz  <moritz at gnu.org>
-
-	* configure.ac: Remove bogus "esac".
-
-2008-09-16  Marcus Brinkmann  <marcus at g10code.com>
-
-	* configure.ac (_XOPEN_SOURCE) [apple-darwin]: Define it.
-
-2008-07-04  Werner Koch  <wk at g10code.com>
-
-	* config.guess, config.sub: Update to 2007-11-19.  Also update
-	missing et al scripts.
-
-2008-04-01  Werner Koch  <wk at g10code.com>
-
-	* configure.ac (AC_INIT): Fix quoting.
-
-2008-01-30  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Bump required version of automake up to 1.10.
-	* autogen.sh: Fix aclocal check.
-
-2008-01-04  Marcus Brinkmann  <marcus at g10code.de>
-
-	Release GPGME 1.1.6.
-
-	* configure.ac: Support gpgconf.
-
-2007-09-27  Marcus Brinkmann  <marcus at g10code.de>
-
-	* assuan-pipe-connect.c (pipe_connect_gpgme): Do not close process
-	handle here.  Use this function also on Unix systems.
-
-	* assuan-pipe-connect.c (pipe_connect_gpgme): Fix last change.
-
-	* assuan-pipe-connect.c (pipe_connect_gpgme): New function, use it
-	if _ASSUAN_IN_GPGME_BUILD_ASSUAN.
-
-2007-09-17  Werner Koch  <wk at g10code.com>
-
-	* configure.ac: Use the svn version magic.
-
-2007-09-07  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Check for C++, Qt and support --enable-w32-qt.
-	* m4/pkg.m4: New file.
-
-2007-08-21  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac (--enable-w32-glib): Use --enableval, not
-	--withval.
-
-2007-07-16  Marcus Brinkmann  <marcus at g10code.de>
-
-	* assuan/assuan-socket.c (_assuan_close): Always use close().
-	* assuan/assuan.h (_gpgme_io_close): New prototype.
-	(close): New macro, define as _gpgme_io_close.
-
-2007-07-13  Marcus Brinkmann  <marcus at g10code.de>
-
-	* assuan/assuan-io.c (_assuan_simple_read, _assuan_simple_write):
-	Always use read/write (which means _gpgme_io_read and
-	_gpgme_io_write).
-
-2007-07-09  Marcus Brinkmann  <marcus at g10code.de>
-
-	Released 1.1.5.
-
-	* configure.ac (LIBGPGME_LT_REVISION): Bump for release.
-
-2007-07-08  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac (GPGSM_DEFAULT) [*-mingw32*]: Initialize it.
-	(HAVE_ASSUAN_H): Set to 1 if we have it.
-	(funopen): Use AC_REPLACE_FUNCS.
-	(USE_DESCRIPTOR_PASSING): Define to 1 if we have it.  Do not
-	define it at all if we don't.
-	(NETLIBS) [have_w32_system]: Add -lws2_32.
-	(DIRSEP_C, DIRSEP_S, EXPSEP_C, EXPSEP_S, PATHSEP_S)
-	[HAVE_DOSISH_SYSTEM]: Remove definitions.
-
-	* assuan/assuan.h (_assuan_funopen): Define to _gpgme_funopen.
-	* assuan/funopen.c: Move to ../gpgme/funopen.c.
-	* assuan/Makefile.am (libassuan_la_SOURCES): Remove funopen.c.
-
-2007-07-04  Marcus Brinkmann  <marcus at g10code.de>
-
-	* assuan/Makefile.am (INCLUDES): Include $(top_srcdir)/gpgme.
-	* assuan/assuan.h: Include <ath.h> instead of trying to duplicate
-	the definitions.
-
-	* assuan/: Update files to 2007-07-04 version of assuan.
-
-	* autogen.sh: Use = not == in test.
-
-2007-03-05  Werner Koch  <wk at g10code.com>
-
-	Released 1.1.4.
-
-	* configure.ac (LIBGPGME_LT_REVISION): Bump for release.
-
-	* autogen.sh: New option --force.
-
-2007-01-29  Marcus Brinkmann  <marcus at g10code.de>
-
-	Released 1.1.3.
-
-	* configure.ac (LIBGPGME_LT_REVISION): Bump for release.
-
-2007-01-26  Werner Koch  <wk at g10code.com>
-
-	* configure.ac: Changed gpg and gpgsm version checks to work with
-	arbitrary names of the gpg binary. New option --disable-gpg-test
-	and --disable-gpgsm-test.
-
-2007-01-09  Werner Koch  <wk at g10code.com>
-
-	* configure.ac (NEED_GPG_VERSION, NEED_GPGSM_VERSION): Must define
-	after it may have been changed by an option.
-
-2007-01-08  Werner Koch  <wk at g10code.com>
-
-	* configure.ac: Require gpg-error 1.4 due to the use of
-	gpg_error_from_syserror.
-	(HAVE_ASSUAN_H): New.
-
-2007-01-05  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Add options --with-gpg-version and
-	--with-gpgsm-version to allow overriding the minimum version
-	requirements.
-
-2006-12-17  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Fix two typos in last change.
-
-2006-12-03  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Use descriptor passing only if --enable-fd-passing
-	is provided.
-
-	* configure.ac: Add check for use of descriptor passing.
-
-2006-11-29  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac (NEED_GPG_VERSION): Bump to 1.3.0.
-
-2006-09-19  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Turn stpcpy into a replacement function.
-	Check for unistd.h and add setenv as replacement function.
-
-2006-07-29  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Check for network libraries and set NETLIBS.
-
-2006-07-06  Marcus Brinkmann  <marcus at g10code.de>
-
-	* lang, lang/cl: New subdirectories.
-	* lang/Makefile.am, lang/README: New files.
-	* configure.ac (AC_CONFIG_FILES): Add lang/Makefile,
-	lang/cl/Makefile and lang/cl/gpgme.asd.
-	* Makefile.am (SUBDIRS): Add lang.
-
-2006-03-02  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac (LIBGPGME_LT_REVISION): Bump for release.
-
-2006-02-22  Marcus Brinkmann  <marcus at g10code.de>
-
-	Released 1.1.1.
-
-	* configure.ac (LIBGPGME_LT_CURRENT, LIBGPGME_LT_AGE): Bump for
-	release.
-	(LIBGPGME_LT_REVISION): Reset to 0 for release.
-
-2006-01-05  Werner Koch  <wk at g10code.com>
-
-	* configure.ac: Test for inline feature.
-	(AH_BOTTOM): New to define the pure attribute.
-
-2006-01-03  Werner Koch  <wk at g10code.com>
-
-	* configure.ac: Append SVN revision to the version.
-
-2005-11-18  Werner Koch  <wk at g10code.com>
-
-	* configure.ac (BUILD_REVISION): New.
-
-2005-11-17  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Add support for --enable-w32-glib (disabled by
-	default).  Invoke AM_PATH_GLIB_2_0.
-
-2005-11-16  Werner Koch  <wk at g10code.com>
-
-	* configure.ac (CFLAGS) [W32]: Make sure that -mms-bitfields are used.
-
-2005-11-15  Werner Koch  <wk at g10code.com>
-
-	* configure.ac: Create BUILD_FILEVERSION from SVN Revision.
-
-	* autogen.sh [W32]: Build shared and static versions of the library.
-
-2005-10-20  Marcus Brinkmann  <marcus at g10code.de>
-
-	* w32-dll/ChangeLog, w32-dll/build-dll, w32-dll/gpgme.def: Remove
-	files.
-
-	* configure.ac: Instead checking for windres and dlltool, invoke
-	AC_LIBTOOL_WIN32_DLL and AC_LIBTOOL_RC.
-	* src/Makefile.am [HAVE_W32_SYSTEM]: Use libtool, which simplifies
-	the rules.
-
-2005-10-01  Marcus Brinkmann  <marcus at g10code.de>
-
-	Released 1.1.0.
-
-	* configure.ac (LIBGPGME_LT_CURRENT, LIBGPGME_LT_AGE): Bump for
-	release.
-	(LIBGPGME_LT_REVISION): Reset to 0 for release.
-
-2005-09-12  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac (HAVE_PTH): Don't add $PTH_CFLAGS to $CFLAGS here.
-
-2005-08-26  Werner Koch  <wk at g10code.com>
-
-	* configure.ac (SEPCONSTANTS): New to define DIRSEP_C et al.
-
-2005-08-19  Werner Koch  <wk at g10code.com>
-
-	* configure.ac [W32]: Create values for versioninfo.rc and list
-	substuture versioninfo.rc.
-	* configure.ac: Define ENABLE_GPGSM.
-
-2005-08-08  Werner Koch  <wk at g10code.com>
-
-	* configure.ac (stpcpy): Changed from replace to test.
-
-2005-03-24  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac (AH_BOTTOM): Removed.
-
-2005-03-09  Werner Koch  <wk at g10code.com>
-
-	* acinclude.m4 (GNUPG_CHECK_VA_COPY): Assume no when cross-compiling.
-
-	* Makefile.am (EXTRA_DIST): Include autogen.sh
-
-	* autogen.sh: Added the usual code to build for W32 (--build-w32).
-
-	* configure.ac: Fixed the mingw32 host string, removed OS/2 stuff.
-	(HAVE_DRIVE_LETTERS): Removed.
-	(HAVE_W32_SYSTEM): Added.
-	(AC_GNU_SOURCE): New to replace the identical AH_VERBATIM.
-	(AH_BOTTOM): Added.
-
-2004-12-28  Werner Koch  <wk at g10code.com>
-
-	Released 1.0.2.
-
-	* Makefile.am (AUTOMAKE_OPTIONS): Build bzip 2 version.
-	(ACLOCAL_AMFLAGS): Add -I m4.
-	* configure.ac: Require automake 1.9.3 and autoconf 2.59.
-	* acinclude.m4: Changed quoting for automake 1.9.
-	* README: Use SHA1 instead of MD5.
-
-2004-12-11  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Replace ttyname_r if it doesn't exist (and warn in
-	that case).
-
-2004-12-07  Marcus Brinkmann  <marcus at g10code.de>
-
-	* README: Refer to COPYING.LESSER and "each file" instead of
-	COPYING.
-	* COPYING.LESSER: New file.
-	* gpgme.spec.in (%doc): Add COPYING.LESSER.
-	* acinclude.m4, configure.ac, Makefile.am: Change license to LGPL
-	2.1 or later.
-	* TODO: Add copyright notice.
-	* README.CVS: Likewise.
-
-	* configure.ac (GPGSM_VERSION): Fix filter to get it.
-
-2004-10-22  Marcus Brinkmann  <marcus at g10code.de>
-
-	Released 1.0.1.
-
-	* configure.ac (LIBGPGME_LT_REVISION): Bump up to 2.
-	(AC_INIT): Set version to 1.0.1.
-
-	* configure.ac: Set HAVE_GPGSM to true only if $GPGSM is not "no".
-
-2004-09-30  Marcus Brinkmann  <marcus at g10code.de>
-
-	Released 1.0.0.
-
-	* configure.ac (LIBGPGME_LT_REVISION): Bump up to 1.
-	(AC_INIT): Set version to 1.0.0.
-
-	* Makefile.am (EXTRA_DIST): Remove README-alpha.
-	* README-alpha: Remove file.
-
-2004-09-17  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Disable AC_CONFIG_MACRO_DIR for now.
-
-2004-09-14  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Improve diagnostics with version check.
-
-	* configure.ac: Print diagnostics about found thread libraries at
-	the end.  Check for the versions of GPG and GPGSM and print the
-	found versions at the end.
-	(HAVE_GPGSM): Do not require GPGSM to exist and be readable.
-	(AC_CONFIG_MACRO_DIR): Invoke with argument m4.
-
-	* acinclude.m4: Add copyright notice.
-	(jm_GLIBC21, AM_PATH_GPG_ERROR, _AC_PTH_ERROR, _AC_PTH_VERBOSE,
-	AC_CHECK_PTH): Removed.
-
-2004-06-23  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Check for <sys/uio.h>.
-
-2004-06-08  Marcus Brinkmann  <marcus at g10code.de>
-
-	Released 0.9.0.
-
-	* configure.ac (AC_INIT): Set version number to 0.9.0.
-	(LIBGPGME_LT_CURRENT, LIBGPGME_LT_AGE): Bump up by one.
-	(LIBGPGME_LT_REVISION): Reset to zero.
-
-2004-05-21  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac (GPGME_CONFIG_API_VERSION): New variable,
-	substitute it.
-
-2004-04-29  Marcus Brinkmann  <marcus at g10code.de>
-
-	Released 0.4.7.
-
-	* configure.ac (LIBGPGME_LT_REVISION): Bump it up.
-
-2004-04-02  Thomas Schwinge  <schwinge at nic-nac-project.de>
-
-	* autogen.sh: Added ACLOCAL_FLAGS.
-
-2004-04-06  Werner Koch  <wk at gnupg.org>
-
-	Released 0.4.6.
-
-	* config.guess, config.sub, ltmain.sh: Updated to those from
-	libtools 1.5.4.
-
-2004-03-07  Marcus Brinkmann  <marcus at g10code.de>
-
-	Released 0.4.5.
-
-	* configure.ac (NEED_GPGSM_VERSION): Bump up to 1.9.6.
-
-	* Makefile.am (EXTRA_DIST): Remove autogen.sh and README.CVS.
-
-2004-02-18  Werner Koch  <wk at gnupg.org>
-
-	* configure.ac: Make the check for funopen fail with just a
-	warning.
-
-2004-02-11  Werner Koch  <wk at gnupg.org>
-
-	* autogen.sh (check_version): Removed bashism and simplified.
-
-2004-02-10  Werner Koch  <wk at gnupg.org>
-
-	* configure.ac: Fixed funopen test change.
-
-2004-02-06  Moritz Schulte  <mo at g10code.com>
-
-	* configure.ac: Fix funopen replacement mechanism.
-
-2004-01-31  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Add invocation of AC_SYS_LARGEFILE, AC_TYPE_OFF_T
-	and AC_FUNC_FSEEKO.
-
-2004-01-12  Werner Koch  <wk at gnupg.org>
-
-	Released 0.4.4.
-
-	* configure.ac: Bumbed LT_Revision; now at C12/A1/R1.
-	(NEED_GPGSM_VERSION): Set to 1.9.3.
-	(min_automake_version): Added.
-	* README.CVS: New.
-	* Makefile.am (EXTRA_DIST): Added README.CVS.
-	* autogen.sh: Updated.
-
-2003-11-19  Werner Koch  <wk at gnupg.org>
-
-	* acinclude.m4: Add AM_PATH_GPG_ERROR.
-	* configure.ac: Check for timegm.  Made warning messages more
-	prominent.
-
-2003-10-06  Marcus Brinkmann  <marcus at g10code.de>
-
-	Released 0.4.3.
-
-	* configure.ac (LIBGPGME_LT_CURRENT, LIBGPGME_LT_AGE): Bump up by 1.
-	(LIBGPGME_LT_REVISION): Set to 0.
-
-2003-09-13  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Require libgpg-error 0.5.
-
-	* acinclude.m4: Remove libtool cruft, add jm_GLIBC21.
-	* configure.ac: Add check for getenv_r, and call jm_GLIBC21.
-	Define HAVE_THREAD_SAFE_GETENV if appropriate.
-
-2003-09-03  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Remove GPGME_CONFIG_LIBS and GPGME_CONFIG_CFLAGS.
-
-2003-09-02  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Move invocation of AC_CANONICAL_HOST up to
-	suppress warning by autoconf.
-
-2003-08-30  Robert Schiele <rschiele at uni-mannheim.de>
-
-	* gpgme.spec.in: %{_infodir}/dir is not packaged,
-	remove to prevent checking failure.
-
-2003-08-18  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: If building Assuan, check for funopen and
-	fopencookie, and make isascii, putc_unlocked and memrchr
-	replacement functions.
-	(AM_PATH_GPG_ERROR): Require 0.3.
-
-2003-07-31  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac (AC_INIT): Bump version to 0.4.3.
-
-2003-07-30  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac (LIBGPGME_LT_REVISION): Bump up to 1.
-
-	Released 0.4.2.
-
-2003-07-08  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Complain if libgpg-error is not found.
-
-2003-06-22  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac (AC_INIT): Bump version to 0.4.2.
-
-2003-06-06  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac (LIBGPGME_LT_CURRENT): Bump up to 11.
-
-	* configure.ac: Use AM_PATH_GPG_ERROR.
-
-	* configure.ac: Check for libgpg-error.  Define
-	GPG_ERR_SOURCE_DEFAULT.
-
-2003-05-26  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac (NEED_GPG_VERSION): Bump up to 1.2.2.
-
-2003-05-18  Marcus Brinkmann  <marcus at g10code.de>
-
-	In all files, replace the Gpgme* type names with the new gpgme_*
-	type names.
-
-2003-02-01  Marcus Brinkmann  <marcus at g10code.de>
-
-	* assuan/: Update files to 2002-11-10 version of assuan.
-
-2003-01-29  Marcus Brinkmann  <marcus at g10code.de>
-
-	* bonobo/gpgme.c, bonobo/main.c, bonobo/main.h, bonobo/Makefile,
-	bonobo/Makefile.am, bonobo/Makefile.in: Dead files removed.
-	* configure.ac: Remove automake conditional BUILD_BONOBO
-	(AC_CONFIG_FILES): Remove bonobo/Makefile.
-	* Makefile.am (bonobo): Remove variable.
-	(SUBDIRS): Remove ${bonobo}.
-
-	* configure.ac: Remove all uses of GNUPG_CHECK_TYPEDEF, for byte,
-	ushort, ulong, u16 and u32.
-	* acinclude.m4 (GNUPG_CHECK_TYPEDEF): Remove macro.
-
-2002-12-24  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: New conditional HAVE_LD_VERSION_SCRIPT.
-	Call AC_CANONICAL_HOST, use host instead target.
-
-2002-12-23  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Bump up to 0.4.1.
-
-	Released 0.4.0.
-
-2002-12-23  Marcus Brinkmann  <marcus at g10code.de>
-
-	* autogen.sh (automake_vers): Require 1.7 (really 1.7.1) for the
-	conditional source distribution bug fix.
-
-2002-12-08  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac (LIBGPGME_LT_CURRENT): Increase by one.
-	(LIBGPGME_LT_AGE, LIBGPGME_LT_REVISION): Set to 0.
-
-2002-11-28  Marcus Brinkmann  <marcus at g10code.de>
-
-	* NEWS: Add note about moving "gpgmeplug" to the "cryptplug"
-	package.
-	* README: Remove instructions related to "gpgmeplug".
-	* configure.ac: Remove enable option "gpgmeplug" and automake
-	conditional BUILD_GPGMEPLUG, as well as the status info about it.
-	(GPGMEPLUG): Remove variable.
-	* Makefile.am (gpgmeplug): Remove variable.
-	(SUBDIRS): Remove ${gpgmeplug}.
-	* cryptplug.h, gpgme-openpgp.c, gpgmeplug.dox, gpgme-smime.c,
-	Makefile.am, gpgmeplug.c, ChangeLog: Files removed.
-
-2002-11-22  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Disable GPGSM for all dosish systems.
-
-2002-10-12  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Add automake conditional HAVE_GPGSM.
-
-2002-10-08  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac (AC_INIT): Bump version up to 0.4.0.
-	(NEED_GPG_VERSION): Bump up to 1.2.0.
-	(NEED_GPGSM_VERSION): Bump up to 0.9.0.
-	* README: Update version numbers.
-	* NEWS: Start entry for 0.4.0.
-
-2002-09-20  Werner Koch  <wk at gnupg.org>
-
-	Released 0.3.11.
-
-	* configure.ac: Bump up LIBGPGME_LT_REVISION.
-
-	* configure.ac (AC_CHECK_HEADERS): Check for sys/select.h.
-
-2002-09-04  Marcus Brinkmann  <marcus at g10code.de>
-
-	* autogen.sh (autoconf_vers): Bump up to 2.53 to get the @&t@
-	quadrigraph.  Always cutting the edge!
-
-2002-09-02  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Create and substitute LTLIBOBJS.
-
-2002-09-02  Marcus Brinkmann  <marcus at g10code.de>
-
-	Released 0.3.10.
-
-	* NEWS: Update for 0.3.9 release.
-	* configure.ac: Bump up LIBGPGME_LT_REVISION.
-
-2002-08-29  Marcus Brinkmann  <marcus at g10code.de>
-
-	* gpgme.spec.in: Changed user name in Wojciech Polak's email
-	address from ghostface to polak per request by himself.
-
-2002-08-28  Werner Koch  <wk at gnupg.org>
-
-	* acinclude.m4 (GNUPG_CHECK_VA_COPY): New.
-	* configure.ac: Use it.
-
-2002-08-23  Werner Koch  <wk at gnupg.org>
-
-	* configure.ac (GPGME_CONFIG_CFLAGS): Renamed from GPGME_CFLAGS
-	and removed the libpath because it is set by the config script.
-
-2002-08-21  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Bump version number to 0.3.10.
-
-	* NEWS: Add template for development version.
-
-2002-08-21  Marcus Brinkmann  <marcus at g10code.de>
-
-	Released 0.3.9.
-
-	* NEWS: Update for 0.3.9 release.
-	* Makefile.am (EXTRA_DIST): Add gpgme.spec.in.
-
-2002-08-21  Marcus Brinkmann  <marcus at g10code.de>
-
-	* jnlib/argparse.c, jnlib/argparse.h, jnlib/ChangeLog,
-	jnlib/dotlock.c, jnlib/dotlock.h, jnlib/libjnlib-config.h,
-	jnlib/logging.c, jnlib/logging.h,jnlib/Makefile.am,
-	jnlib/mischelp.h, jnlib/README, jnlib/stringhelp.c,
-	jnlib/stringhelp.h, jnlib/strlist.c, jnlib/strlist.h,
-	jnlib/types.h, jnlib/xmalloc.c, jnlib/xmalloc.h: Remove files.
-
-2002-08-21  Marcus Brinkmann  <marcus at g10code.de>
-
-	* Makefile.am (SUBDIRS): Remove jnlib.
-	* configure.ac: Don't check for unsigned short or unsigned long.
-	Don't check for memicmp, strlwr, strtoul, memmove, stricmp.
-	Make stpcpy a replaced function.
-	Don't define HAVE_JNLIB_LOGGING.
-	Don't generate jnlib/Makefile.
-
-2002-07-02  Werner Koch  <wk at gnupg.org>
-
-	* configure.ac: Bumbed version number to 0.3.9; add a comment on
-	when to change it.
-
-	* gpgme.spec.in: New. Contributed by Wojciech Polak.
-	* Makefile.am (dist-hook): New.
-
-	* AUTHORS: Added Wojciech and bug reporting addresses.
-
-2002-06-25  Werner Koch  <wk at gnupg.org>
-
-	Released 0.3.8.
-
-	* configure.ac: Bumbed LT version to 9/3/0.
-	(NEED_GPGSM_VERSION): Need 0.3.8 due to fixed export command.
-
-2002-06-04  Marcus Brinkmann  <marcus at g10code.de>
-
-	Released 0.3.7.
-
-	* configure.ac (AC_INIT): Set version to 0.3.7.
-	(LIBGPGME_LT_REVISION): Add one.
-
-	* README: Document version requirement correctly.
-
-2002-06-02  Marcus Brinkmann  <marcus at g10code.de>
-
-	* acinclude.m4: Fix Pth check so that it doesn't error out if pth
-	is not found.
-
-2002-06-02  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Add checks for Pth and pthreads.
-	* acinclude.m4: Add slightly hacked check for pth (seems to be an
-	autoconf version problem).
-
-2002-05-21  Werner Koch  <wk at gnupg.org>
-
-	* configure.ac (NEED_GPGSM_VERSION): We need gpgsm 0.3.7.
-
-2002-05-03  Werner Koch  <wk at gnupg.org>
-
-	Released 0.3.6.
-
-2002-04-05  Marcus Brinkmann  <marcus at g10code.de>
-
-	* acconfig.h: File removed.
-	* configure.ac (NEED_GPG_VERSION): Add description.
-	(NEED_GPGSM_VERSION): Likewise.
-	(HAVE_DOSISH_SYSTEM): Likewise.
-	(HAVE_DRIVE_LETTERS): Likewise.
-	(GPG_PATH): Likewise.
-	(GPGSM_PATH): Likewise.
-	* acinclude.m4 (GNUPG_CHECK_TYPEDEF): Likewise.
-
-2002-04-01  Werner Koch  <wk at gnupg.org>
-
-	Released 0.3.5.
-
-2002-03-17  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac: Add automake conditional HAVE_DOSISH_SYSTEM.
-
-2002-03-04  Werner Koch  <wk at gnupg.org>
-
-	* configure.ac: Bumbed version to 0.3.4-cvs to continue development.
-
-	Released 0.3.4.
-
-	* configure.ac: Bumbed LT version numbers to (7,1,0), requires
-	gpgsm 0.3.1.
-
-2002-03-03  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac (AC_INIT): Change version number to snapshot CVS
-	version.
-
-2002-02-13  Werner Koch  <wk at gnupg.org>
-
-	* configure.ac (vasprintf,fopencookie): Add checks.
-
-2002-02-12  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac (AC_INIT): Bump version to 0.3.3.
-	* jnlib/Makefile.am: Rever to older version that includes xmalloc
-	but not dotlock and some other files.  Reported by Stéphane
-	Corthésy.
-
-2002-02-10  Marcus Brinkmann  <marcus at g10code.de>
-
-	* Released 0.3.2.
-
-	* configure.ac (AC_INIT): Bump version to 0.3.2.
-	* jnlib/libjnlibconfig.h: Revert to older version that doesn't
-	expect libgcrypt.  Reported by Jose Carlos Garcia Sogo
-	<jsogo at debian.org>.
-
-2002-02-09  Marcus Brinkmann  <marcus at g10code.de>
-
-	* Released 0.3.1.
-
-	* configure.ac (LIBGPGME_LT_CURRENT): Bump it up to 6!
-	(NEED_GPGSM_VERSION): Bump it up to 0.3.0!
-	(AC_INIT): Bump version to 0.3.1
-
-2002-01-22  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac (HAVE_JNLIB_LOGGING): Define always for assuan.
-
-2001-12-19  Werner Koch  <wk at gnupg.org>
-
-	* configure.ac (VERSION,PACKAGE): Defined and subst.  Used for
-	AM_INIT_AUTOMAKE and moved all version number more to the top.
-
-2001-12-18  Marcus Brinkmann  <marcus at g10code.de>
-
-	* autogen.sh (libtool_vers): Bump to 1.4.
-
-	* configure.ac (LIBGPGME_LT_CURRENT): Increment.
-	(LIBGPGME_LT_AGE): Reset.
-	Improve comment.
-	Fix wrong comment character.
-
-2001-12-18  Werner Koch  <wk at gnupg.org>
-
-	* acinclude.m4 (GNUPG_FIX_HDR_VERSION): Fixed for new automake.
-
-2001-12-14  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac (GPG): Substitute this variable.
-	(GPGSM): Likewise.
-
-2001-11-22  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac (AC_CONFIG_FILES): Add tests/gpg/Makefile and
-	tests/gpgsm/Makefile.
-
-2001-11-21  Marcus Brinkmann  <marcus at g10code.de>
-
-	* Makefile.am (gpgmeplug): New variable, set to gpgmeplug if
-	[BUILD_GPGMEPLUG].
-	* configure.ac (AC_CONFIG_FILES): Add gpgmeplug/Makefile.
-	Support --enable-gpgmeplug.
-
-2001-11-21  Marcus Brinkmann  <marcus at g10code.de>
-
-	* autogen.sh: Tighten version dependencies.
-
-2001-11-20  Marcus Brinkmann  <marcus at g10code.de>
-
-	* Makefile.am (SUBDIRS): Support building the assuan library
-	(currently if GPGSM_PATH is set)..
-	* configure.ac: Support building the assuan library.
-	* assuan: New directory, populated with the Assuan library
-	(copied from the newpg repository).
-
-2001-11-20  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.ac (NEED_GPGSM_VERSION): New variable.  Treat it
-	similarly to NEED_GPG_VERSION.
-	* acconfig.h: Likewise.
-
-2001-11-18  Marcus Brinkmann  <marcus at g10code.de>
-
-	* configure.in: Renamed to ...
-	* configure.ac: ... this.  Update to autoconf 2.52.  Lots of small
-	changes in the transition.  Support --with-gpg=PATH and
-	--with-gpgsm=PATH options.  Check if test suites can be run.
-	* acconfig.h: Add GPGSM_PATH.
-	* Makefile.am: New variable `tests', set to `tests' if
-	RUN_GPG_TESTS.
-	(SUBDIRS): Replace string `tests' with variable `tests'.
-
-2001-10-22  Marcus Brinkmann  <marcus at g10code.de>
-
-	* autogen.sh: Invoke automake with `-a' (add missing files).
-	Do not invoke configure.
-
-2001-09-17  Werner Koch  <wk at gnupg.org>
-
-	Released 0.2.3.
-
-	* configure.in (NEED_GPG_VERSION): Set to 1.0.6. Incremented LT
-	current and age.
-
-	* Makefile.am (SUBDIRS): Add doc
-
-2001-06-12  Werner Koch  <wk at gnupg.org>
-
-	Released 0.2.2.
-
-2001-04-05  Werner Koch  <wk at gnupg.org>
-
-	* configure.in (NEED_GPG_VERSION): Set to 1.0.4g
-
-2001-04-02  Werner Koch  <wk at gnupg.org>
-
-	Released 0.2.1.
-
-	Changed the copyright notices all over the place.
-
-2001-02-28  Werner Koch  <wk at gnupg.org>
-
-	Released 0.2.0.
-
-2001-01-18  Werner Koch  <wk at gnupg.org>
-
-	* autogen.sh: Added option --build-w32.
-
-
- Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2011 g10 Code GmbH
-
- This file is free software; as a special exception the author gives
- unlimited permission to copy and/or distribute it, with or without
- modifications, as long as this notice is preserved.
-
- 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
+mode: text
+End:
diff --git a/ChangeLog b/ChangeLog-2011
similarity index 98%
copy from ChangeLog
copy to ChangeLog-2011
index e8cb265..1273e8a 100644
--- a/ChangeLog
+++ b/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-02  Werner Koch  <wk at g10code.com>
+
+	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-10-25  Marcus Brinkmann  <marcus at g10code.com>
 
 	* m4/pth.m4: Removed.
@@ -1019,7 +1026,8 @@
 	* autogen.sh: Added option --build-w32.
 
 
- Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2011 g10 Code GmbH
+ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010,
+	       2011 g10 Code GmbH
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without
diff --git a/Makefile.am b/Makefile.am
index fb06867..1ab445d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,19 +1,19 @@
 # Makefile.am - Top level Makefile for GPGME.
 # Copyright (C) 2000 Werner Koch (dd9jn)
 # Copyright (C) 2001, 2002, 2004, 2005, 2008, 2009 g10 Code GmbH
-# 
+#
 # This file is part of GPGME.
-# 
+#
 # GPGME is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
 # published by the Free Software Foundation; either version 2.1 of the
 # License, or (at your option) any later version.
-# 
+#
 # GPGME 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 Lesser General
 # Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
@@ -24,21 +24,36 @@ AUTOMAKE_OPTIONS = dist-bzip2
 
 DISTCHECK_CONFIGURE_FLAGS = --with-gpg="@GPG@"
 
-EXTRA_DIST = gpgme.spec.in autogen.sh 
+EXTRA_DIST = gpgme.spec.in autogen.sh                               	\
+             ChangeLog-2011 m4/ChangeLog-2011 contrib/ChangeLog-2011
 
 
 if RUN_GPG_TESTS
 tests = tests
 else
-tests = 
+tests =
 endif
 
 SUBDIRS = src ${tests} doc lang
 
-# Fix the version of the spec file and create a file named VERSION 
+# Fix the version of the spec file and create a file named VERSION
 # to be used for patch's Prereq: feature.
-dist-hook:
+dist-hook: gen-ChangeLog
 	@set -e; \
 	sed -e 's/@pkg_version@/$(VERSION)/g' \
 	    $(top_srcdir)/gpgme.spec.in  > $(distdir)/gpgme.spec
 	echo "$(VERSION)" > $(distdir)/VERSION
+
+
+gen_start_date = 2011-12-01T00:00:00
+.PHONY: gen-ChangeLog
+gen-ChangeLog:
+	if test -d $(top_srcdir)/.git; then				\
+	  (cd $(top_srcdir) &&                      			\
+	    ./build-aux/gitlog-to-changelog				\
+	    --amend=build-aux/git-log-fix				\
+	    --since=$(gen_start_date) ) > $(distdir)/cl-t;		\
+          cat $(top_srcdir)/build-aux/git-log-footer >> $(distdir)/cl-t;\
+	  rm -f $(distdir)/ChangeLog;					\
+	  mv $(distdir)/cl-t $(distdir)/ChangeLog;			\
+	fi
diff --git a/autogen.sh b/autogen.sh
index 2d07948..b988ace 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -243,12 +243,37 @@ if test "$DIE" = "yes"; then
     cat <<EOF
 
 Note that you may use alternative versions of the tools by setting
-the corresponding environment variables; see README.CVS for details.
+the corresponding environment variables; see README.GIT for details.
 
 EOF
     exit 1
 fi
 
+
+# Update the git setup.
+if [ -d .git ]; then
+  if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
+    cat <<EOF >&2
+*** Activating trailing whitespace git pre-commit hook. ***
+    For more information see this thread:
+      http://mail.gnome.org/archives/desktop-devel-list/2009-May/msg00084html
+    To deactivate this pre-commit hook again move .git/hooks/pre-commit
+    and .git/hooks/pre-commit.sample out of the way.
+EOF
+      cp -av .git/hooks/pre-commit.sample .git/hooks/pre-commit
+      chmod -c +x  .git/hooks/pre-commit
+  fi
+  if [ -f build-aux/git-hooks/commit-msg -a ! -f .git/hooks/commit-msg ] ; then
+    cat <<EOF >&2
+*** Activating commit log message check hook. ***
+EOF
+      cp -av build-aux/git-hooks/commit-msg .git/hooks/commit-msg
+      chmod -c +x  .git/hooks/commit-msg
+  fi
+fi
+
+
+
 echo "Running aclocal -I m4 ${ACLOCAL_FLAGS:+$ACLOCAL_FLAGS }..."
 $ACLOCAL -I m4 $ACLOCAL_FLAGS
 echo "Running autoheader..."
diff --git a/build-aux/git-hooks/commit-msg b/build-aux/git-hooks/commit-msg
new file mode 100755
index 0000000..5a697c7
--- /dev/null
+++ b/build-aux/git-hooks/commit-msg
@@ -0,0 +1,127 @@
+eval '(exit $?0)' && eval 'exec perl -w "$0" ${1+"$@"}'
+  & eval 'exec perl -w "$0" $argv:q'
+    if 0;
+
+# An hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, copy it to "~/.git/hooks/commit-msg".
+#
+# This script is based on the one from GNU coreutils.
+
+use strict;
+use warnings;
+(my $ME = $0) =~ s|.*/||;
+
+my $editor = $ENV{EDITOR} || 'vi';
+$ENV{PATH} = '/bin:/usr/bin';
+
+# Rewrite the $LOG_FILE (old contents in @$LINE_REF) with an additional
+# commented diagnostic "# $ERR" line at the top.
+sub rewrite($$$)
+{
+  my ($log_file, $err, $line_ref) = @_;
+  local *LOG;
+  open LOG, '>', $log_file
+    or die "$ME: $log_file: failed to open for writing: $!";
+  print LOG "# $err";
+  print LOG @$line_ref;
+  close LOG
+    or die "$ME: $log_file: failed to rewrite: $!\n";
+}
+
+sub re_edit($)
+{
+  my ($log_file) = @_;
+
+  warn "Interrupt (Ctrl-C) to abort...\n";
+
+  system 'sh', '-c', "$editor $log_file";
+  ($? & 127) || ($? >> 8)
+    and die "$ME: $log_file: the editor ($editor) failed, aborting\n";
+}
+
+# Given a $LOG_FILE name and a \@LINE buffer,
+# read the contents of the file into the buffer and analyze it.
+# If the log message passes muster, return the empty string.
+# If not, return a diagnostic.
+sub check_msg($$)
+{
+  my ($log_file, $line_ref) = @_;
+
+  local *LOG;
+  open LOG, '<', $log_file
+    or return "failed to open for reading: $!";
+  @$line_ref = <LOG>;
+  close LOG;
+
+  my @line = @$line_ref;
+  chomp @line;
+
+  # Don't filter out blank or comment lines; git does that already,
+  # and if we were to ignore them here, it could lead to committing
+  # with lines that start with "#" in the log.
+
+  # Filter out leading blank and comment lines.
+  # while (@line && $line[0] =~ /^(?:#.*|[ \t]*)$/) { shift @line; }
+
+  # Filter out blank and comment lines at EOF.
+  # while (@line && $line[$#line] =~ /^(?:#.*|[ \t]*)$/) { pop @line; }
+
+  @line == 0
+    and return 'no log message';
+
+  # The first line should not be too short
+  8 < length $line[0] || return 'summary line too short';
+
+  # The first line should not start with an asterisk or a hash sign.
+  # An asterisk might indicate that a change entry was started right
+  # at the first line.
+  $line[0] =~ /^[*#]/ && return "summary line starts with an * or #";
+
+  # Second line should be blank or not present.
+  2 <= @line && length $line[1]
+    and return 'second line must be empty';
+
+  # Limit line length to allow for the ChangeLog's leading TAB.
+  foreach my $line (@line)
+    {
+      72 < length $line && $line =~ /^[^#]/
+        and return 'line longer than 72 characters';
+    }
+
+  return '';
+}
+
+{
+  @ARGV == 1
+    or die;
+
+  my $log_file = $ARGV[0];
+
+  while (1)
+    {
+      my @line;
+      my $err = check_msg $log_file, \@line;
+      $err eq ''
+        and last;
+      $err = "$ME: $err\n";
+      warn $err;
+      exit 1;
+
+      # Insert the diagnostic as a comment on the first line of $log_file.
+      #rewrite $log_file, $err, \@line;
+      #re_edit $log_file;
+      #
+      ## Stop if our parent is killed.
+      #getppid() == 1
+      #  and last;
+    }
+}
+
+# Local Variables:
+# mode: perl
+# End:
diff --git a/build-aux/git-log-fix b/build-aux/git-log-fix
new file mode 100644
index 0000000..af702fe
--- /dev/null
+++ b/build-aux/git-log-fix
@@ -0,0 +1,3 @@
+# This file is expected to be used via gitlog-to-changelog's --amend=FILE
+# option.  It specifies what changes to make to each given SHA1's commit
+# log and metadata, using Perl-eval'able expressions.
diff --git a/build-aux/git-log-footer b/build-aux/git-log-footer
new file mode 100644
index 0000000..6c814c4
--- /dev/null
+++ b/build-aux/git-log-footer
@@ -0,0 +1,15 @@
+
+2011-12-02  Werner Koch  <wk at gnupg.org>
+
+	NB: Changes done before December 1st, 2011 are described in
+	per directory files named ChangeLog-2011.  See doc/HACKING for
+	details.
+
+        -----
+        Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+                      2010, 2011 g10 Code GmbH
+
+	Copying and distribution of this file and/or the original GIT
+	commit log messages, with or without modification, are
+	permitted provided the copyright notice and this notice are
+	preserved.
diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog
new file mode 100755
index 0000000..40a8035
--- /dev/null
+++ b/build-aux/gitlog-to-changelog
@@ -0,0 +1,345 @@
+eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
+  & eval 'exec perl -wS "$0" $argv:q'
+    if 0;
+# Convert git log output to ChangeLog format.
+
+my $VERSION = '2011-11-02 07:53'; # UTC
+# The definition above must lie within the first 8 lines in order
+# for the Emacs time-stamp write hook (at end) to update it.
+# If you change this file with Emacs, please let the write hook
+# do its job.  Otherwise, update this string manually.
+
+# Copyright (C) 2008-2011 Free Software Foundation, Inc.
+
+# This program is free software: you can redistribute it and/or modify
+# 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.
+
+# This program 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/>.
+
+# Written by Jim Meyering
+
+use strict;
+use warnings;
+use Getopt::Long;
+use POSIX qw(strftime);
+
+(my $ME = $0) =~ s|.*/||;
+
+# use File::Coda; # http://meyering.net/code/Coda/
+END {
+  defined fileno STDOUT or return;
+  close STDOUT and return;
+  warn "$ME: failed to close standard output: $!\n";
+  $? ||= 1;
+}
+
+sub usage ($)
+{
+  my ($exit_code) = @_;
+  my $STREAM = ($exit_code == 0 ? *STDOUT : *STDERR);
+  if ($exit_code != 0)
+    {
+      print $STREAM "Try `$ME --help' for more information.\n";
+    }
+  else
+    {
+      print $STREAM <<EOF;
+Usage: $ME [OPTIONS] [ARGS]
+
+Convert git log output to ChangeLog format.  If present, any ARGS
+are passed to "git log".  To avoid ARGS being parsed as options to
+$ME, they may be preceded by '--'.
+
+OPTIONS:
+
+   --amend=FILE FILE maps from an SHA1 to perl code (i.e., s/old/new/) that
+                  makes a change to SHA1's commit log text or metadata.
+   --append-dot append a dot to the first line of each commit message if
+                  there is no other punctuation or blank at the end.
+   --since=DATE convert only the logs since DATE;
+                  the default is to convert all log entries.
+   --format=FMT set format string for commit subject and body;
+                  see 'man git-log' for the list of format metacharacters;
+                  the default is '%s%n%b%n'
+
+   --help       display this help and exit
+   --version    output version information and exit
+
+EXAMPLE:
+
+  $ME --since=2008-01-01 > ChangeLog
+  $ME -- -n 5 foo > last-5-commits-to-branch-foo
+
+In a FILE specified via --amend, comment lines (starting with "#") are ignored.
+FILE must consist of <SHA,CODE+> pairs where SHA is a 40-byte SHA1 (alone on
+a line) referring to a commit in the current project, and CODE refers to one
+or more consecutive lines of Perl code.  Pairs must be separated by one or
+more blank line.
+
+Here is sample input for use with --amend=FILE, from coreutils:
+
+3a169f4c5d9159283548178668d2fae6fced3030
+# fix typo in title:
+s/all tile types/all file types/
+
+1379ed974f1fa39b12e2ffab18b3f7a607082202
+# Due to a bug in vc-dwim, I mis-attributed a patch by Paul to myself.
+# Change the author to be Paul.  Note the escaped "@":
+s,Jim .*>,Paul Eggert <eggert\@cs.ucla.edu>,
+
+EOF
+    }
+  exit $exit_code;
+}
+
+# If the string $S is a well-behaved file name, simply return it.
+# If it contains white space, quotes, etc., quote it, and return the new string.
+sub shell_quote($)
+{
+  my ($s) = @_;
+  if ($s =~ m![^\w+/.,-]!)
+    {
+      # Convert each single quote to '\''
+      $s =~ s/\'/\'\\\'\'/g;
+      # Then single quote the string.
+      $s = "'$s'";
+    }
+  return $s;
+}
+
+sub quoted_cmd(@)
+{
+  return join (' ', map {shell_quote $_} @_);
+}
+
+# Parse file F.
+# Comment lines (starting with "#") are ignored.
+# F must consist of <SHA,CODE+> pairs where SHA is a 40-byte SHA1
+# (alone on a line) referring to a commit in the current project, and
+# CODE refers to one or more consecutive lines of Perl code.
+# Pairs must be separated by one or more blank line.
+sub parse_amend_file($)
+{
+  my ($f) = @_;
+
+  open F, '<', $f
+    or die "$ME: $f: failed to open for reading: $!\n";
+
+  my $fail;
+  my $h = {};
+  my $in_code = 0;
+  my $sha;
+  while (defined (my $line = <F>))
+    {
+      $line =~ /^\#/
+        and next;
+      chomp $line;
+      $line eq ''
+        and $in_code = 0, next;
+
+      if (!$in_code)
+        {
+          $line =~ /^([0-9a-fA-F]{40})$/
+            or (warn "$ME: $f:$.: invalid line; expected an SHA1\n"),
+              $fail = 1, next;
+          $sha = lc $1;
+          $in_code = 1;
+          exists $h->{$sha}
+            and (warn "$ME: $f:$.: duplicate SHA1\n"),
+              $fail = 1, next;
+        }
+      else
+        {
+          $h->{$sha} ||= '';
+          $h->{$sha} .= "$line\n";
+        }
+    }
+  close F;
+
+  $fail
+    and exit 1;
+
+  return $h;
+}
+
+{
+  my $since_date;
+  my $format_string = '%s%n%b%n';
+  my $amend_file;
+  my $append_dot = 0;
+  GetOptions
+    (
+     help => sub { usage 0 },
+     version => sub { print "$ME version $VERSION\n"; exit },
+     'since=s' => \$since_date,
+     'format=s' => \$format_string,
+     'amend=s' => \$amend_file,
+     'append-dot' => \$append_dot,
+    ) or usage 1;
+
+
+  defined $since_date
+    and unshift @ARGV, "--since=$since_date";
+
+  # This is a hash that maps an SHA1 to perl code (i.e., s/old/new/)
+  # that makes a correction in the log or attribution of that commit.
+  my $amend_code = defined $amend_file ? parse_amend_file $amend_file : {};
+
+  my @cmd = (qw (git log --log-size),
+             '--pretty=format:%H:%ct  %an  <%ae>%n%n'.$format_string, @ARGV);
+  open PIPE, '-|', @cmd
+    or die ("$ME: failed to run `". quoted_cmd (@cmd) ."': $!\n"
+            . "(Is your Git too old?  Version 1.5.1 or later is required.)\n");
+
+  my $prev_date_line = '';
+  my @prev_coauthors = ();
+  while (1)
+    {
+      defined (my $in = <PIPE>)
+        or last;
+      $in =~ /^log size (\d+)$/
+        or die "$ME:$.: Invalid line (expected log size):\n$in";
+      my $log_nbytes = $1;
+
+      my $log;
+      my $n_read = read PIPE, $log, $log_nbytes;
+      $n_read == $log_nbytes
+        or die "$ME:$.: unexpected EOF\n";
+
+      # Extract leading hash.
+      my ($sha, $rest) = split ':', $log, 2;
+      defined $sha
+        or die "$ME:$.: malformed log entry\n";
+      $sha =~ /^[0-9a-fA-F]{40}$/
+        or die "$ME:$.: invalid SHA1: $sha\n";
+
+      # If this commit's log requires any transformation, do it now.
+      my $code = $amend_code->{$sha};
+      if (defined $code)
+        {
+          eval 'use Safe';
+          my $s = new Safe;
+          # Put the unpreprocessed entry into "$_".
+          $_ = $rest;
+
+          # Let $code operate on it, safely.
+          my $r = $s->reval("$code")
+            or die "$ME:$.:$sha: failed to eval \"$code\":\n$@\n";
+
+          # Note that we've used this entry.
+          delete $amend_code->{$sha};
+
+          # Update $rest upon success.
+          $rest = $_;
+        }
+
+      my @line = split "\n", $rest;
+      my $author_line = shift @line;
+      defined $author_line
+        or die "$ME:$.: unexpected EOF\n";
+      $author_line =~ /^(\d+)  (.*>)$/
+        or die "$ME:$.: Invalid line "
+          . "(expected date/author/email):\n$author_line\n";
+
+      my $date_line = sprintf "%s  $2\n", strftime ("%F", localtime ($1));
+
+      # Format 'Co-authored-by: A U Thor <email at example.com>' lines in
+      # standard multi-author ChangeLog format.
+      my @coauthors = grep /^Co-authored-by:.*$/, @line;
+      for (@coauthors)
+        {
+          s/^Co-authored-by:\s*/\t    /;
+          s/\s*</  </;
+
+          /<.*?@.*\..*>/
+            or warn "$ME: warning: missing email address for "
+              . substr ($_, 5) . "\n";
+        }
+
+      # If this header would be the same as the previous date/name/email/
+      # coauthors header, then arrange not to print it.
+      if ($date_line ne $prev_date_line or "@coauthors" ne "@prev_coauthors")
+        {
+          $prev_date_line eq ''
+            or print "\n";
+          print $date_line;
+          @coauthors
+            and print join ("\n", @coauthors), "\n";
+        }
+      $prev_date_line = $date_line;
+      @prev_coauthors = @coauthors;
+
+      # Omit "Co-authored-by..." and "Signed-off-by..." lines.
+      @line = grep !/^Signed-off-by: .*>$/, @line;
+      @line = grep !/^Co-authored-by: /, @line;
+
+      # Remove leading and trailing blank lines.
+      if (@line)
+        {
+          while ($line[0] =~ /^\s*$/) { shift @line; }
+          while ($line[$#line] =~ /^\s*$/) { pop @line; }
+        }
+
+      # If there were any lines
+      if (@line == 0)
+        {
+          warn "$ME: warning: empty commit message:\n  $date_line\n";
+        }
+      else
+        {
+          if ($append_dot)
+            {
+              # If the first line of the message has enough room, then
+              if (length $line[0] < 72)
+                {
+                  # append a dot if there is no other punctuation or blank
+                  # at the end.
+                  $line[0] =~ /[[:punct:]\s]$/
+                    or $line[0] .= '.';
+                }
+            }
+
+          # Prefix each non-empty line with a TAB.
+          @line = map { length $_ ? "\t$_" : '' } @line;
+
+          print "\n", join ("\n", @line), "\n";
+        }
+
+      defined ($in = <PIPE>)
+        or last;
+      $in ne "\n"
+        and die "$ME:$.: unexpected line:\n$in";
+    }
+
+  close PIPE
+    or die "$ME: error closing pipe from " . quoted_cmd (@cmd) . "\n";
+  # FIXME-someday: include $PROCESS_STATUS in the diagnostic
+
+  # Complain about any unused entry in the --amend=F specified file.
+  my $fail = 0;
+  foreach my $sha (keys %$amend_code)
+    {
+      warn "$ME:$amend_file: unused entry: $sha\n";
+      $fail = 1;
+    }
+
+  exit $fail;
+}
+
+# Local Variables:
+# mode: perl
+# indent-tabs-mode: nil
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "my $VERSION = '"
+# time-stamp-format: "%:y-%02m-%02d %02H:%02M"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "'; # UTC"
+# End:
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
deleted file mode 100644
index e6b96f5..0000000
--- a/contrib/ChangeLog
+++ /dev/null
@@ -1,33 +0,0 @@
-2010-11-15  Marcus Brinkmann  <mb at g10code.com>
-
-	* conf-w32ce-msc/fcntl.h: New file.
-	* conf-w32ce-msc/build.mk (conf_sources): Add fnctl.h.
-	(sources): Remove memrchr.c.
-
-	* conf-w32ce-msc/io.h: New file.
-	* conf-w32ce-msc/build.mk (conf_sources): Add io.h.
-	
-	* conf-w32ce-msc/stdint.h: New file.
-	* conf-w32ce-msc/build.mk (conf_sources): Add stdint.h.
-	* conf-w32ce-msc/build.mk (copy-static-source): Revert last change.
-
-2010-11-15  Werner Koch  <wk at g10code.com>
-
-	* conf-w32ce-msc/build.mk (copy-static-source): Create stdint.h.
-	(all): Add ws2.lib
-	(clean): New.
-
-2010-11-04  Werner Koch  <wk at g10code.com>
-
-	* conf-w32ce-msc/build.mk (copy-built-source): Revert last
-	change.  Does not work with W32CE where MSC defines it in except.h.
-
-2010-11-03  Werner Koch  <wk at g10code.com>
-
-	* conf-w32ce-msc/build.mk (copy-built-source): Create dummy sehmap.h.
-
-2010-11-01  Werner Koch  <wk at g10code.com>
-
-	* conf-w32ce-msc/config.h: New.
-	* conf-w32ce-msc/build.mk: New.
-
diff --git a/contrib/ChangeLog-2011 b/contrib/ChangeLog-2011
new file mode 100644
index 0000000..cfe5876
--- /dev/null
+++ b/contrib/ChangeLog-2011
@@ -0,0 +1,49 @@
+2011-12-02  Werner Koch  <wk at g10code.com>
+
+	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.
+
+2010-11-15  Marcus Brinkmann  <mb at g10code.com>
+
+	* conf-w32ce-msc/fcntl.h: New file.
+	* conf-w32ce-msc/build.mk (conf_sources): Add fnctl.h.
+	(sources): Remove memrchr.c.
+
+	* conf-w32ce-msc/io.h: New file.
+	* conf-w32ce-msc/build.mk (conf_sources): Add io.h.
+
+	* conf-w32ce-msc/stdint.h: New file.
+	* conf-w32ce-msc/build.mk (conf_sources): Add stdint.h.
+	* conf-w32ce-msc/build.mk (copy-static-source): Revert last change.
+
+2010-11-15  Werner Koch  <wk at g10code.com>
+
+	* conf-w32ce-msc/build.mk (copy-static-source): Create stdint.h.
+	(all): Add ws2.lib
+	(clean): New.
+
+2010-11-04  Werner Koch  <wk at g10code.com>
+
+	* conf-w32ce-msc/build.mk (copy-built-source): Revert last
+	change.  Does not work with W32CE where MSC defines it in except.h.
+
+2010-11-03  Werner Koch  <wk at g10code.com>
+
+	* conf-w32ce-msc/build.mk (copy-built-source): Create dummy sehmap.h.
+
+2010-11-01  Werner Koch  <wk at g10code.com>
+
+	* conf-w32ce-msc/config.h: New.
+	* conf-w32ce-msc/build.mk: New.
+
+ Copyright (C) 2010 g10 Code GmbH
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ 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.
diff --git a/doc/ChangeLog b/doc/ChangeLog-2011
similarity index 98%
rename from doc/ChangeLog
rename to doc/ChangeLog-2011
index 1dce16b..d6ecca7 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-02  Werner Koch  <wk at g10code.com>
+
+	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-05-12  Marcus Brinkmann  <marcus at g10code.com>
 
 	* gpgme.texi (I/O Callback Example): Fix example code.
@@ -605,7 +612,7 @@
 	(Manipulating Data Buffers): Update interfaces.  Add
 	gpgme_data_seek.
 	* gpgme.texi (Engine Version Check): Remove gpgme_check_engine.
-	
+
 2002-11-21  Marcus Brinkmann  <marcus at g10code.de>
 
 	* gpgme.texi (Verify): Document the new interface.
@@ -742,7 +749,7 @@
 
 	* gpgme.texi (direntry): End index entry with a full stop.
 	Patch submitted by Jose Carlos Garcia Sogo <jsogo at debian.org>.
-	
+
 2002-03-17  Marcus Brinkmann  <marcus at g10code.de>
 
 	* gpgme.texi (Detailed Results): Fix syntax error in last change.
@@ -857,7 +864,7 @@
 	* gpgme.texi: g10Code -> g10 Code
 
 	* gpgme.texi (Top): Complete detailmenu.
-	
+
 	* gpgme.texi: Convert embarassing cruft to the real thing.
 
 2002-01-16  Marcus Brinkmann  <marcus at g10code.de>
@@ -869,7 +876,8 @@
 	* Makefile.am (info_TEXINFOS): New variable.
 	(gpgme_TEXINFOS): Likewise.
 
- Copyright 2002, 2003, 2004 g10 Code GmbH
+ Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+               2011 g10 Code GmbH
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without
diff --git a/doc/HACKING b/doc/HACKING
new file mode 100644
index 0000000..6149d25
--- /dev/null
+++ b/doc/HACKING
@@ -0,0 +1,28 @@
+# HACKING                                                       -*- org -*-
+#+TITLE: Hacking notes for GPGME
+#+STARTUP: showall
+
+* No more ChangeLog files
+
+  Do not modify any of the ChangeLog files in GPGME.  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" time.  As such, there are strict requirements on the
+  form of the commit log messages.  The old ChangeLog files have all
+  be renamed to ChangeLog-2011
+
+
+* Commit log requirements
+
+  Your commit log should always start with a one-line summary, the
+  second line should be blank, and the remaining lines are usually
+  ChangeLog-style entries for all affected files.  However, it's fine
+  -- even recommended -- to write a few lines of prose describing the
+  change, when the summary and ChangeLog entries don't give enough of
+  the big picture.  Omit the leading TABs that you're used to seeing
+  in a "real" ChangeLog file, but keep the maximum line length at 72
+  or smaller, so that the generated ChangeLog lines, each with its
+  leading TAB, will not exceed 80 columns.
+
+  Note that ./autogen.sh installs a git hook to do some basic syntax
+  checking on the commit log message.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 212216d..93afc06 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,18 +1,18 @@
 # doc - Automake template
 # Copyright (C) 2001, 2004 g10 Code GmbH
-# 
+#
 # This file is part of GPGME.
-# 
+#
 # GPGME is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
 # published by the Free Software Foundation; either version 2.1 of the
 # License, or (at your option) any later version.
-# 
+#
 # GPGME 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 Lesser General
 # Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
@@ -21,7 +21,7 @@
 
 DISTCLEANFILES = gpgme.tmp
 
-EXTRA_DIST = module-overview.sk
+EXTRA_DIST = module-overview.sk HACKING ChangeLog-2011
 
 info_TEXINFOS = gpgme.texi
 gpgme_TEXINFOS = uiserver.texi lesser.texi gpl.texi
diff --git a/lang/cl/ChangeLog b/lang/cl/ChangeLog
deleted file mode 100644
index 5aadfeb..0000000
--- a/lang/cl/ChangeLog
+++ /dev/null
@@ -1,34 +0,0 @@
-2008-11-08  Moritz  <moritz at gnu.org>
-
-	* gpgme.lisp (size-t): Wrong call to defctype: function accepts
-	optional, not keyword argument.
-	(ssize-t): Likewise.
-	(off-t): Likewise.
-	(gpgme-data-t, gpgme-ctx-t): Likewise.
-	(gpgme-error-t): Likewise.
-	(gpgme-error-no-signal-t): Likewise.
-	(gpgme-err-code-t): Likewise.
-	(gpgme-err-source-t): Likewise.
-	(gpgme-sig-notation-t, gpgme-engine-info-t): Likewise.
-	(gpgme-subkey-t): Likewise.
-	(gpgme-key-sig-t): Likewise.
-	(gpgme-user-id-t): Likewise.
-	(gpgme-key-t): Likewise.
-	(gpgme-data-cbs-t): Likewise.
-	(gpgme-invalid-key-t): Likewise.
-	(gpgme-op-encrypt-result-t): Likewise.
-	(gpgme-recipient-t): Likewise.
-	(gpgme-op-decrypt-result-t): Likewise.
-	(gpgme-new-signature-t): Likewise.
-	(gpgme-op-sign-result-t): Likewise.
-	(gpgme-signature-t): Likewise.
-	(gpgme-op-verify-result-t): Likewise.
-	(gpgme-import-status-t): Likewise.
-	(gpgme-op-import-result-t): Likewise.
-	(gpgme-op-genkey-result-t): Likewise.
-	(gpgme-op-keylist-result-t): Likewise.
-
-2006-07-06  Marcus Brinkmann  <marcus at g10code.de>
-
-	* Initial release.
-
diff --git a/lang/cl/ChangeLog-2011 b/lang/cl/ChangeLog-2011
new file mode 100644
index 0000000..cbd21be
--- /dev/null
+++ b/lang/cl/ChangeLog-2011
@@ -0,0 +1,50 @@
+2011-12-02  Werner Koch  <wk at g10code.com>
+
+	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.
+
+2008-11-08  Moritz  <moritz at gnu.org>
+
+	* gpgme.lisp (size-t): Wrong call to defctype: function accepts
+	optional, not keyword argument.
+	(ssize-t): Likewise.
+	(off-t): Likewise.
+	(gpgme-data-t, gpgme-ctx-t): Likewise.
+	(gpgme-error-t): Likewise.
+	(gpgme-error-no-signal-t): Likewise.
+	(gpgme-err-code-t): Likewise.
+	(gpgme-err-source-t): Likewise.
+	(gpgme-sig-notation-t, gpgme-engine-info-t): Likewise.
+	(gpgme-subkey-t): Likewise.
+	(gpgme-key-sig-t): Likewise.
+	(gpgme-user-id-t): Likewise.
+	(gpgme-key-t): Likewise.
+	(gpgme-data-cbs-t): Likewise.
+	(gpgme-invalid-key-t): Likewise.
+	(gpgme-op-encrypt-result-t): Likewise.
+	(gpgme-recipient-t): Likewise.
+	(gpgme-op-decrypt-result-t): Likewise.
+	(gpgme-new-signature-t): Likewise.
+	(gpgme-op-sign-result-t): Likewise.
+	(gpgme-signature-t): Likewise.
+	(gpgme-op-verify-result-t): Likewise.
+	(gpgme-import-status-t): Likewise.
+	(gpgme-op-import-result-t): Likewise.
+	(gpgme-op-genkey-result-t): Likewise.
+	(gpgme-op-keylist-result-t): Likewise.
+
+2006-07-06  Marcus Brinkmann  <marcus at g10code.de>
+
+	* Initial release.
+
+ Copyright (C) 2006, 2008 g10 Code GmbH
+
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ 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.
diff --git a/lang/cl/Makefile.am b/lang/cl/Makefile.am
index e0064ba..553926e 100644
--- a/lang/cl/Makefile.am
+++ b/lang/cl/Makefile.am
@@ -1,18 +1,18 @@
 # Makefile.am for GPGME-CL.
 # Copyright (C) 2003, 2006 g10 Code GmbH
-# 
+#
 # This file is part of GPGME-CL.
-# 
+#
 # GPGME-CL is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # GPGME-CL 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 Lesser General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
@@ -24,6 +24,4 @@ clfiles = gpgme.asd gpgme-package.lisp gpgme.lisp
 clfilesdir = $(datadir)/common-lisp/source/gpgme
 dist_clfiles_DATA = $(clfiles)
 
-EXTRA_DIST = README
-
-
+EXTRA_DIST = README ChangeLog-2011
diff --git a/m4/ChangeLog b/m4/ChangeLog-2011
similarity index 79%
rename from m4/ChangeLog
rename to m4/ChangeLog-2011
index 1a0cd1c..c03de7b 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-02  Werner Koch  <wk at g10code.com>
+
+	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-04-06  Werner Koch  <wk at g10code.com>
 
 	* gpg-error.m4: Update from current libgpg-error repo.
@@ -36,7 +43,8 @@
 	* gpg-error.m4: New file.
 	* pth.m4: New file.
 
- Copyright 2004 g10 Code GmbH
+
+ Copyright (C) 2004, 2005, 2009, 2010, 2011 g10 Code GmbH
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without
diff --git a/src/ChangeLog b/src/ChangeLog-2011
similarity index 99%
rename from src/ChangeLog
rename to src/ChangeLog-2011
index e53b226..c1a901a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-02  Werner Koch  <wk at g10code.com>
+
+	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-10-25  Marcus Brinkmann  <marcus at g10code.com>
 
 	* Makefile.am: Remove build rules for libgpgme-pth.
@@ -23,7 +30,8 @@
 	* gpgconf.c (gpgme_op_conf_load, gpgme_op_conf_save): Likewise.
 	* import.c (gpgme_op_import_start, gpgme_op_import_keys_start)
 	(gpgme_op_import_keys, gpgme_op_import): Likewise.
-	* keylist.c (gpgme_op_keylist_start, gpgme_op_keylist_ext_start): Likewise.
+	* keylist.c (gpgme_op_keylist_start, gpgme_op_keylist_ext_start):
+	Likewise.
 	* opassuan.c (gpgme_op_assuan_transact_start)
 	(gpgme_op_assuan_transact_ext): Likewise.
 	* passwd.c (gpgme_op_passwd_start, gpgme_op_passwd): Likewise.
@@ -6983,7 +6991,7 @@
 	* context.h: Add invalid and revoke flags to user_id structure.
 	* keylist.c (gpgme_op_keylist_start): Use --fixed-list-mode.
 	(keylist_colon_handler): Adjust for that.
- 	(set_userid_flags): New.
+	(set_userid_flags): New.
 	(set_mainkey_trust_info): Handle new key invalid flag
 	(set_subkey_trust_info): Ditto.
 	* gpgme.h: Add new attributes for key and user ID flags.
@@ -7128,8 +7136,8 @@
 	* data.c (gpgme_data_rewind): Allow to rewind data_type_none.
 
 
- Copyright 2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,
-	   2011 g10 Code GmbH
+ Copyright (C) 2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,
+               2011 g10 Code GmbH
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without
diff --git a/src/Makefile.am b/src/Makefile.am
index d4f4ba7..cc0b78d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,8 +19,9 @@
 ## Process this file with automake to produce Makefile.in
 
 # Note: moc_kdpipeiodevice should actually be a dependcy below.
-EXTRA_DIST = gpgme-config.in gpgme.m4 mkstatus libgpgme.vers \
+EXTRA_DIST = gpgme-config.in gpgme.m4 mkstatus libgpgme.vers ChangeLog-2011 \
 	     gpgme.h.in versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp
+
 BUILT_SOURCES = status-table.h
 MOSTLYCLEANFILES = status-table.h
 bin_SCRIPTS = gpgme-config
diff --git a/tests/ChangeLog b/tests/ChangeLog-2011
similarity index 98%
rename from tests/ChangeLog
rename to tests/ChangeLog-2011
index 9c95489..596c2df 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-02  Werner Koch  <wk at g10code.com>
+
+	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-05-11  Marcus Brinkmann  <marcus at g10code.com>
 
 	* gpgsm/Makefile.am (DISTCLEANFILES): Move to ...
@@ -293,7 +300,7 @@
 2004-08-17  Marcus Brinkmann  <marcus at g10code.de>
 
 	* gpgsm/t-keylist.c (struct): Add new fields VALIDITY and
-	KEY_LENGTH.  
+	KEY_LENGTH.
 	(main): Use them.
 	* gpgsm/t-import.c (check_result): New argument total_stat.
 	(main): Pass this argument.  Reduce number of total considered
@@ -320,11 +327,11 @@
 
         Include config.h at the top of each C source.  This is required
 	due to LFS support.
-	
+
 	* gpg/t-keylist-sig.c (main): s/class/sig_class/.
 	* gpg/t-signers.c (check_result): Ditto.
 	* gpg/t-sign.c (check_result): Ditto.
-	* gpg/t-encrypt-sign.c (check_result): Ditto. 
+	* gpg/t-encrypt-sign.c (check_result): Ditto.
 	* gpgsm/t-sign.c (check_result): Ditto.
 
 2004-01-12  Werner Koch  <wk at gnupg.org>
@@ -443,7 +450,7 @@
 	* gpg/t-export.c (main): Likewise.
 	* gpgsm/t-encrypt.c (main): Likewise.
 	* gpgsm/t-export.c (main): Likewise.
-	
+
 2003-05-27  Marcus Brinkmann  <marcus at g10code.de>
 
 	* gpg/Makefile.am (TESTS): Order t-keylist and t-keylist-sig after
@@ -546,7 +553,7 @@
 	* gpg/t-eventloop.c (main): Likewise.
 	* gpg/t-encrypt-sign.c (main): Likewise.
 	* gpgsm/t-encrypt.c (main): Likewise.
-	
+
 2002-12-24  Marcus Brinkmann  <marcus at g10code.de>
 
 	* gpgsm/t-verify.c (main): Adjust caller of gpgme_op_verify.
@@ -602,7 +609,7 @@
 
 	* gpg/t-keylist.c (main): Test PATTERN for NULL before printing.
 	Reported by Dr. Stefan Dalibor <Dr.Stefan.Dalibor at bfa.de>.
-	
+
 2002-08-01  Marcus Brinkmann  <marcus at g10code.de>
 
 	* gpg/t-edit.c: Also add a test for the expire command (testing
@@ -898,11 +905,11 @@
 
 2001-09-17  Werner Koch  <wk at gnupg.org>
 
-	* t-keylist.c (check_two_contexts): New. 
+	* t-keylist.c (check_two_contexts): New.
 
 2001-09-03  Werner Koch  <wk at gnupg.org>
 
-	* t-encrypt.c (print_op_info): New and use it after each operation.. 
+	* t-encrypt.c (print_op_info): New and use it after each operation.
 
 2001-08-28  Werner Koch  <wk at gnupg.org>
 
@@ -922,7 +929,8 @@
 	* tests/t-verify.c (print_sig_stat): Print info about the keys.
 
 
- Copyright 2001, 2004 g10 Code GmbH
+ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+	       2011 g10 Code GmbH
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2441e6f..0ecdab2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,19 +1,19 @@
 # Makefile.am - Makefile for GPGME tests.
 # Copyright (C) 2000 Werner Koch (dd9jn)
 # Copyright (C) 2001, 2004 g10 Code GmbH
-# 
+#
 # This file is part of GPGME.
-# 
+#
 # GPGME is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
 # published by the Free Software Foundation; either version 2.1 of the
 # License, or (at your option) any later version.
-# 
+#
 # GPGME 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 Lesser General
 # Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
@@ -23,7 +23,7 @@ TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir)
 
 TESTS = t-version t-data t-engine-info
 
-EXTRA_DIST = t-data-1.txt t-data-2.txt
+EXTRA_DIST = t-data-1.txt t-data-2.txt ChangeLog-2011
 
 INCLUDES = -I$(top_builddir)/src
 
@@ -39,13 +39,13 @@ noinst_PROGRAMS = $(TESTS) run-keylist run-export run-import run-sign \
 if RUN_GPG_TESTS
 gpgtests = gpg
 else
-gpgtests = 
+gpgtests =
 endif
 
 if RUN_GPGSM_TESTS
 gpgsmtests = gpgsm opassuan
 else
-gpgsmtests = 
+gpgsmtests =
 endif
 
 SUBDIRS = ${gpgtests} ${gpgsmtests}

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                          |    5 +
 ChangeLog                           | 1038 +----------------------------------
 ChangeLog => ChangeLog-2011         |   10 +-
 Makefile.am                         |   31 +-
 autogen.sh                          |   27 +-
 build-aux/git-hooks/commit-msg      |  127 +++++
 build-aux/git-log-fix               |    3 +
 build-aux/git-log-footer            |   15 +
 build-aux/gitlog-to-changelog       |  345 ++++++++++++
 contrib/ChangeLog                   |   33 --
 contrib/ChangeLog-2011              |   49 ++
 doc/{ChangeLog => ChangeLog-2011}   |   16 +-
 doc/HACKING                         |   28 +
 doc/Makefile.am                     |   10 +-
 lang/cl/ChangeLog                   |   34 --
 lang/cl/ChangeLog-2011              |   50 ++
 lang/cl/Makefile.am                 |   12 +-
 m4/{ChangeLog => ChangeLog-2011}    |   10 +-
 src/{ChangeLog => ChangeLog-2011}   |   16 +-
 src/Makefile.am                     |    3 +-
 tests/{ChangeLog => ChangeLog-2011} |   26 +-
 tests/Makefile.am                   |   14 +-
 22 files changed, 761 insertions(+), 1141 deletions(-)
 copy ChangeLog => ChangeLog-2011 (98%)
 create mode 100755 build-aux/git-hooks/commit-msg
 create mode 100644 build-aux/git-log-fix
 create mode 100644 build-aux/git-log-footer
 create mode 100755 build-aux/gitlog-to-changelog
 delete mode 100644 contrib/ChangeLog
 create mode 100644 contrib/ChangeLog-2011
 rename doc/{ChangeLog => ChangeLog-2011} (98%)
 create mode 100644 doc/HACKING
 delete mode 100644 lang/cl/ChangeLog
 create mode 100644 lang/cl/ChangeLog-2011
 rename m4/{ChangeLog => ChangeLog-2011} (79%)
 rename src/{ChangeLog => ChangeLog-2011} (99%)
 rename tests/{ChangeLog => ChangeLog-2011} (98%)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org




More information about the Gnupg-commits mailing list