diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog-2011 (renamed from g10/ChangeLog) | 15 | ||||
| -rw-r--r-- | g10/Makefile.am | 18 |
2 files changed, 20 insertions, 13 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog-2011 index a42c49000..48a05ad4a 100644 --- a/g10/ChangeLog +++ b/g10/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]> * keyedit.c (show_key_with_all_names): Remove set but unused var @@ -1377,7 +1384,7 @@ * status.h (STATUS_ERROR): New status code. * status.c (get_status_string): Ditto. * mainproc.c (proc_plaintext): Emit it if multiple messages are - detected. Error out if more than one plaintext packet is + detected. Error out if more than one plaintext packet is encountered. * mainproc.c (literals_seen): New. @@ -1714,7 +1721,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(). 2006-09-13 Werner Koch <[email protected]> @@ -3783,7 +3790,7 @@ * tdbio.c (MY_O_BINARY): Need binary mode with Cygwin. From Werner on stable branch. - * g10.c, gpgv.c (main) [__CYGWIN32__]: Don't get the homedir from + * g10.c, gpgv.c (main) [__CYGWIN32__]: Don't get the homedir from the registry. From Werner on stable branch. * keyedit.c (show_key_with_all_names_colon): Make --with-colons @@ -7244,7 +7251,7 @@ (pk_from_block): Removed the namehash arg and changed all callers. (merge_selfsigs): Copy prefs to all keys. * trustdb.c (get_pref_data): Removed. - (is_algo_in_prefs): Removed. + (is_algo_in_prefs): Removed. (make_pref_record): Deleted and removed all class. * pkclist.c (select_algo_from_prefs): Adjusted for the new preference implementation. diff --git a/g10/Makefile.am b/g10/Makefile.am index 3c85bbe6f..126c55cf8 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -7,27 +7,27 @@ # 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/>. ## Process this file with automake to produce Makefile.in -EXTRA_DIST = options.skel +EXTRA_DIST = options.skel ChangeLog-2011 AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common \ - -I$(top_srcdir)/include -I$(top_srcdir)/intl + -I$(top_srcdir)/include -I$(top_srcdir)/intl include $(top_srcdir)/am/cmacros.am AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) -needed_libs = $(libcommon) ../jnlib/libjnlib.a ../gl/libgnu.a +needed_libs = $(libcommon) ../jnlib/libjnlib.a ../gl/libgnu.a bin_PROGRAMS = gpg2 gpgv2 noinst_PROGRAMS = $(module_tests) @@ -69,7 +69,7 @@ common_source = \ plaintext.c \ sig-check.c \ keylist.c \ - pkglue.c pkglue.h + pkglue.c pkglue.h gpg2_SOURCES = gpg.c \ server.c \ @@ -107,7 +107,7 @@ gpg2_SOURCES = gpg.c \ gpgv2_SOURCES = gpgv.c \ $(common_source) \ - verify.c + verify.c #gpgd_SOURCES = gpgd.c \ # ks-proto.h \ @@ -124,7 +124,7 @@ gpg2_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \ gpgv2_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \ $(LIBICONV) -t_common_ldadd = +t_common_ldadd = module_tests = t-rmd160 t_rmd160_SOURCES = t-rmd160.c rmd160.c t_rmd160_LDADD = $(t_common_ldadd) @@ -138,4 +138,4 @@ install-data-local: $(DESTDIR)$(pkgdatadir)/gpg-conf.skel uninstall-local: - -@rm $(DESTDIR)$(pkgdatadir)/gpg-conf.skel + -@rm $(DESTDIR)$(pkgdatadir)/gpg-conf.skel |