diff options
Diffstat (limited to 'agent')
| -rw-r--r-- | agent/ChangeLog-2011 (renamed from agent/ChangeLog) | 9 | ||||
| -rw-r--r-- | agent/Makefile.am | 9 |
2 files changed, 13 insertions, 5 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog-2011 index 09e60262a..f543f2735 100644 --- a/agent/ChangeLog +++ b/agent/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]> * command.c (cmd_keyinfo, do_one_keyinfo): Support options --data @@ -1038,7 +1045,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(). * call-pinentry.c (start_pinentry): Replaced pipe_connect2 by diff --git a/agent/Makefile.am b/agent/Makefile.am index 38200c1d8..cc8a22afd 100644 --- a/agent/Makefile.am +++ b/agent/Makefile.am @@ -6,12 +6,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/>. @@ -22,6 +22,7 @@ libexec_PROGRAMS = gpg-protect-tool gpg-preset-passphrase noinst_PROGRAMS = $(TESTS) # EXTRA_DIST = gpg-agent.ico gpg-agent-resource.rc +EXTRA_DIST = ChangeLog-2011 AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl @@ -72,7 +73,7 @@ gpg_agent_DEPENDENCIES = $(gpg_agent_res_deps) gpg_protect_tool_SOURCES = \ protect-tool.c \ protect.c \ - minip12.c minip12.h + minip12.c minip12.h gpg_protect_tool_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) gpg_protect_tool_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) \ @@ -101,7 +102,7 @@ TESTS = t-protect t_common_ldadd = $(common_libs) \ $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) -t_protect_SOURCES = t-protect.c protect.c +t_protect_SOURCES = t-protect.c protect.c t_protect_LDADD = $(t_common_ldadd) |