Merge from trunk

5 files changed, 97 insertions, 21 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index b5f4d555ad4..0346bb2e620 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -62,7 +62,6 @@ SIGTYPE
 SYSTEM_TYPE
 
 ** Machine specific macros, decribed in detail in src/m/template.h
-EXPLICIT_SIGN_EXTEND
 LOAD_AVE_CVT
 LOAD_AVE_TYPE
 VIRT_ADDR_VARIES
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 6d114eae003..f5c52f09375 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-03  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * CPP-DEFINES (EXPLICIT_SIGN_EXTEND): Remove.
+
 2010-10-12  Glenn Morris  <rgm@gnu.org>
 
         * notes/nextstep: Move here from ../nextstep/DEV-NOTES.
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index f685dd5e50f..6ff7a815cb7 100644
--- a/admin/make-tarball.txt
+++ b/admin/make-tarball.txt
@@ -4,7 +4,8 @@ Instructions to create pretest or release tarballs.
 
 For each step, check for possible errors.
 
-1.   cvs -q update -Pd
+1.  `bzr update' (for a bound branch), or `bzr pull'.
+     bzr status # check for locally modified files
 
 2.  Bootstrap to make 100% sure all elc files are up-to-date, and to
     make sure that the later tagged version will bootstrap, should it be
@@ -27,24 +28,23 @@ For each step, check for possible errors.
     refer to a newer release of Emacs.  (This is probably needed only
     when preparing a major Emacs release, or branching for it.)
 
-5.   rm configure; autoconf
+5.   rm configure src/config.in; autoconf; autoheader
      make bootstrap
 
-6.  Commit configure, README, doc/emacs/emacs.texi,
-    doc/lispref/elisp.texi, etc/AUTHORS, src/emacs.c, nt/emacs.rc,
-    and lisp/cus-edit.el (if modified).  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, src/config.in, etc/AUTHORS, all the files changed
+    by M-x set-version, and lisp/cus-edit.el (if modified).
+    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
-    tarballs are kept under fencepost.gnu.org:~pot/emacs-pretest/, while
-    old emacs tarballs are at <ftp://ftp.gnu.org/pub/gnu/emacs/>.
+    tarballs may be found at <ftp://alpha.gnu.org/gnu/emacs/pretest>;
+    old release tarballs are at <ftp://ftp.gnu.org/pub/gnu/emacs/>.
 
     If this is the first pretest of a major release, just comparing
     with the previous release may overlook many new files.  You can try
-    something like `find -f | grep -v CVS...etc' in a clean CVS tree,
-    and compare the results against the new tar contents.
+    something like `find . | sort' in a clean bzr tree, and compare the
+    results against the new tar contents.
 
 8.   xdelta delta emacs-OLD.tar.gz emacs-NEW.tar.gz emacs-OLD-NEW.xdelta
 
@@ -108,5 +108,3 @@ For each step, check for possible errors.
     For a release, announce it on info-gnu@gnu.org,
     info-gnu-emacs@gnu.org, and emacs-devel.
 
-
-# arch-tag: c23c771f-ca26-4584-8a04-50ecf0989390
diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker
index 5b3af5e242c..7c6c0ff4272 100644
--- a/admin/notes/bugtracker
+++ b/admin/notes/bugtracker
@@ -384,6 +384,14 @@ fixed 123 23.0.60
 *** To remove a "fixed" mark:
 notfixed 123 23.0.60
 
+*** To make a bug as present in a particular version:
+found 123 23.2
+NB if there is no specified "fixed" version, or if there is one and it
+is earlier than the found version, this reopens a closed bug.
+
+The leading "23.1;" that M-x report-emacs-bug adds to bug subjects
+automatically sets a found version (if none is explicitly specified).
+
 *** To assign or reassign a bug to a package or list of packages:
 reassign 1234 emacs
 
@@ -466,16 +474,41 @@ http://lists.gnu.org/archive/html/emacs-devel/2009-11/msg00440.html
 
 ** Bazaar stuff
 
