Merge from emacs--devo--0

[gnu-emacs] / admin / make-tarball.txt

diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 4ca4a21feabbf8ec07cffedd417c66e261a3672a..2c6ccf95c402bd7af367d2c226842885518adccb 100644 (file)
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -21,11 +21,12 @@ For each step, check for possible errors.
 
 5.   rm configure; make bootstrap
 
-6.  Commit configure, README, AUTHORS, lisp/cus-load.el,
-    lisp/finder-inf.el, lisp/version.el, man/emacs.texi.
-    Copy lisp/loaddefs.el to lisp/ldefs-boot.el and commit
-    lisp/ldefs-boot.el.  For a release, also commit the ChangeLog
-    files in all directories.
+6.  Commit configure, README, AUTHORS, lisp/finder-inf.el,
+    lisp/version.el, man/emacs.texi, lispref/elisp.texi,
+    mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings,
+    mac/src/Emacs.r, nt/emacs.rc.  Copy lisp/loaddefs.el to
+    lisp/ldefs-boot.el and commit lisp/ldefs-boot.el.  For a release,
+    also commit the ChangeLog files in all directories.
 
 7.   make-dist --snapshot.  Check the contents of the new tar with
      admin/diff-tar-files against an older tar file.  Some old pretest
@@ -62,17 +63,35 @@ For each step, check for possible errors.
      echo directory: emacs/pretest > FILE.directive      (for a pretest)
      echo directory: emacs > FILE.directive              (for a release)
      gpg --clearsign FILE.directive
-    Upload by anonymous ftp to ftp://ftp-upload.gnu.org/incoming/ftp/
-    the files FILE, FILE.sig, FILE.directive.asc
+    Upload by anonymous ftp to ftp://ftp-upload.gnu.org/ the files FILE,
+    FILE.sig, FILE.directive.asc.
+    For a release, place the files in the /incoming/ftp directory.
+    For a pretest, place the files in /incoming/alpha instead, so that
+    they appear on ftp://alpha.gnu.org/.
 
 13. After five minutes, verify that the files are visible at
     ftp://alpha.gnu.org/gnu/emacs/pretest/ for a pretest, at
     ftp://ftp.gnu.org/gnu/emacs/ for a release.
 
-14. For a pretest, let Richard Stallman know about the new pretest and
+14. For a pretest, let Richard Stallman <rms@gnu.org> know about the new pretest and
     tell him to announce it using the announcement you prepared.  Remind
     him to set a Reply-to header to <emacs-pretest-bug@gnu.org>.
-    For a release, Richard should prepare the announcement himself,
+
+15. Shortly before the release, cut the branch with the following commands:
+
+    cvs rtag EMACS_`NUMBER'_BASE
+    cvs rtag -b EMACS_`NUMBER'_RC -r EMACS_`NUMBER'_BASE
+
+where `NUMBER' is the major version number of the release.  This makes it
+easier to  see what changes have been applied to the branch with:
+
+    cvs diff -r EMACS_`NUMBER'_BASE -r EMACS_`NUMBER'_RC
+
+or merge changes back to the trunk with "cvs update -j", if necessary.
+
+After doing this, increase the version number on the trunk as per step 4.
+
+16. For a release, Richard should prepare the announcement himself,
     possibly starting from a previous announcment.
 
 # arch-tag: c23c771f-ca26-4584-8a04-50ecf0989390