aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2011-12-02 10:32:31 +0000
committerWerner Koch <[email protected]>2011-12-02 10:36:37 +0000
commita4c4ee1aaea4359432bdf60dd572f549ef8dee83 (patch)
tree479a4c6baca2d581bfbd5f195d80b7255fd5ad38 /src
parentRemove support for libgpgme-pth. (diff)
downloadgpgme-a4c4ee1aaea4359432bdf60dd572f549ef8dee83.tar.gz
gpgme-a4c4ee1aaea4359432bdf60dd572f549ef8dee83.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog-2011 (renamed from src/ChangeLog)16
-rw-r--r--src/Makefile.am3
2 files changed, 14 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog-2011
index e53b226b..c1a901a2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog-2011
@@ -1,3 +1,10 @@
+2011-12-02 Werner Koch <[email protected]>
+
+ NB: ChangeLog files are no longer manually maintained. Starting
+ on December 1st, 2011 we put change information only in the GIT
+ commit log, and generate a top-level ChangeLog file from logs at
+ "make dist". See doc/HACKING for details.
+
2011-10-25 Marcus Brinkmann <[email protected]>
* 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 d4f4ba7f..cc0b78d3 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