-*** You can use `bzr commit --fixes emacs:123' to mark that a commit fixes
-Emacs bug 123.  You will first need to add a line to your bazaar.conf:
+*** You can use `bzr commit --fixes debbugs:123' to mark that a commit fixes
+Emacs bug 123.  You will first need to add a line to one of your
+configuration files, ~/.bazaar/bazaar.conf or ~/.bazaar/locations.conf:
+
+bugtracker_debbugs_url = http://debbugs.gnu.org/{id}
+
+Here "{id}" is a literal string, a placeholder that will be replaced
+by the bug number you specify after `--fixes debbugs:' in the bzr
+command line (123 in the example above).
+
+In the bazaar.conf file, this setting should go into the [DEFAULTS]
+section.
+
+In the locations.conf file, it should go into the branch-specific
+configuration section for the branch where you want this to be in
+effect.  For example, if you want this to be in effect for the branch
+located at `/home/projects/emacs/trunk', you need to have this in your
+~/.bazaar/locations.conf file:
+
+[/home/projects/emacs/trunk]
+bugtracker_debbugs_url = http://debbugs.gnu.org/{id}
+
+If you want to use this in all Emacs branches whose common parent is
+`/home/projects/emacs', put the setting in the [/home/projects/emacs]
+section.  See "bzr help configuration" for more information about
+the *.conf files, their location and formats.  See "bzr help bugs" for
+more information about the bugtracker_debbugs_url setting.
 
-bugtracker_emacs_url = http://debbugs.gnu.org/{id}
+See also log-edit-rewrite-fixes in .dir-locals.el.
 
 Note that all this does is add some metadata to the commit, it doesn't
-actually mark the bug as closed in the tracker.  There seems to be no
-way to see this "metadata" with `bzr log', which is rather poor, but
-it will show up as a link in a recent loggerhead installation, or with
-some of the graphical frontends to bzr log.
+actually mark the bug as closed in the tracker.  You can see this
+information with `bzr log', and it will show up as a link in a recent
+loggerhead installation, or with some of the graphical frontends to
+`bzr log'.
 
 ** Gnus-specific voodoo
 
diff --git a/admin/notes/elpa b/admin/notes/elpa
new file mode 100644
index 00000000000..e28d81e6d6e
--- /dev/null
+++ b/admin/notes/elpa
@@ -0,0 +1,42 @@
+NOTES ON THE EMACS PACKAGE ARCHIVE
+
+Here are instructions on uploading files to the package archive at
+elpa.gnu.org, for Emacs maintainers.  (If you are not a maintainer,
+contact us if you want to submit a package.)
+
+1. You will need login access to elpa.gnu.org.  You will also need to
+   get the FSF sysadmins to allow ssh access through the FSF firewall
+   for your local machine.  Ensure that your uid, USER, is in the
+   `elpa' group on elpa.gnu.org; this gives you write access to the
+   bzr repository from which the packages are managed.
+
+2. Go to your bzr repository on your local machine.  Of, if you don't
+   have one (you should, if you're tracking Emacs bzr), make one:
+
+     cd $DEVHOME
+     bzr init-repo elpa/
+     cd elpa
+
+   Create a branch for elpa:
+
+     bzr branch bzr+ssh://USER@elpa.gnu.org/home/elpa/package-repo package-repo
+
+   Bind the branch:
+
+     cd package-repo/
+     echo "public_branch = bzr+ssh://USER@elpa.gnu.org/home/elpa/package-repo" >> .bzr/branch/branch.conf
+     bzr bind bzr+ssh://USER@elpa.gnu.org/home/elpa/package-repo
+
+   Now you should be able to do `bzr up' and `bzr commit'.
+
+3. Changes in bzr do not immediately propagate to the user-facing tree
+   (i.e., what users see when they do `M-x list-packages').  That tree
+   is created by a (daily) cron job that does "bzr export".  If for
+   some reason you need to refresh the user-facing tree immediately,
+   run /home/elpa/bin/package-update.sh as the "elpa" user.
+
+   The Org mode dailies are not part of the repository.  After the
+   package-update.sh script creates the user-facing tree, it copies
+   the daily tarfile hosted on orgmode.org directly into that tree.
+
+4. FIXME: How to actually upload a package file.