Synch to No Gnus 200604071435.

diff --git a/ChangeLog b/ChangeLog
index 4ef5368..c3ae46c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-07  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * Makefile.in (GZIP_PROG): New variable.
+       (release-diff): Use it.
+       (release-sign-files): New sign-only target.  Use GPG_AGENT_INFO.
+
 2006-04-04  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * Makefile.in (TAR_BALL_EXTRA, release-make-tar-ball, README):

diff --git a/Makefile.in b/Makefile.in
index 26a5d67..d34e71b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,6 +35,8 @@ EXAMINE_PACKAGEDIR = $(XEMACS) -batch -q -no-site-file -eval \
                       dirs (cdr dirs)))) \
           (princ (or package-dir \"\")))" 2>/dev/null
 
+GZIP_PROG = gzip
+
 # # # # # # # # # # Release variables (for maintainer only):
 #
 # Files removed from `cvs export' output before creating the tar-ball:
@@ -322,11 +324,19 @@ release-files:    release-make-tar-ball release-diff
        @ls -l $(CIN)gnus-$(VERSION).tar.gz
        @ls -l $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz
 
-release-files-signed:  release-files
-       read -sp "Enter pass phrase: " phrase ; \
+release-files-signed:  release-files release-sign-files
+
+# Sign prepared files:
+release-sign-files:
+       if [ "x$$GPG_AGENT_INFO" = "x" ]; then \
+         read -sp "Enter pass phrase: " phrase ; \
+         gpg_opt="--passphrase-fd 0"; \
+       else \
+         gpg_opt=""; phrase=""; \
+       fi; \
        for i in $(CIN)gnus-$(VERSION).tar.gz \
                 $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz; do \
-          echo "$$phrase" | gpg --passphrase-fd 0 --detach-sign $$i ; \
+          echo "$$phrase" | gpg --detach-sign $$gpg_opt $$i; \
        done; true
        @ls -l $(CIN)gnus-$(VERSION).tar.gz{.sig,}
        @ls -l $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz{.sig,}
@@ -348,7 +358,7 @@ release-make-tar-ball:      $(CIN)gnus-$(VERSION)
 release-diff:  release-check-settings
        cvs diff -r $(OLD_TAG) -r $(TAG) | sed -e '/^\? /d' > temp.diff || true
        mv temp.diff $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff
-       gzip         $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff
+       $(GZIP_PROG) $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff
        ls -l        $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz
 
 release-post-clean:    release-check-settings