Updated to automake 1.10.

Use latest texinfo.tex.
Typo and grammar fix.

ChangeLog

@@ -2,7 +2,9 @@
 
 	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Add --enable-mailto
 
-	* configure.ac (AC_CONFIG_FILES): Rename gpgkeys_ to gpg2keys_.
+	* configure.ac: Require automake 1.10
+	(AC_CONFIG_FILES): Rename gpgkeys_ to gpg2keys_.
+	(AM_PROG_CC_C_O): New.
 
 2007-03-08  Werner Koch  <wk@g10code.com>
 

THANKS

@@ -19,6 +19,7 @@ Ariel T Glenn		   ariel at columbia.edu
 ARIGA Seiji                ariga at os.rim.or.jp
 Benjamin Donnachie         benjamin at py-soft.co.uk
 Bernhard Herzog            bh at intevation.de
+Bernard Leak               thisisnotapipe.a-t.hotmail.com
 Bernhard Reiter            bernhard at intevation.de
 Billy Halsey               bshalsey at paxoo.com
 Bob Dunlop                 bob at xyzzy.org.uk

configure.ac

@@ -20,8 +20,8 @@
 # USA.
 
 # Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)
-min_automake_version="1.9.3"
+AC_PREREQ(2.60)
+min_automake_version="1.10"
 
 # Remember to change the version number immediately *after* a release.
 # Set my_issvn to "yes" for non-released code.  Remember to run an
@@ -445,6 +445,7 @@ AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_PROG_AWK
 AC_PROG_CC
 AC_PROG_CPP
+AM_PROG_CC_C_O
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_RANLIB

doc/ChangeLog

@@ -1,3 +1,9 @@
+2007-05-04  Werner Koch  <wk@g10code.com>
+
+	* gnupg.texi (Top): Fix typo and a grammar issue.
+	* Makefile.am (EXTRA_DIST): Add gnupg-logo.png.  Suggested by
+	Bernard Leak.
+
 2007-04-15  David Shaw  <dshaw@jabberwocky.com>
 
 	* gpg.texi (OpenPGP Options): Update the personal-foo-preferences

doc/Makefile.am

@@ -23,7 +23,7 @@ examples = examples/README examples/scd-event examples/trustlist.txt \
 	   examples/gpgconf.conf
 
 EXTRA_DIST = DETAILS HACKING TRANSLATE OpenPGP KEYSERVER samplekeys.asc \
-	     gnupg-logo.eps gnupg-logo.pdf \
+	     gnupg-logo.eps gnupg-logo.pdf gnupg-logo.png \
              gnupg-card-architecture.eps gnupg-card-architecture.png \
              gnupg-card-architecture.pdf \
              faq.raw FAQ faq.html gnupg7.texi \

doc/gnupg.texi

@@ -131,7 +131,7 @@ the administration and the architecture.
                         how you can copy and share GnuPG
 * Contributors::        People who have contributed to GnuPG.
 
-* Glossary::            Short descrition of used terms.
+* Glossary::            Short description of terms used.
 * Option Index::        Index to command line options.
 * Index::	        Index of concepts and symbol names.
 @end menu

scripts/ChangeLog

@@ -1,6 +1,10 @@
+2007-05-04  Werner Koch  <wk@g10code.com>
+
+	* texinfo.tex: Updated from gnulib.
+
 2007-04-04  Werner Koch  <wk@g10code.com>
 
-	* mail-to-translators: Copied from 1.4. and adjusted.
+	* mail-to-translators: Copied from 1.4 and adjusted.
 
 2004-09-30  Werner Koch  <wk@g10code.com>