[git] GnuPG - branch, master, updated. gnupg-2.1.0beta1-33-g52b9761

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  52b9761c8847523d35de3484e4b7fdefbb0e6a4e (commit)
       via  8db3bf8c47a76e9f7d75863d49c172b5ddd94896 (commit)
      from  2732f2ff3f44a5aae969d5ce16a4de74478576a2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 52b9761c8847523d35de3484e4b7fdefbb0e6a4e
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jan 13 15:32:11 2011 +0100

    ifset parts which are not in GnuPG 2.0

diff --git a/doc/debugging.texi b/doc/debugging.texi
index 7b1d068..c83ab1e 100644
--- a/doc/debugging.texi
+++ b/doc/debugging.texi
@@ -103,7 +103,7 @@ used.  Using the keyserver debug option as in
 is thus often helpful.  Note that the actual output depends on the
 backend and may change from release to release.
 
-
+ at ifset gpgtwoone
 @item Logging on WindowsCE
 
 For development, the best logging method on WindowsCE is the use of
@@ -113,7 +113,7 @@ on the given port. (@pxref{option watchgnupg --tcp}).  For in the field
 tests it is better to make use of the logging facility provided by the
 @command{gpgcedev} driver (part of libassuan); this is enabled by using
 a log file name of @file{GPG2:}. (@pxref{option --log-file}).
-
+ at end ifset
 
 @end itemize
 
diff --git a/doc/gnupg.texi b/doc/gnupg.texi
index 86e192e..7bb54af 100644
--- a/doc/gnupg.texi
+++ b/doc/gnupg.texi
@@ -34,7 +34,7 @@ Published by the Free Software Foundation@*
 Boston, MA 02110-1301 USA
 @end iftex
 
-Copyright @copyright{} 2002, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+Copyright @copyright{} 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -51,8 +51,10 @@ section entitled ``Copying''.
 * gpg2: (gnupg).           OpenPGP encryption and signing tool.
 * gpgsm: (gnupg).          S/MIME encryption and signing tool.
 * gpg-agent: (gnupg).      The secret key daemon.
+ at ifset gpgtwoone
 * dirmngr: (gnupg).        X.509 CRL and OCSP server.
 * dirmngr-client: (gnupg). X.509 CRL and OCSP client.
+ at end ifset
 @end direntry
 
 
@@ -124,7 +126,9 @@ the administration and the architecture.
 * Installation::        A short installation guide.
 
 * Invoking GPG-AGENT::  How to launch the secret key daemon.
+ at ifset gpgtwoone
 * Invoking DIRMNGR::    How to launch the CRL and OCSP daemon.
+ at end ifset
 * Invoking GPG::        Using the OpenPGP protocol.
 * Invoking GPGSM::      Using the S/MIME protocol.
 * Invoking SCDAEMON::   How to handle Smartcards.
@@ -156,7 +160,9 @@ the administration and the architecture.
 @include instguide.texi
 
 @include gpg-agent.texi
+ at ifset gpgtwoone
 @include dirmngr.texi
+ at end ifset
 @include gpg.texi
 @include gpgsm.texi
 @include scdaemon.texi
diff --git a/doc/tools.texi b/doc/tools.texi
index a21f413..c85f9e2 100644
--- a/doc/tools.texi
+++ b/doc/tools.texi
@@ -16,7 +16,9 @@ GnuPG comes with a couple of smaller tools:
 * gpgsm-gencert.sh::      Generate an X.509 certificate request.
 * gpg-preset-passphrase:: Put a passphrase into the cache.
 * gpg-connect-agent::     Communicate with a running agent.
+ at ifset gpgtwoone
 * dirmngr-client::        How to use the Dirmngr client tool.
+ at end ifset
 * gpgparsemail::          Parse a mail message into an annotated format
 * symcryptrun::           Call a simple symmetric encryption tool.
 * gpg-zip::               Encrypt or sign files into an archive.
@@ -1434,6 +1436,7 @@ Print a list of available control commands.
 @include see-also-note.texi
 @end ifset
 
+ at ifset gpgtwoone
 @c
 @c   DIRMNGR-CLIENT
 @c
@@ -1594,7 +1597,7 @@ Squid's @option{external_acl_type} option.
 @command{gpgsm}(1)
 @include see-also-note.texi
 @end ifset
-
+ at end ifset
 
 @c
 @c   GPGPARSEMAIL

commit 8db3bf8c47a76e9f7d75863d49c172b5ddd94896
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Jan 10 14:38:32 2011 +0100

    Add ignore file

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..699581b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,12 @@
+Makefile.in
+aclocal.m4
+autom4te.cache/
+configure
+config.h.in
+config.h
+common/audit-events.h
+common/status-codes.h
+doc/gnupg.info*
+doc/stamp-vti
+doc/version.texi
+po/gnupg2.pot

-----------------------------------------------------------------------

Summary of changes:
 .gitignore         |   12 ++++++++++++
 doc/debugging.texi |    4 ++--
 doc/gnupg.texi     |    8 +++++++-
 doc/tools.texi     |    5 ++++-
 4 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 .gitignore


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org