* gnus.el (gnus-find-method-for-group): On killed/unknown groups, try

[gnus] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index a7d4c04..766ab90 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,6 +7,8 @@ srcdir = @srcdir@
 EMACS = @EMACS@
 XEMACS = @EMACS@
 
+GZIP_PROG = gzip -f
+
 # # # # # # # # # # Release variables (for maintainer only):
 #
 # Files removed from `cvs export' output before creating the tar-ball:
@@ -20,10 +22,11 @@ CODENAME =
 # Codename initial (lower case), e.g. 'n' for "No Gnus".
 CIN =
 # Files with hard-coded versions numbers:
-RELEASE_COMMIT_FILES = lisp/ChangeLog lisp/gnus.el \
+RELEASE_COMMIT_FILES = ChangeLog README \
+  lisp/ChangeLog lisp/gnus.el \
   texi/ChangeLog texi/gnus.texi texi/message.texi texi/gnus-faq.texi
 # Pattern matching previous version(s):
-OLD_PATTERN = '5.10.[0-9]*\|0\.3'
+OLD_PATTERN = \(5.10.[0-9]*\|0\.[1-9][0-9]*\)
 # CVS tag of the previous version:
 OLD_TAG     = v5-10-6
 # CVS tag of the current release:
@@ -103,7 +106,7 @@ release-check-settings:
        @echo "CODENAME  = '$(CODENAME)' (example: 'No ')"
        @echo "CIN       = '$(CIN)' (example: 'n', codename initial)"
        @echo "TAG       = '$(TAG)' (example: 'v5-10-6')"
-       @echo "OLDTAG    = '$(OLDTAG)' (example: 'v5-10-5')"
+       @echo "OLD_TAG   = '$(OLD_TAG)' (example: 'v5-10-5')"
        @echo
        @if [ x"$(VERSION)" = x ]; then echo "error: No VERSION given."; exit 1; else :; fi
        @if [ x"$(TAG)" = x ]; then echo "error: No TAG given."; exit 1; else :; fi
@@ -118,14 +121,20 @@ release-check-settings:
 # Needs GNU grep and a recent GNU sed:
 release-bump-version:  release-check-settings
        sed -i -e '/^(defconst gnus-version-number /s,"$(OLD_PATTERN)","$(VERSION)",' lisp/gnus.el
-       sed -i -e '/^.newcommand{.gnusversionname}{Gnus v/s,$(OLD_PATTERN),$(VERSION),' texi/gnus.texi
+       sed -i -e '/^.newcommand{.gnusversionname}{[A-Za-z ]*Gnus v/s,$(OLD_PATTERN),$(VERSION),' texi/gnus.texi
        sed -i -e '/^This manual corresponds to [A-Za-z ]*Gnus v/s,$(OLD_PATTERN),$(VERSION),' texi/gnus.texi
-       sed -i -e '/^corresponding to this manual is [A-Za-z ]*Gnusv/s,$(OLD_PATTERN),$(VERSION),' texi/message.texi
+       sed -i -e '/^corresponding to this manual is [A-Za-z ]*Gnus v/s,$(OLD_PATTERN),$(VERSION),' texi/message.texi
+       sed -i -e 's,/[a-z]*gnus-[0-9.]*/,/$(CIN)gnus-$(VERSION)/,' README
        if [ "x$(CODENAME)" = "x" ]; then \
          sed -i -e '/The current release ($(OLD_PATTERN)) should/s,$(OLD_PATTERN),$(VERSION),' texi/gnus-faq.texi; \
        else \
          true; \
        fi
+       @if grep -q "$(CODENAME)Gnus v$(VERSION) is released" ChangeLog; then \
+         echo "ChangeLog is already updated"; \
+       else \
+         sed -i -e "1s|^|`date -I`  $(COMMITTER)\n\n\t* README: $(CODENAME)Gnus v$(VERSION) is released.\n\n|" ChangeLog; \
+       fi
        @if grep -q "$(CODENAME)Gnus v$(VERSION) is released" texi/ChangeLog; then \
          echo "texi/ChangeLog is already updated"; \
        else \
@@ -146,6 +155,8 @@ release-commit:     release-check-settings
        @echo -e '\007'
        @echo
        @echo "Really do the release-commit for $(CODENAME)Gnus v$(VERSION)?"
+       @echo "Command line:"
+       @echo "  " cvs commit -m "$(CODENAME)Gnus v$(VERSION) is released." $(RELEASE_COMMIT_FILES)
        @echo
        @echo "Hit RET to continue or Ctrl-C to abort."
        @echo
@@ -153,6 +164,8 @@ release-commit:     release-check-settings
        cvs commit -m "$(CODENAME)Gnus v$(VERSION) is released." $(RELEASE_COMMIT_FILES)
        @echo
        @echo "Add tag $(TAG) to CVS?"
+       @echo "Command line:"
+       @echo "  " cvs tag $(TAG)
        @echo "Hit RET to continue or Ctrl-C to abort."
        @echo
        @read dummy
@@ -163,11 +176,20 @@ 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 ; \
+          rm -f $$i.sig; \
+          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,}
@@ -189,7 +211,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