[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.23-3-g52b96ef

[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, STABLE-BRANCH-2-0 has been updated
       via  52b96ef6b81951ddacf146a74e88e5512efd03a0 (commit)
      from  07f8a37637da310d176879d491f8df2a881b117e (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 52b96ef6b81951ddacf146a74e88e5512efd03a0
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Jun 3 13:34:24 2014 +0200

    doc: Update for modern makeinfo.
    
    * doc/texi.css: Remove.
    * doc/Makefile.am (AM_MAKEINFOFLAGS): Use --css-ref.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 252fc52..a1ca4ba 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -34,7 +34,7 @@ EXTRA_DIST = samplekeys.asc ChangeLog-2011 \
              gnupg-card-architecture.pdf \
              FAQ gnupg7.texi \
              opt-homedir.texi see-also-note.texi specify-user-id.texi \
-	     gpgv.texi texi.css  yat2m.c
+	     gpgv.texi yat2m.c
 
 BUILT_SOURCES = gnupg-card-architecture.eps gnupg-card-architecture.png \
                 gnupg-card-architecture.pdf
@@ -55,7 +55,7 @@ gnupg_TEXINFOS = \
 
 DVIPS = TEXINPUTS="$(srcdir)$(PATH_SEPARATOR)$$TEXINPUTS" dvips
 
-AM_MAKEINFOFLAGS = -I $(srcdir) --css-include=$(srcdir)/texi.css
+AM_MAKEINFOFLAGS = -I $(srcdir) --css-ref=/share/site.css
 
 YAT2M_OPTIONS = -I $(srcdir) \
         --release "GnuPG @PACKAGE_VERSION@" --source "GNU Privacy Guard"
@@ -136,12 +136,12 @@ online: gnupg.html gnupg.pdf
 	set -e; \
 	echo "Uploading current manuals to www.gnupg.org ..."; \
 	cp $(srcdir)/gnupg-logo.png gnupg.html/; \
-        user=werner ; dashdevel="" ; \
+        user=werner ; webhost=ftp.gnupg.org; dashdevel="" ; \
         if echo "@PACKAGE_VERSION@" | grep -- "-git" >/dev/null; then \
 	  dashdevel="-devel" ; \
 	else \
-          rsync -v gnupg.pdf $${user}@cvs.gnupg.org:webspace/manuals/ ; \
+          rsync -v gnupg.pdf $${user}@{webhost}:webspace/manuals/ ; \
         fi ; \
 	cd gnupg.html ; \
         rsync -vr --exclude='.svn' .  \
-	  $${user}@cvs.gnupg.org:webspace/manuals/gnupg$${dashdevel}/
+	  $${user}@{webhost}:webspace/manuals/gnupg$${dashdevel}/
diff --git a/doc/texi.css b/doc/texi.css
deleted file mode 100644
index a369abc..0000000
--- a/doc/texi.css
+++ /dev/null
@@ -1,6 +0,0 @@
-/* The gnupg.org standard stylesheet.  */
-  @import url(/share/site.css);
-
-
-
-

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

Summary of changes:
 doc/Makefile.am |   10 +++++-----
 doc/texi.css    |    6 ------
 2 files changed, 5 insertions(+), 11 deletions(-)
 delete mode 100644 doc/texi.css


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