From 319e6e9978e7c5c8b6ce40eae164e2b2fe152ff6 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 11 Apr 2006 15:19:24 +0000 Subject: [PATCH] Synch to No Gnus 200604111417. --- ChangeLog | 16 ++++++++++++++++ Makefile.in | 20 +++++++++++++++----- README | 6 +++--- lisp/ChangeLog | 4 ++++ texi/ChangeLog | 4 ++++ 5 files changed, 42 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 13b72d2..91a87ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2006-04-11 Reiner Steib + + * README: No Gnus v0.4 is released. + +2006-04-11 Reiner Steib + + * Makefile.in (release-sign-files): Use rm -f. + (RELEASE_COMMIT_FILES): Add ./ChangeLog. + (release-bump-version): Add README. + (release-check-settings): OLD_TAG, not OLDTAG. + (release-commit): Echo command lines before prompt. + (RELEASE_COMMIT_FILES): Add README. + (OLD_PATTERN): Fix. + (release-bump-version): Fix gnusversionname substitution. + (OLD_PATTERN): Add grouping. + 2006-04-10 Reiner Steib * Makefile.in (GZIP_PROG): Use gzip -f. diff --git a/Makefile.in b/Makefile.in index 6f65a13..ea8cd59 100644 --- a/Makefile.in +++ b/Makefile.in @@ -50,10 +50,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: @@ -264,7 +265,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 @@ -279,7 +280,7 @@ 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 ]*Gnus v/s,$(OLD_PATTERN),$(VERSION),' texi/message.texi sed -i -e 's,/[a-z]*gnus-[0-9.]*/,/$(CIN)gnus-$(VERSION)/,' README @@ -288,6 +289,11 @@ release-bump-version: release-check-settings 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 \ @@ -308,6 +314,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 @@ -315,6 +323,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 @@ -337,7 +347,7 @@ release-sign-files: fi; \ for i in $(CIN)gnus-$(VERSION).tar.gz \ $(CIN)gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz; do \ - rm $$i.sig; \ + rm -f $$i.sig; \ echo "$$phrase" | gpg --detach-sign $$gpg_opt $$i; \ done; true @ls -l $(CIN)gnus-$(VERSION).tar.gz{.sig,} diff --git a/README b/README index fff58eb..dc69f8a 100644 --- a/README +++ b/README @@ -19,7 +19,7 @@ If you are using XEmacs, you *must* say "./configure && make EMACS=xemacs". Then you have to tell Emacs where Gnus is. You might put something like - (setq load-path (cons (expand-file-name "~/gnus-5.10.8/lisp") load-path)) + (setq load-path (cons (expand-file-name "~/ngnus-0.4/lisp") load-path)) (require 'gnus-load) in your .emacs file, or wherever you keep such things. @@ -28,8 +28,8 @@ To enable reading the Gnus manual, you could say something like: (require 'info) (if (featurep 'xemacs) - (add-to-list 'Info-directory-list "~/gnus-5.10.8/texi/") - (add-to-list 'Info-default-directory-list "~/gnus-5.10.8/texi/")) + (add-to-list 'Info-directory-list "~/ngnus-0.4/texi/") + (add-to-list 'Info-default-directory-list "~/ngnus-0.4/texi/")) No Gnus does absolutely not work with anything older than Emacs 21.1 or XEmacs 21.4. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 75546a0..7e30da9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2006-04-11 Reiner Steib + + * gnus.el: No Gnus v0.4 is released. + 2006-04-11 Lars Magne Ingebrigtsen * nnslashdot.el (nnslashdot-retrieve-headers-1): Fix up to new diff --git a/texi/ChangeLog b/texi/ChangeLog index 5331505..c780c4b 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,7 @@ +2006-04-11 Reiner Steib + + * gnus.texi, gnus-faq.texi, message.texi: No Gnus v0.4 is released. + 2006-04-10 Reiner Steib * gnus.texi (Misc Group Stuff, Summary Buffer, Article Keymap) -- 1.7.10.4