diff options
Diffstat (limited to 'kbx')
| -rw-r--r-- | kbx/ChangeLog-2011 (renamed from kbx/ChangeLog) | 9 | ||||
| -rw-r--r-- | kbx/Makefile.am | 12 |
2 files changed, 14 insertions, 7 deletions
diff --git a/kbx/ChangeLog b/kbx/ChangeLog-2011 index 701e41197..ed3aa4161 100644 --- a/kbx/ChangeLog +++ b/kbx/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]> * keybox-openpgp.c (parse_key): Remove set but unused vars @@ -117,7 +124,7 @@ 2006-09-14 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(). 2005-10-08 Marcus Brinkmann <[email protected]> diff --git a/kbx/Makefile.am b/kbx/Makefile.am index 14e8fa5e2..0d6a066e6 100644 --- a/kbx/Makefile.am +++ b/kbx/Makefile.am @@ -1,4 +1,4 @@ -# Keybox Makefile +# Keybox Makefile # Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. # # This file is part of GnuPG. @@ -7,12 +7,12 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. -# +# # GnuPG is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, see <http://www.gnu.org/licenses/>. @@ -21,7 +21,7 @@ localedir = $(datadir)/locale INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\" -EXTRA_DIST = mkerrors +EXTRA_DIST = mkerrors ChangeLog-2011 AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl \ $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) @@ -37,7 +37,7 @@ common_sources = \ keybox-search.c \ keybox-update.c \ keybox-openpgp.c \ - keybox-dump.c + keybox-dump.c libkeybox_a_SOURCES = $(common_sources) @@ -50,4 +50,4 @@ kbxutil_LDADD = ../common/libcommon.a ../jnlib/libjnlib.a ../gl/libgnu.a \ $(KSBA_LIBS) $(LIBGCRYPT_LIBS) \ $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) $(W32SOCKLIBS) -$(PROGRAMS) : ../common/libcommon.a ../jnlib/libjnlib.a ../gl/libgnu.a +$(PROGRAMS) : ../common/libcommon.a ../jnlib/libjnlib.a ../gl/libgnu.a |