aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/ChangeLog-2011 (renamed from tools/ChangeLog)9
-rw-r--r--tools/Makefile.am14
2 files changed, 15 insertions, 8 deletions
diff --git a/tools/ChangeLog b/tools/ChangeLog-2011
index 195f0c424..1eca0b5c5 100644
--- a/tools/ChangeLog
+++ b/tools/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-08-04 Werner Koch <[email protected]>
* symcryptrun.c: Include utmp.h for login_tty.
@@ -584,7 +591,7 @@
2006-09-12 Werner Koch <[email protected]>
- Replaced all call gpg_error_from_errno(errno) by
+ Replaced all call gpg_error_from_errno(errno) by
gpg_error_from_syserror().
* gpg-connect-agent.c (read_and_print_response): With verbosity
diff --git a/tools/Makefile.am b/tools/Makefile.am
index e07d8e3e0..32940a3f6 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,23 +1,23 @@
# Makefile.am - Tools directory
# Copyright (C) 2003, 2007 Free Software Foundation, Inc.
-#
+#
# This file is part of GnuPG.
-#
+#
# GnuPG 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.
-#
+#
# GnuPG is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
EXTRA_DIST = \
- Manifest watchgnupg.c \
+ Manifest watchgnupg.c ChangeLog-2011 \
addgnupghome applygnupgdefaults gpgsm-gencert.sh \
lspgpot mail-signed-keys convert-from-106 sockprox.c \
ccidmon.c
@@ -75,14 +75,14 @@ gpgconf_LDADD = $(common_libs) \
$(LIBINTL) $(GPG_ERROR_LIBS) $(LIBICONV) $(W32SOCKLIBS)
gpgparsemail_SOURCES = gpgparsemail.c rfc822parse.c rfc822parse.h
-gpgparsemail_LDADD =
+gpgparsemail_LDADD =
symcryptrun_SOURCES = symcryptrun.c
symcryptrun_LDADD = $(LIBUTIL_LIBS) $(common_libs) $(pwquery_libs) \
$(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) \
$(LIBICONV) $(W32SOCKLIBS)
-watchgnupg_SOURCES = watchgnupg.c
+watchgnupg_SOURCES = watchgnupg.c
watchgnupg_LDADD = $(NETLIBS)
gpg_connect_agent_SOURCES = gpg-connect-agent.c no-libgcrypt.c