3 files changed, 38 insertions, 8 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 6a636091a7c..a12e6c05e64 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,12 @@
+2013-03-10  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (add-release-logs): Use UTC for release date.
+
+2013-03-09  Glenn Morris  <rgm@gnu.org>
+
+        * admin.el (add-release-logs): Provide interactive defaults.
+        Allow specification of the release date.  Don't exclude gnus/.
+
 2013-03-05  Paul Eggert  <eggert@cs.ucla.edu>
 
         * notes/unicode: Add notes about Emacs source file encoding.
diff --git a/admin/admin.el b/admin/admin.el
index e815dfade47..fc793c17bd2 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -28,25 +28,38 @@
 
 (defvar add-log-time-format)            ; in add-log
 
-(defun add-release-logs (root version)
+;; Does this information need to be in every ChangeLog, as opposed to
+;; just the top-level one?  Only if you allow changes the same
+;; day as the release.
+;; http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00161.html
+(defun add-release-logs (root version &optional date)
   "Add \"Version VERSION released.\" change log entries in ROOT.
-Root must be the root of an Emacs source tree."
-  (interactive "DEmacs root directory: \nNVersion number: ")
+Root must be the root of an Emacs source tree.
+Optional argument DATE is the release date, default today."
+  (interactive (list (read-directory-name "Emacs root directory: ")
+                     (read-string "Version number: "
+                                  (format "%s.%s" emacs-major-version
+                                          emacs-minor-version))
+                     (read-string "Release date: "
+                                  (progn (require 'add-log)
+                                         (let ((add-log-time-zone-rule t))
+                                           (funcall add-log-time-format))))))
   (setq root (expand-file-name root))
   (unless (file-exists-p (expand-file-name "src/emacs.c" root))
     (error "%s doesn't seem to be the root of an Emacs source tree" root))
   (require 'add-log)
+  (or date (setq date (let ((add-log-time-zone-rule t))
+                        (funcall add-log-time-format))))
   (let* ((logs (process-lines "find" root "-name" "ChangeLog"))
          (entry (format "%s  %s  <%s>\n\n\t* Version %s released.\n\n"
-                        (funcall add-log-time-format)
+                        date
                         (or add-log-full-name (user-full-name))
                         (or add-log-mailing-address user-mail-address)
                         version)))
     (dolist (log logs)
-      (unless (string-match "/gnus/" log)
-        (find-file log)
-        (goto-char (point-min))
-        (insert entry)))))
+      (find-file log)
+      (goto-char (point-min))
+      (insert entry))))
 
 (defun set-version-in-file (root file version rx)
   (find-file (expand-file-name file root))
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index cfae61e092f..005c6694228 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -50,6 +50,14 @@ General steps (for each step, check for possible errors):
     For a pretest, start at version .90.  After .99, use .990 (so that
     it sorts).
 
+    The final pretest should be a release candidate.  Set the version
+    number to that of the actual release.  Pick a date about a week
+    from now when you intend to make the release.  Use M-x add-release-logs
+    to add the ChangeLog entries for that date to the tar file (but
+    not yet to the repository).  Name the tar file as
+    emacs-XX.Y-rc1.tar.  If all goes well in the following week, you
+    can simply rename the file and use it for the actual release.
+
 5.   autoreconf -i -I m4 --force
      make bootstrap