[git] GPA - branch, master, updated. gpa-0.9.0-17-g9003154
by Werner Koch
cvs at cvs.gnupg.org
Mon Dec 12 10:59:04 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 "The GNU Privacy Assistant".
The branch, master has been updated
via 900315491024da55f3dd8ad4ca8b61a2b87efcdd (commit)
from 61e00549baf8992983b1fc9bff9f492429ec64c8 (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 900315491024da55f3dd8ad4ca8b61a2b87efcdd
Author: Werner Koch <wk at gnupg.org>
Date: Mon Dec 12 10:06:30 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.
* 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/ChangeLog b/ChangeLog
index 412ba50..4bb353d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,618 +1,16 @@
-2011-08-26 Werner Koch <wk at g10code.com>
+No more ChangeLog files
+========================
- Migrated the repository to git.
+Do not modify any of the ChangeLog files in GPA. Starting on
+December 12st, 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.
- * configure.ac: Adjust for the new git repo.
-2009-12-08 Werner Koch <wk at g10code.com>
- * doc/gpa.1: New.
- * doc/Makefile.am: New.
-
-2009-11-10 Marcus Brinkmann <marcus at g10code.de>
-
- * configure.ac: Set NEED_LIBASSUAN_VERSION and NEED_LIBASSUAN_API
- to 1.1.0 and 2 resp.
-
-2009-07-20 Niklas 'Nille' Åkerström <nille.kungen at gmail.com> (wk)
-
- * gpa.desktop: Add GenericName and sv translations.
-
-2009-06-20 Werner Koch <wk at g10code.com>
-
- Release 0.9.0.
-
-2009-06-17 Werner Koch <wk at g10code.com>
-
- * config.sub, config.guess: Update to 2007-11-19 from GnuPG.
-
- * README: Remove outdated installation info.
-
- * configure.ac: Require at least GPGME 1.2.
- (HAVE_GPGME_IO_WRITE): Remove test for this.
- (HAVE_GPGME_OP_ASSUAN_TRANSACT): Ditto.
- (HAVE_STRUCT__GPGME_SUBKEY_CARD_NUMBER): Ditto.
- (BUILD_CARD_MANAGER): Remove this conditional.
-
-2009-06-09 Werner Koch <wk at g10code.com>
-
- * configure.ac: Test for gpgme_io_write.
-
-2009-03-30 Moritz <moritz at gnu.org>
-
- * configure.ac: Typo fix: change _save_CFLAGS to _save_cflags.
-
-2009-03-29 Moritz <moritz at gnu.org>
-
- * Makefile.am: Added rules for generating gpadefs.h from
- gpadefs.h.in at make-time.
- (EXTRA_DIST): Added gpadefs.h.in.
- * configure.ac: Trigger AC_MSG_ERROR in case directory for
- keyserver helpers could not figured out.
- Call AC_DEFINE_UNQUOTED to define KEYSERVER_HELPERS_DIR in
- config.h.
- Remove generation of gpadefs.h through AC_CONFIG_COMMANDS.
-
-2009-03-10 Werner Koch <wk at g10code.com>
-
- * configure.ac (AC_CONFIG_COMMANDS): Remove GPA_LOCALEDIR.
-
-2009-02-12 Werner Koch <wk at g10code.com>
-
- * configure.ac (BUILD_CARD_MANAGER): Define as AC_DEFINE and
- AM_CONDITIONAL.
-
-2009-02-07 Moritz <moritz at gnu.org>
-
- * TODO: New item.
-
-2009-02-04 Werner Koch <wk at g10code.com>
-
- * configure.ac: Check for card_number member of gpgme_subkey_t.
-
-2009-01-26 Werner Koch <wk at g10code.com>
-
- * configure.ac: Check for gpgme_op_assuan_transact.
-
-2009-01-17 Moritz <moritz at gnu.org>
-
- * configure.ac: Use AC_CHECK_HEADERS to check for locale.h.
-
-2008-12-16 Werner Koch <wk at g10code.com>
-
- * configure.ac: Remove unused test for getopt_long.
- (AC_CHECK_FUNCS): Check for inotify_init.
-
-2008-12-10 Marcus Brinkmann <marcus at g10code.de>
-
- * configure.ac: Require gtk 2.10.0.
-
-2008-12-04 Marcus Brinkmann <marcus at g10code.com>
-
- * configure.ac: Require gtk 2.8.0.
-
- * configure.ac (GPA_LOCALEDIR): Fix definition.
- (gpadefs.h): Remove DATADIRNAME, add localedir.
- Submitted by gozer at progrock.com.
-
-2008-10-31 gettextize <bug-gnu-gettext at gnu.org>
-
- * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.17.
- * config.rpath, ABOUT-NLS: Update.
-
-2008-09-04 Marcus Brinkmann <marcus at g10code.com>
-
- Released 0.8.0.
-
-2008-05-08 Werner Koch <wk at g10code.com>
-
- * configure.ac: Require external gettext.
- * Makefile.am (SUBDIRS): Remove intl.
-
-2008-04-01 Werner Koch <wk at g10code.com>
-
- * configure.ac (AC_INIT): Fix quoting.
-
-2008-03-12 Werner Koch <wk at g10code.com>
-
- * COPYING: Replace by GPLv3 version.
-
-2008-03-06 Werner Koch <wk at g10code.com>
-
- Note that the code is now under the GPLv3+ due to a couple of new
- stuff.
-
- * AUTHORS: Add bug reporting address. Add license info.
-
-2008-02-28 Marcus Brinkmann <marcus at g10code.de>
-
- * configure.ac: Invoke AC_SYS_LARGEFILE.
-
-2008-02-16 Marcus Brinkmann <marcus at g10code.de>
-
- * configure.ac: Update macro svn_revision.
-
-2008-02-05 Marcus Brinkmann <marcus at g10code.de>
-
- * configure.ac: Fix download URLs. Reported by Alberto
- Escudero-Pascual.
-
-2008-01-17 Marcus Brinkmann <marcus at g10code.de>
-
- * configure.ac (NEED_GPGME_VERSION): Bump to 1.1.6.
-
-2007-09-27 Werner Koch <wk at g10code.com>
-
- * configure.ac (NETLIBS) [W32]: New.
-
-2007-09-26 Werner Koch <wk at g10code.com>
-
- * configure.ac: Add test for libassuan and gpg-error.
-
-2007-06-04 Marcus Brinkmann <marcus at g10code.de>
-
- * configure.ac (BUILD_REVISION): Invoke AC_GNU_SOURCE properly.
- * autogen.sh: Require bash.
- * depcomp, install-sh, missing: New files from automake.
- * intl/Makefile.in, config.rpath: New files from gettext.
-
-2007-05-24 Werner Koch <wk at g10code.com>
-
- Released 0.7.6.
-
-2007-04-25 Werner Koch <wk at g10code.com>
-
- * configure.ac (AM_GNU_GETTEXT): Require ngettext.
-
-2007-02-26 Werner Koch <wk at g10code.com>
-
- Released 0.7.5.
-
-2007-01-10 Werner Koch <wk at g10code.com>
-
- * configure.ac (GPGME_CFLAGS, GPGME_LIBS): Use them and do not
- append them to CFLAGS etc.
- (AM_PATH_GTK_2_0): Likewise.
-
-2006-07-25 Werner Koch <wk at g10code.com>
-
- Released 0.7.4.
-
- * configure.ac: Extract revison from SVN.
-
-2006-07-15 Marcus Brinkmann <marcus at g10code.de>
-
- * configure.ac: Check for windres.
-
-2006-03-21 Werner Koch <wk at g10code.com>
-
- Released 0.7.3.
-
-2006-03-09 Werner Koch <wk at g10code.com>
-
- * config.guess, config.sub: Updated.
-
-2006-03-03 Marcus Brinkmann <marcus at g10code.de>
-
- Released 0.7.2.
-
-2006-01-09 Werner Koch <wk at g10code.com>
-
- Released 0.7.1.
-
- * configure.ac: Check for gpgme-glib only under W32.
-
-2006-01-03 Werner Koch <wk at g10code.com>
-
- * configure.ac: Require just gpgme 1.1.1 as 1.2.0 was unintentional.
-
-2005-11-29 Werner Koch <wk at g10code.com>
-
- * configure.ac: Add m4 hackery to append the revision number to
- the version.
-
-2005-11-18 Werner Koch <wk at g10code.com>
-
- * configure.ac (AM_PATH_GPGME_GLIB): New; replaces AM_PATH_GPGME.
-
-2005-11-15 Werner Koch <wk at g10code.com>
-
- * autogen.sh <build-w32>: Updated to support Debian's mingw kit.
-
- * configure.ac (PACKAGE_BUGREPORT): Create extended version
- information.
- (HAVE_W32_SYSTEM): Define it.
- (CFLAGS) [W32]: Make sure that -mmsbitfields is used. Strange
- that the GTK macros don't define it.
-
-2005-11-10 Marcus Brinkmann <marcus at g10code.de>
-
- * configure.ac (IS_DEVELOPMENT_VERSION): Remove unused ming32
- cruft.
-
-2005-11-07 Marcus Brinkmann <marcus at g10code.de>
-
- * configure.ac: Require GPGME 0.4.5.
-
-2005-10-26 Werner Koch <wk at g10code.com>
-
- * Makefile.am: Use dist-bzip2 option.
-
-2005-10-21 Werner Koch <wk at g10code.com>
-
- * acinclude.m4: Fixed quoting.
-
-2005-10-07 Marcus Brinkmann <marcus at g10code.de>
-
- * acinclude.m4 (AM_PATH_GPGME): Removed.
-
-2005-10-06 Marcus Brinkmann <marcus at g10code.de>
-
- * configure.ac: Invoke CHECK_ZLIB instead of generic AC_CHECK_LIB
- macro (which doesn't support a --with-foo-prefix argument). Check
- for stpcpy.
-
-2004-08-21 Miguel Coca <mcoca at gnu.org>
-
- * gpa.spec: Fix version number. Reported by jan.grobecker at gmx.net.
-
-2003-11-25 Miguel Coca <mcoca at gnu.org>
-
- * Makefile.am (pkgdata_DATA): Save the icon to the DATADIR too.
-
-2003-11-25 Miguel Coca <mcoca at gnu.org>
-
- * gpa.png: New icon by Josué Burgos.
-
-2003-11-21 Miguel Coca <mcoca at gnu.org>
-
- * Makefile.am (EXTRA_DIST): Updated to include the desktop file and
- the renamed icon.
- (desktop_DATA, icon_DATA): Install the .desktop and the icon to
- their respective directories.
-
- * gpa.spec, gpa.desktop: Updated by Ling Li <ling at caltech.edu>.
-
- * gpa-logo-48x48.png: Renamed to the, more standard, gpa.png.
-
-2003-10-27 Miguel Coca <mcoca at gnu.org>
-
- * NEWS: Note changes in signature verification.
-
- * configure.ac: Check for GTK+ 2.2, as this is what we really need
- now.
-
-2003-10-22 Miguel Coca <mcoca at gnu.org>
-
- * configure.ac, NEWS: Bump version number after release.
-
-2003-10-22 Miguel Coca <mcoca at gnu.org>
-
- * configure.ac: Release 0.7.0.
-
-2003-10-13 gettextize <bug-gnu-gettext at gnu.org>
-
- * Makefile.am (SUBDIRS): Add m4.
- (ACLOCAL_AMFLAGS): New variable.
- (EXTRA_DIST): Add config.rpath.
- * configure.ac (AC_CONFIG_FILES): Add m4/Makefile.
-
-2003-10-12 Miguel Coca <mcoca at gnu.org>
-
- * configure.ac: Update version number to 0.7.0-cvs. Update gpgme
- version check to 0.4.3.
-
- * TODO: Remove obsolete items
-
- * NEWS: Clean up items, add missing.
-
-2003-06-21 Miguel Coca <mcoca at gnu.org>
-
- * configure.ac: Disable deprecated GTK widgets.
-
-2003-03-25 Miguel Coca <mcoca at gnu.org>
-
- * AUTHORS, NEWS: Updated.
-
-2003-02-07 Miguel Coca <mcoca at gnu.org>
-
- * Makefile.am (EXTRA_DIST): Add logo.
-
-2003-01-30 Miguel Coca <mcoca at gnu.org>
-
- * configure.ac: Require gpgme 0.4.1. Remove compatibility hack.
-
- * configure.ac, NEWS: Bump version number.
-
-2003-01-29 Miguel Coca <mcoca at gnu.org>
-
- * configure.ac: Release 0.6.1.
-
- * configure.ac (ALL_LINGUAS): Fix Swedish. It's sv, not se.
-
-2003-01-28 Miguel Coca <mcoca at gnu.org>
-
- * configure.ac: Fix getopt_long check.
-
-2003-01-24 Miguel Coca <mcoca at gnu.org>
-
- * configure.ac (ALL_LINGUAS): Add Swedish.
-
- * configure.ac: Add checks for getopt_long.
-
-2003-01-23 Miguel Coca <mcoca at gnu.org>
-
- * configure.ac: Add check for strsep
-
- * configure.ac: Add a hack to detect gpgme 0.4.0. To be removed after
- the release.
-
-2003-01-19 Miguel Coca <mcoca at gnu.org>
-
- * configure.ac: Add check for development version, adapted
- from GnuPG with some changes.
-
-2003-01-08 Miguel Coca <mcoca at gnu.org>
-
- * configure.ac: Remove some flags from the maintainer's CFLAGS to avoid
- a ton of warnings due to bugs in gcc and GTK+ (see bug report at
- http://gcc.gnu.org/cgi-bin/gnatsweb.pl?cmd=view&pr=529&database=gcc).
-
- * configure.ac: Go back to GPGME 0.4.0 for the moment.
-
-2002-12-29 Miguel Coca <mcoca at gnu.org>
-
- * configure.ac: Require GPGME 0.4.1.
-
-2002-12-24 Miguel Coca <mcoca at gnu.org>
-
- * configure.ac, NEWS: Bump version number.
-
-2002-12-23 Miguel Coca <mcoca at gnu.org>
-
- * configure.ac: Release 0.6.0.
-
- * NEWS, THANKS: Update.
-
-2002-12-17 Miguel Coca <mcoca at gnu.org>
-
- * configure.ac (ALL_LINGUAS): Add Spanish.
-
-2002-12-15 Miguel Coca <mcoca at gnu.org>
-
- * NEWS: Add some entries for 0.6.0.
-
-2002-12-12 Miguel Coca <mcoca at gnu.org>
-
- * config.sub, config.guess: Updated.
-
- * Makefile.am (SUBDIRS): Add pixmaps.
- * configure.ac: Likewise.
-
-2002-12-07 Miguel Coca <e970095 at zipi.fi.upm.es>
-
- * configure.ac (ALL_LINGUAS): Added nl.
-
-2002-11-29 Miguel Coca <e970095 at zipi.fi.upm.es>
-
- * configure.ac: Remove jnlib/ and assorted tests.
- * Makefile.am (SUBDIRS): Likewise.
-
-2002-11-27 Miguel Coca <e970095 at zipi.fi.upm.es>
-
- * THANKS, AUTHORS: Updated.
-
-2002-11-20 Miguel Coca <e970095 at zipi.fi.upm.es>
-
- * TODO: Updated.
-
- * configure.ac: Update to gpgme 0.4
-
-2002-10-25 Miguel Coca <e970095 at zipi.fi.upm.es>
-
- * configure.ac: Add /usr/libexec/gnupg/ to the list of possible
- locations of gpgkeys_ldap.
-
- * gtkrc-1.2.gpa, gtkrc-1.3.12+.gpa: Removed unused files.
-
- * configure.ac: Check for the keyserver plugins directories, instead
- of using always the same directory. This allows some flexibility in
- case of compiling GPA against a GnuPG installed via a package manager.
-
-2002-09-24 Miguel Coca <e970095 at zipi.fi.upm.es>
-
- * configure.ac: Add constant to gpadefs.h for the directory where the
- keyserver helpers are installed.
-
-2002-08-29 Werner Koch <wk at gnupg.org>
-
- * AUTHORS (Maintainer): Now it is Miguel.
-
- * configure.ac (ALL_LINGUAS): Added ja.
-
-2002-08-27 Miguel Coca <e970095 at zipi.fi.upm.es>
-
- * autogen.sh: Changes to support gettext 0.11.
-
-2002-08-20 Werner Koch <wk at gnupg.org>
-
- * acinclude.m4 (GNUPG_CHECK_TYPEDEF): Updated for newer autoconfs.
- (AM_PATH_GPGME): New.
- * configure.ac (AH_BOTTOM): New.
- * acconfig.h: Removed.
-
-2002-08-16 Miguel Coca <e970095 at zipi.fi.upm.es>
-
- * configure.ac: Bumbed version number to 0.6.0-cvs to distinguish
- from the 0.5.1 tag.
-
-2002-08-09 Miguel Coca <e970095 at zipi.fi.upm.es>
-
- * configure.ac, Makefile.am (SUBDIRS): Don't compile gpapa.
-
-2002-08-04 Miguel Coca <e970095 at zipi.fi.upm.es>
-
- * configure.ac: Added check for GPGME.
-
-2002-07-29 Werner Koch <wk at gnupg.org>
-
- * configure.ac: Check for gtk-2 suing Miguel's patch from early
- June.
-
- * configure.ac: Bumbed version number to 0.5.1 now that Miguel
- solved the 0.4.3-0.5.0 schism.
-
-2002-06-15 Werner Koch <wk at gnupg.org>
-
- * configure.ac: Bumbed version number to 0.4.4-cvs.
-
-2002-04-17 Jan-Oliver Wagner <jan at intevation.de>
-
- * gpa.desktop (new): gnome desktop entry for gpa
- * gpa-logo-48x48.png (new): small gpa logo for gnome desktop
- * gpa.spec: added gnome menu entry
-
-2002-03-15 Werner Koch <wk at gnupg.org>
-
- * configure.ac (ALL_LINGUAS): Add pt_BR.
-
-Mon 25 Feb 2002 25:15 Peter Gerwinski <peter.gerwinski at g-n-u.de>
-
- Released 0.5.0.
-
- See `NEWS' for an overview of the changes since 0.4.3.
-
-2002-02-20 Peter Gerwinski <peter.gerwinski at g-n-u.de>
-
- * gtkrc.gpa: Splitted into two new files: gtkrc-1.2.gpa and
- gtkrc-1.3.12+.gpa.
-
-2002-02-19 Peter Gerwinski <peter.gerwinski at g-n-u.de>
-
- * to-utf8: Changed to use short options to iconv.
-
-2002-02-10 Peter Gerwinski <peter.gerwinski at g-n-u.de>
-
- * gtkrc.gpa: Changed default font.
-
-2002-02-05 Peter Gerwinski <peter.gerwinski at g-n-u.de>
-
- * THANKS: Updated.
-
- * gtkrc.gpa: Added file.
-
-2002-01-14 Werner Koch <wk at gnupg.org>
-
- Released 0.4.3.
-
- * configure.in: Replaced by
- * configure.ac: autoconf 2.5 suggested file. Adjusted for it.
- * VERSION: Removed
- * Makefile.am: Create the VERSION file in the dist tarball.
- * autogen.sh: Fixed required versions
-
-2001-08-03 Werner Koch <wk at gnupg.org>
-
- * gpa.spec: New. Contributed by Peter Hanecak.
-
-2001-06-07 Werner Koch <wk at gnupg.org>
-
- * configure.in (ALL_LINGUAS): Add Chinese translation.
-
-2001-06-05 Werner Koch <wk at gnupg.org>
-
- Released 0.4.2
-
- * configure.in (BUILD_INCLUDED_LIBINTL): Set to no for W32.
- * Makefile.am: Include autogen.sh
-
-2001-04-05 Werner Koch <wk at gnupg.org>
-
- * VERSION: Release 0.4.1
-
-2001-02-27 Werner Koch <wk at gnupg.org>
-
- * to-utf8: New.
- * README.W32: Describe how to use this script.
-
-2001-02-27 Jan-Oliver Wagner <jan at intevation.de>
-
- * VERSION: new revision 0.4.0
- * TODO: added hint
- * configure.in: added french as available language
- * README.W32: more hints on building under w32
-
-2001-01-25 Jan-Oliver Wagner <jan at intevation.de>
-
- * README.W32: New
-
-2001-01-23 Jan-Oliver Wagner <jan at intevation.de>
-
- * acconfig.h: added USE_ONLY_8DOT3 and USE_SIMPLE_GETTEXT
- * configure.in: added USE_SIMPLE_GETTEXT for Windows
-
-2001-01-23 Werner Koch <wk at gnupg.org>
-
- * configure.in (GPG): Fixed initialization for W32. Changed test
- for gpg.
- * acconfig.h (GPG_PATH): New.
-
-2001-01-18 Werner Koch <wk at gnupg.org>
-
- * autogen.sh: Add --build-w32 option
- * configure.in: Modifications for the new MingW32/CPD version.
-
-2000-07-25 13:15:56 Werner Koch (wk at habibti.openit.de)
-
- Changed the copyright notices from FSF to G-N-U because we have not
- yet assigned the copyright and the G-N-U is the main authors.
-
-2000-07-25 09:08:59 Werner Koch (wk at habibti.openit.de)
-
- * configure.in (GPA_DATADIR): Create this macro.
-
-2000-06-28 20:09:49 Werner Koch (wk at habibti.openit.de)
-
- * VERSION: New because it is easier for the mkdiff script to move
- this file to the beginning, so that in trun patch can find the prereq
- * Makefile.am, configure.in: Adjusted for that.
-
- Version 0.3.1 has been released (without this entry :-()
-
-2000-05-25 17:55:29 Werner Koch (wk at habibti.openit.de)
-
- * configure.in: Check for gpg.
-
-2000-05-24 09:04:44 Werner Koch (wk at habibti.openit.de)
-
- * configure.in: Removed -Wshadow because this hits on glib's usage of
- "index".
-
-2000-05-17 10:25:54 Werner Koch (wk at habibti.openit.de)
-
- * TODO: Updated by Markus
- * AUTHORS, THANKS: Updated.
-
-2000-05-16 20:08:47 Werner Koch (wk at habibti.openit.de)
-
- Set version to 0.3 to indicate that we have a German
- translation and GNU formatted source (I don't like the last
- one but it is something which we can easily agree on).
-
-2000-05-15 16:49:59 Werner Koch (wk at habibti.openit.de)
-
- Added PO support.
-
-2000-05-11 16:59:24 Werner Koch (wk at habibti.openit.de)
-
- * configure.in: Add a few function checks. Fixed some hardcoded
- paths for the W32 version of Gtk+ - needs a better solution.
-
- GPA shows up on a Windows NT box and didn't crash. This is a good
- reason to increase the version number.
-
- Version 0.2.0
-
-2000-05-03 20:09:17 Werner Koch (wk at habibti.openit.de)
-
- Version 0.1.0
+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 412ba50..b58092b 100644
--- a/ChangeLog
+++ b/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-01 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-08-26 Werner Koch <wk at g10code.com>
Migrated the repository to git.
diff --git a/Makefile.am b/Makefile.am
index 872a235..345b64e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,20 +1,20 @@
# Makefile.am - Top makefile for GPA.
# Copyright (C) 2000, 2001 Werner Koch
# Copyright (C) 2002, 2003, 2004 Miguel Coca
-# Copyright (C) 2005, 2006, 2007, 2008, 2009 g10 Code GmbH
-#
+# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2011 g10 Code GmbH
+#
# This file is part of GPA.
-#
+#
# GPA 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.
-#
+#
# GPA 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/>.
@@ -22,9 +22,14 @@ ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = dist-bzip2
SUBDIRS = m4 src po pixmaps doc
-EXTRA_DIST = config.rpath TODO README-alpha to-utf8 autogen.sh gpa.spec \
- gpa.desktop gpa.png gpadefs.h.in
-DISTCLEANFILES = gpadefs.h
+
+EXTRA_DIST = \
+ config.rpath TODO README-alpha to-utf8 autogen.sh gpa.spec \
+ gpa.desktop gpa.png gpadefs.h.in \
+ po/ChangeLog-2011 pixmaps/ChangeLog-2011 ChangeLog-2011 \
+ m4/ChangeLog-2011 src/ChangeLog-2011 st-fonts/ChangeLog-2011
+
+DISTCLEANFILES = gpadefs.h
desktopdir = $(datadir)/applications/
desktop_DATA = gpa.desktop
@@ -49,6 +54,19 @@ gpadefs.h: $(srcdir)/gpadefs.h.in
all: gpadefs.h
# Create a VERSION file which we need for the Prereq: patch file trick.
-dist-hook:
+dist-hook: gen-ChangeLog
@set -e; echo "$(VERSION)" > $(distdir)/VERSION
+gen_start_date = 2011-12-12T00:00:00
+.PHONY: gen-ChangeLog
+gen-ChangeLog:
+ if test -d $(top_srcdir)/.git; then \
+ (cd $(top_srcdir) && \
+ ./build-aux/gitlog-to-changelog \
+ --append-dot --tear-off \
+ --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 576c6c3..ee27cc7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -160,6 +160,13 @@ EOF
git config --add filter.cleanpo.clean \
"awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'"
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 }..."
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..0457ca4
--- /dev/null
+++ b/build-aux/git-log-footer
@@ -0,0 +1,14 @@
+
+2011-12-01 Werner Koch <wk at gnupg.org>
+
+ NB: Changes done before December 12st, 2011 are described in
+ per directory files named ChangeLog-2011. See doc/HACKING for
+ details.
+
+ -----
+ Copyright (C) 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..d9f594f
--- /dev/null
+++ b/build-aux/gitlog-to-changelog
@@ -0,0 +1,360 @@
+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.
+ --tear-off tear off all commit log lines after a '--' line.
+ --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;
+ my $tear_off = 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,
+ 'tear-off' => \$tear_off,
+ ) 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 everything after a line with 2 dashes at the beginning.
+ if ($tear_off)
+ {
+ my @tmpline;
+ foreach (@line)
+ {
+ last if /^--\s*$/;
+ push @tmpline,$_;
+ }
+ @line = @tmpline;
+ }
+
+ # 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/doc/HACKING b/doc/HACKING
new file mode 100644
index 0000000..a6912af
--- /dev/null
+++ b/doc/HACKING
@@ -0,0 +1,29 @@
+# HACKING -*- org -*-
+#+TITLE: Hacking notes for GPA
+#+STARTUP: showall
+
+* No more ChangeLog files
+
+ Do not modify any of the ChangeLog files in Libassuan. Starting
+ on December 12st, 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.
+
+ If you want to add extra text to the commit log which shall not be
+ copied to the ChangeLog, use a separator consisting of two dashes at
+ the start of a line (optionally followed by white space).
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9fd40eb..f8519c0 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,5 @@
-EXTRA_DIST = gpa.1
+EXTRA_DIST = gpa.1 HACKING
man_MANS = gpa.1
diff --git a/m4/ChangeLog b/m4/ChangeLog-2011
similarity index 86%
rename from m4/ChangeLog
rename to m4/ChangeLog-2011
index 8bb1db8..b03661d 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-01 Werner Koch <wk at g10code.com>
+
+ NB: ChangeLog files are no longer manually maintained. Starting
+ on December 12st, 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-12-15 gettextize <bug-gnu-gettext at gnu.org>
* gettext.m4: Upgrade to gettext-0.17.
@@ -52,4 +59,3 @@
* uintmax_t.m4: New file, from gettext-0.12.1.
* ulonglong.m4: New file, from gettext-0.12.1.
* Makefile.am: New file.
-
diff --git a/pixmaps/ChangeLog b/pixmaps/ChangeLog
deleted file mode 100644
index b177f0a..0000000
--- a/pixmaps/ChangeLog
+++ /dev/null
@@ -1,21 +0,0 @@
-2009-02-03 Werner Koch <wk at g10code.com>
-
- * blue_yellow_cardkey.xpm: New.
-
-2008-12-17 Marcus Brinkmann <marcus at g10code.de>
-
- * smartcard.xpm: Darken border.
-
-2008-12-16 Werner Koch <wk at g10code.com>
-
- * smartcard.xpm: New. Create simple smartcard icon.
-
-2008-01-24 Marcus Brinkmann <marcus at g10code.de>
-
- * Makefile.am (noinst_HEADERS): Add keyringeditor.xpm.
-
-2002-12-12 Miguel Coca <mcoca at gnu.org>
-
- * New directory with the old icons, in some cases resized to fit the
- standard toolbar size.
-
diff --git a/pixmaps/ChangeLog-2011 b/pixmaps/ChangeLog-2011
new file mode 100644
index 0000000..7746a27
--- /dev/null
+++ b/pixmaps/ChangeLog-2011
@@ -0,0 +1,27 @@
+2011-12-01 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.
+
+2009-02-03 Werner Koch <wk at g10code.com>
+
+ * blue_yellow_cardkey.xpm: New.
+
+2008-12-17 Marcus Brinkmann <marcus at g10code.de>
+
+ * smartcard.xpm: Darken border.
+
+2008-12-16 Werner Koch <wk at g10code.com>
+
+ * smartcard.xpm: New. Create simple smartcard icon.
+
+2008-01-24 Marcus Brinkmann <marcus at g10code.de>
+
+ * Makefile.am (noinst_HEADERS): Add keyringeditor.xpm.
+
+2002-12-12 Miguel Coca <mcoca at gnu.org>
+
+ * New directory with the old icons, in some cases resized to fit the
+ standard toolbar size.
diff --git a/po/ChangeLog b/po/ChangeLog-2011
similarity index 97%
rename from po/ChangeLog
rename to po/ChangeLog-2011
index c6cd820..baaacbe 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-01 Werner Koch <wk at g10code.com>
+
+ NB: ChangeLog files are no longer manually maintained. Starting
+ on December 12st, 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-05-06 Werner Koch <wk at g10code.com>
* POTFILES.in: Add gpadatebutton.c
@@ -324,7 +331,7 @@
* de.po: Updated.
* POTFILES.in: Added all new files, as well as all of gpapa.
-
+
2002-02-22 Peter Gerwinski <peter.gerwinski at g-n-u.de>
* de.po: Updated.
@@ -336,33 +343,33 @@
2002-02-19 Peter Gerwinski <peter.gerwinski at g-n-u.de>
* de.po: Updated.
-
+
2002-02-15 Peter Gerwinski <peter.gerwinski at g-n-u.de>
* de.po: Updated.
-
+
2002-02-14 Peter Gerwinski <peter.gerwinski at g-n-u.de>
* de.po: Updated.
-
+
2002-02-13 Peter Gerwinski <peter.gerwinski at g-n-u.de>
* de.po: Updated.
-
+
2002-02-11 Peter Gerwinski <peter.gerwinski at g-n-u.de>
* de.po: Updated again.
-
+
2002-02-10 Peter Gerwinski <peter.gerwinski at g-n-u.de>
* de.po: Updated.
-
+
2002-02-05 Peter Gerwinski <peter.gerwinski at g-n-u.de>
* POTFILES.in: Added src/gpafilesel.c to the list.
* de.po: Updated and transcoded to UTF-8.
* de.po.lat1: German translation in Latin-1 encoding.
-
+
2002-01-29 Werner Koch <wk at gnupg.org>
* de.po: Fixed the fuzzy marked translations
@@ -456,5 +463,3 @@
2000-05-16 20:07:52 Werner Koch (wk at habibti.openit.de)
* de.po: Added
-
-
diff --git a/src/ChangeLog b/src/ChangeLog-2011
similarity index 99%
rename from src/ChangeLog
rename to src/ChangeLog-2011
index d5da193..093b546 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-01 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-09-20 Werner Koch <wk at g10code.com>
* keytable.c (first_half_done_cb): Detect missing GPGSM.
@@ -5363,7 +5370,7 @@
* gtktools.c (gpa_window_error):
(gpa_window_message): Translate window titles.
* keygenwizard.c (gpa_keygen_wizard_run): Use "Finish" button
- instead of "Next" on wait_page and final_page.
+ instead of "Next" on wait_page and final_page.
* gpawizard.c (gpa_wizard_new): Add accelerator to "Next" and "Prev"
2001-02-13 Bernhard Herzog <bh at intevation.de>
@@ -6607,5 +6614,3 @@
* gpa.c, keymenu.c, filemenu.c: Removed libiberty header.
* gpa.h: Included xmalloc header.
-
-
diff --git a/st-fonts/ChangeLog b/st-fonts/ChangeLog
deleted file mode 100644
index 06da308..0000000
--- a/st-fonts/ChangeLog
+++ /dev/null
@@ -1,5 +0,0 @@
-2000-07-27 15:33:48 Werner Koch (wk at habibti.openit.de)
-
- Converted the original GIF fonts to PNG.
-
-
diff --git a/st-fonts/ChangeLog-2011 b/st-fonts/ChangeLog-2011
new file mode 100644
index 0000000..208b83d
--- /dev/null
+++ b/st-fonts/ChangeLog-2011
@@ -0,0 +1,10 @@
+2011-12-01 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.
+
+2000-07-27 15:33:48 Werner Koch (wk at habibti.openit.de)
+
+ Converted the original GIF fonts to PNG.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 626 +------------------------------------
ChangeLog => ChangeLog-2011 | 7 +
Makefile.am | 36 ++-
autogen.sh | 7 +
build-aux/git-hooks/commit-msg | 127 ++++++++
build-aux/git-log-fix | 3 +
build-aux/git-log-footer | 14 +
build-aux/gitlog-to-changelog | 360 +++++++++++++++++++++
doc/HACKING | 29 ++
doc/Makefile.am | 2 +-
m4/{ChangeLog => ChangeLog-2011} | 8 +-
pixmaps/ChangeLog | 21 --
pixmaps/ChangeLog-2011 | 27 ++
po/{ChangeLog => ChangeLog-2011} | 25 +-
src/{ChangeLog => ChangeLog-2011} | 11 +-
st-fonts/ChangeLog | 5 -
st-fonts/ChangeLog-2011 | 10 +
17 files changed, 654 insertions(+), 664 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
create mode 100644 doc/HACKING
rename m4/{ChangeLog => ChangeLog-2011} (86%)
delete mode 100644 pixmaps/ChangeLog
create mode 100644 pixmaps/ChangeLog-2011
rename po/{ChangeLog => ChangeLog-2011} (97%)
rename src/{ChangeLog => ChangeLog-2011} (99%)
delete mode 100644 st-fonts/ChangeLog
create mode 100644 st-fonts/ChangeLog-2011
hooks/post-receive
--
The GNU Privacy Assistant
http://git.gnupg.org
More information about the Gnupg-commits
mailing list