From: yamaoka <yamaoka>
Date: Mon, 10 Apr 2006 15:14:21 +0000 (+0000)
Subject: Synch to No Gnus 200604101355.
X-Git-Tag: t-gnus-6_17_4-quimby-~7
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ecfc568a4611a432819ac90b1d1477fde514a3b;p=elisp%2Fgnus.git-

Synch to No Gnus 200604101355.
---

diff --git a/ChangeLog b/ChangeLog
index c3ae46c..13b72d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-04-10  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* Makefile.in (GZIP_PROG): Use gzip -f.
+	(release-bump-version, RELEASE_COMMIT_FILES): Add README.
+	(release-sign-files): Remove old *.sig files.
+
+	* README: Say "development version".  Let sentences end with
+	double space.
+
 2006-04-07  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* Makefile.in (GZIP_PROG): New variable.
diff --git a/Makefile.in b/Makefile.in
index d34e71b..6f65a13 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,7 +35,7 @@ EXAMINE_PACKAGEDIR = $(XEMACS) -batch -q -no-site-file -eval \
 		       dirs (cdr dirs)))) \
 	   (princ (or package-dir \"\")))" 2>/dev/null
 
-GZIP_PROG = gzip
+GZIP_PROG = gzip -f
 
 # # # # # # # # # # Release variables (for maintainer only):
 #
@@ -282,6 +282,7 @@ release-bump-version:	release-check-settings
 	sed -i -e '/^.newcommand{.gnusversionname}{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
 	if [ "x$(CODENAME)" = "x" ]; then \
 	  sed -i -e '/The current release ($(OLD_PATTERN)) should/s,$(OLD_PATTERN),$(VERSION),' texi/gnus-faq.texi; \
 	else \
@@ -336,6 +337,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; \
 	   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 bac94ca..fff58eb 100644
--- a/README
+++ b/README
@@ -1,11 +1,11 @@
-This package contains a beta version of Gnus (beta because the final version
-is the one included in Emacs). The lisp directory contains the source lisp
-files, and the texi directory contains a draft of the Gnus info pages.
+This package contains a development version of Gnus.  The lisp directory
+contains the source lisp files, and the texi directory contains the Gnus info
+pages.
 
 To use Gnus you first have to unpack the files, which you've obviously
 done, because you are reading this.
 
-You should definitely byte-compile the source files. To do that, you
+You should definitely byte-compile the source files.  To do that, you
 can simply say "./configure && make" in this directory.
 
 Do not say "make install".  I repeat, do *NOT* say "make install".  If
@@ -16,7 +16,7 @@ won't.
 
 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
+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))
@@ -38,13 +38,13 @@ To compile the Gnus manual, you either need a pretty new Emacs, or a
 pretty new version of the texinfo tools.
 
 Then you do a `M-x gnus', and everything should... uhm... it should
-work, but it might not. Set `debug-on-error' to t, and mail me the
+work, but it might not.  Set `debug-on-error' to t, and mail me the
 backtraces, or, better yet, find out why Gnus does something wrong,
-fix it, and send me the diffs. :-)
+fix it, and send me the diffs.  :-)
 
 There are four main things I want your help and input on:
 
-1) Startup. Does everything go smoothly, and why not?
+1) Startup.  Does everything go smoothly, and why not?
 
 2) Any errors while you read news normally?
 
@@ -54,4 +54,4 @@ There are four main things I want your help and input on:
    bit, and features you would like to see.
 
 Send any comments and all your bug fixes/complaints to
-`bugs@gnus.org'. 
+`bugs@gnus.org'.