Revision: emacs@sv.gnu.org/gnus--devo--0--patch-80

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 54-56)

   - Update from CVS

2006-03-10  Reiner Steib  <Reiner.Steib@gmx.de>

   * Makefile.in (release-check-settings): Add status and
   suggestions.
   (release-files): Remove duplicate release-cvs-export.
   (README): New target.
   (release-files, release-make-tar-ball, release-diff): List files.
   (README, release-make-tar-ball): Fix.

diff --git a/ChangeLog b/ChangeLog
index ab1d80c..39abb52 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,15 @@
        etc/images/sort-criteria.xpm, etc/images/sort-descending.xpm,
        etc/images/sort-row-ascending.xpm: New icons from GNOME 2.6.
 
        etc/images/sort-criteria.xpm, etc/images/sort-descending.xpm,
        etc/images/sort-row-ascending.xpm: New icons from GNOME 2.6.
 

+2006-03-10  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * Makefile.in (release-check-settings): Add status and
+       suggestions.
+       (release-files): Remove duplicate release-cvs-export.
+       (README): New target.
+       (release-files, release-make-tar-ball, release-diff): List files.
+       (README, release-make-tar-ball): Fix.
+

 2006-03-06  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * GNUS-NEWS: Generated.
 2006-03-06  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * GNUS-NEWS: Generated.

diff --git a/Makefile.in b/Makefile.in
index dce6771..36caec0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -106,6 +106,13 @@ release-check-settings:
        @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
        @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

+       @echo
+       @echo Settings checked successfully.
+       @echo
+       @echo You may now make...
+       @echo   release-bump-version
+       @echo   release-commit
+       @echo   release-files

 
 # Needs GNU grep and a recent GNU sed:
 release-bump-version:  release-check-settings
 
 # Needs GNU grep and a recent GNU sed:
 release-bump-version:  release-check-settings


@@ -146,15 +153,25 @@ release-commit:   release-check-settings
        @read dummy
        cvs tag $(TAG)
 
        @read dummy
        cvs tag $(TAG)
 

-release-files: release-cvs-export release-make-tar-ball release-diff
+release-files: release-make-tar-ball release-diff
+       @echo "Release files have been created:"
+       @ls -l gnus-$(TAG).tar.gz
+       @ls -l        gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz

 
 release-cvs-export gnus-$(TAG):        release-check-settings
 
 release-cvs-export gnus-$(TAG):        release-check-settings

+       rm -fr gnus-$(TAG)

        cvs export -d gnus-$(TAG) -r $(TAG) gnus
 
 release-make-tar-ball: gnus-$(TAG) $(TAR_BALL_EXTRA)
        [ -d gnus-$(TAG) ] && cd gnus-$(TAG) && \
          rm $(CVS_IGNORE_FILES) || true
        cvs export -d gnus-$(TAG) -r $(TAG) gnus
 
 release-make-tar-ball: gnus-$(TAG) $(TAR_BALL_EXTRA)
        [ -d gnus-$(TAG) ] && cd gnus-$(TAG) && \
          rm $(CVS_IGNORE_FILES) || true

+       cp -p $(TAR_BALL_EXTRA) gnus-$(TAG)/

        tar zcvf gnus-$(TAG).tar.gz gnus-$(TAG)
        tar zcvf gnus-$(TAG).tar.gz gnus-$(TAG)

+       ls -l gnus-$(TAG).tar.gz
+
+README:
+       @echo README is not in CVS.  Get it from Lars.
+       false

 
 # Make a diff between current and previous release.  Example:
 # ftp://quimby.gnus.org/pub/gnus/ding-patches/gnus-5.10.5-5.10.6.diff.gz
 
 # Make a diff between current and previous release.  Example:
 # ftp://quimby.gnus.org/pub/gnus/ding-patches/gnus-5.10.5-5.10.6.diff.gz


@@ -162,6 +179,7 @@ release-diff:       release-check-settings
        cvs diff -r $(OLD_TAG) -r $(TAG) > temp.diff || true
        mv temp.diff gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff
        gzip         gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff
        cvs diff -r $(OLD_TAG) -r $(TAG) > temp.diff || true
        mv temp.diff gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff
        gzip         gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff

+       ls -l        gnus-`echo $(OLD_TAG)%$(TAG)|tr - .|tr -d v|tr % -`.diff.gz

 
 release-post-clean:    release-check-settings
        rm -fr gnus-$(TAG) temp.diff
 
 release-post-clean:    release-check-settings
        rm -fr gnus-$(TAG) temp.diff