- added

[packages/emacs.git] / emacs-CAN_2005_0100.patch

--- emacs-21.3.orig/configure
+++ emacs-21.3/configure
@@ -1686,6 +1686,11 @@
     machine=f301 opsys=uxpv
   ;;
 
+  ## AMD x86-64 Linux-based GNU system
+  x86_64-*-linux-gnu* )
+    machine=amdx86-64 opsys=gnu-linux
+  ;;
+
   * )
     unported=yes
   ;;
--- emacs-21.3.orig/configure.in
+++ emacs-21.3/configure.in
@@ -1060,6 +1060,11 @@
     machine=f301 opsys=uxpv
   ;;
 
+  ## AMD x86-64 Linux-based GNU system
+  x86_64-*-linux-gnu* )
+    machine=amdx86-64 opsys=gnu-linux
+  ;;
+
   * )
     unported=yes
   ;;
--- emacs-21.3.orig/src/m/amdx86-64.h
+++ emacs-21.3/src/m/amdx86-64.h
@@ -0,0 +1,241 @@
+/* machine description file For the alpha chip.
+   Copyright (C) 1994, 1997, 1999 Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 1, or (at your option)
+any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+
+/* The following line tells the configuration script what sort of 
+   operating system this machine is likely to run.
+   USUAL-OPSYS="note"
+
+NOTE-START
+Use -opsystem=linux
+NOTE-END
+
+*/
+
+#define BITS_PER_LONG 64
+#define BITS_PER_EMACS_INT 64
+
+/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
+   is the most significant byte.  */
+
+#undef WORDS_BIG_ENDIAN
+
+/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
+ * group of arguments and treat it as an array of the arguments.  */
+
+#define NO_ARG_ARRAY
+
+/* Now define a symbol for the cpu type, if your compiler
+   does not define it automatically:
+   Ones defined so far include vax, m68000, ns16000, pyramid,
+   orion, tahoe, APOLLO and many others */
+
+/* do we need any? */
+
+
+/* Use type EMACS_INT rather than a union, to represent Lisp_Object */
+/* This is desirable for most machines.  */
+
+#define NO_UNION_TYPE
+
+/* Define the type to use.  */
+#define EMACS_INT long
+#define EMACS_UINT unsigned long
+#define SPECIAL_EMACS_INT
+
+/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
+   the 24-bit bit field into an int.  In other words, if bit fields
+   are always unsigned.
+
+   If you use NO_UNION_TYPE, this flag does not matter.  */
+
+#define EXPLICIT_SIGN_EXTEND
+
+/* Data type of load average, as read out of kmem.  */
+
+#define LOAD_AVE_TYPE long
+
+/* Convert that into an integer that is 100 for a load average of 1.0  */
+
+#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
+
+/* Define C_ALLOCA if this machine does not support a true alloca
+   and the one written in C should be used instead.
+   Define HAVE_ALLOCA to say that the system provides a properly
+   working alloca function and it should be used.
+   Define neither one if an assembler-language alloca
+   in the file alloca.s should be used.  */
+
+#define HAVE_ALLOCA
+
+/* GNU malloc and the relocating allocator do not work together
+   with X.   [Who wrote that?]  */
+
+/* May 1995: reportedly [Rainer Schoepf <schoepf@uni-mainz.de>] both the
+   system and the gnu malloc system work with "alpha-dec-osf3.0" and
+   "alpha-dec-osf3.2".  */
+
+/* May 1995: it seems to me [Morten Welinder <terra@diku.dk>] that both
+   mallocs work with "alpha-dec-osf2.0", but I daren't break anything
+   right now.  Feel free to play if you want.  */
+
+/* #define SYSTEM_MALLOC */
+
+#ifdef __ELF__
+/* With ELF, make sure that all common symbols get allocated to in the
+   data section.  Otherwise, the dump of temacs may miss variables in
+   the shared library that have been initialized.  For example, with
+   GNU libc, __malloc_initialized would normally be resolved to the
+   shared library's .bss section, which is fatal.  */
+# ifdef __GNUC__
+#  define C_SWITCH_MACHINE	-fno-common
+# else
+#  error What gives?  Fix me if DEC Unix supports ELF now.
+# endif
+#endif
+
+#if defined(__OpenBSD__)
+#define ORDINARY_LINK
+#endif
+
+#ifdef __ELF__
+#undef UNEXEC
+#define UNEXEC unexelf.o
+#endif
+
+#ifndef __ELF__
+
+/* Describe layout of the address space in an executing process.  */
+
+#define TEXT_START    0x120000000
+#define DATA_START    0x140000000
+
+/* This is necessary for mem-limits.h, so that start_of_data gives
+   the correct value */
+
+#define DATA_SEG_BITS 0x140000000
+
+/* The program to be used for unexec. */
+
+// #define UNEXEC unexalpha.o
+
+#endif /* notdef __ELF__ */
+
+#ifdef OSF1
+#define ORDINARY_LINK
+
+/* Some systems seem to have this, others don't.  */
+#ifdef HAVE_LIBDNET
+#define LIBS_MACHINE -ldnet
+#else
+#define LIBS_MACHINE -ldnet_stub
+#endif
+#endif /* OSF1 */
+
+#if 0 /* Rainer Schoepf <schoepf@uni-mainz.de> says this loses with X11R6
+	 since it has only shared libraries.  */
+#ifndef __GNUC__
+/* This apparently is for the system ld as opposed to Gnu ld.  */
+#ifdef OSF1
+#define LD_SWITCH_MACHINE      -non_shared
+#endif
+#endif
+#endif /* 0 */
+
+#ifdef OSF1
+#define LIBS_DEBUG
+#define START_FILES pre-crt0.o
+#endif
+
+#if defined (LINUX) && __GNU_LIBRARY__ - 0 < 6
+/* This controls a conditional in main.  */
+#define LINUX_SBRK_BUG
+#endif
+
+
+#define PNTR_COMPARISON_TYPE unsigned long
+
+/* On the 64 bit architecture, we can use 60 bits for addresses */
+
+#define VALBITS         60
+
+
+/* This definition of MARKBIT is necessary because of the comparison of
+   ARRAY_MARK_FLAG and MARKBIT in an #if in lisp.h, which cpp doesn't like. */
+
+#define MARKBIT         0x8000000000000000L
+
+
+/* Define XINT and XUINT so that they can take arguments of type int */
+
+#define XINT(a)  (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS))
+#define XUINT(a) ((long) (a) & VALMASK)
+
+/* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
+
+#define XPNTR(a) XUINT (a)
+
+#ifndef NOT_C_CODE
+/* We need these because pointers are larger than the default ints.  */
+#if !defined(__NetBSD__) && !defined(__OpenBSD__)
+#include <alloca.h>
+#endif
+
+#endif /* not NOT_C_CODE */
+
+#ifdef OSF1
+#define PTY_ITERATION		for (i = 0; i < 1; i++) /* ick */
+#define PTY_NAME_SPRINTF	/* none */
+#define PTY_TTY_NAME_SPRINTF	/* none */
+#define PTY_OPEN					\
+  do							\
+    {							\
+      int dummy;					\
+      SIGMASKTYPE mask;					\
+      mask = sigblock (sigmask (SIGCHLD));		\
+      if (-1 == openpty (&fd, &dummy, pty_name, 0, 0))	\
+	fd = -1;					\
+      sigsetmask (mask);				\
+      emacs_close (dummy);				\
+    }							\
+  while (0)
+#endif
+
+/* On the Alpha it's best to avoid including TERMIO since struct
+   termio and struct termios are mutually incompatible.  */
+#define NO_TERMIO
+
+#if defined (LINUX) || defined (__NetBSD__) || defined (__OpenBSD__)
+# define TEXT_END ({ extern int _etext; &_etext; })
+# ifndef __ELF__
+#  define COFF
+#  define DATA_END ({ extern int _EDATA; &_EDATA; })
+# endif /* notdef __ELF__ */
+#endif
+
+#if (defined (__NetBSD__) || defined (__OpenBSD__)) && defined (__ELF__)
+#define HAVE_TEXT_START
+#endif
+
+/* Many Alpha implementations (e.g. gas 2.8) can't handle DBL_MIN:
+   they generate code that uses a signaling NaN instead of DBL_MIN.
+   Define DBL_MIN_REPLACEMENT to be the next value larger than DBL_MIN:
+   this avoids the assembler bug.  */
+#define DBL_MIN_REPLACEMENT 2.2250738585072019e-308
--- emacs-21.3.orig/debian/copyright.in
+++ emacs-21.3/debian/copyright.in
@@ -0,0 +1,36 @@
+-*-text-*-
+
+This package was debianized by Rob Browning <rlb@defaultvalue.org> on
+Tue, 16 Dec 1997 00:05:45 -0600.
+
+The source is a combination of the following files:
+
+  prep.ai.mit.edu:/pub/gnu/emacs/emacs-@NOMINAL_VERSION@.tar.gz
+  prep.ai.mit.edu:/pub/gnu/emacs/leim-@NOMINAL_VERSION@.tar.gz
+
+Copyright:
+
+  GNU Emacs is Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996,
+  1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+  59 Temple Place, Suite 330 Boston, MA 02111-1307 USA and is covered
+  under the terms of the GPL.  See the file
+  /usr/share/common-licenses/GPL for more information.
+
+  The GNU Emacs Manual is Copyright (C) 1985, 1986, 1987, 1993, 1994,
+  1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software
+  Foundation, Inc. 59 Temple Place, Suite 330 Boston, MA 02111-1307
+  USA.  It is covered under the terms of the GNU Free Documentation
+  License, version 1.1 or later.  See node `GNU Free Documentation
+  License' in the Info manual (emacs) for details.
+
+  The GNU Emacs Manual and related manuals in /usr/info/emacs-21 are
+  Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998,
+  1999, 2000, 2001, 2002 Free Software Foundation, Inc. 59 Temple
+  Place, Suite 330 Boston, MA 02111-1307 USA.  They are covered under
+  the terms of the GNU Free Documentation License, version 1.1 or
+  later.  See node `GNU Free Documentation License' in the Info manual
+  (emacs) for details.
+ 
+Please see /usr/share/doc/emacs@MAJOR_VERSION@-common/README.Debian.gz for a
+description of the Debian specific differences from the upstream
+version.
--- emacs-21.3.orig/debian/changelog
+++ emacs-21.3/debian/changelog
@@ -0,0 +1,777 @@
+emacs21 (21.3+1-5ubuntu4.2) warty-security; urgency=low
+
+  * Fixed CAN-2005-0100.dpatch to work with Warty's dpatch version.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri,  4 Feb 2005 11:53:51 +0000
+
+emacs21 (21.3+1-5ubuntu4.1) warty-security; urgency=low
+
+  * SECURITY UPDATE: fix remote privilege escalation to group 'mail'.
+  * Added patch CAN-2005-0100.dpatch:
+    - lib-src/movemail.c: Fix format string vulnerability in error message
+      output.
+  * References:
+    CAN-2005-0100
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri,  4 Feb 2005 10:41:30 +0000
+
+emacs21 (21.3+1-5ubuntu4) warty; urgency=low
+
+  * Add patch to fix local file creation permissions.
+    (Closes: #2191)
+
+ -- Fabio M. Di Nitto <fabbione@fabbione.net>  Sun, 10 Oct 2004 07:22:56 +0200
+
+emacs21 (21.3+1-5ubuntu3) warty; urgency=low
+
+  * debian/control.in:
+    - Build-Depends on libtiff4-dev.
+
+ -- Sebastien Bacher <seb128@debian.org>  Mon,  2 Aug 2004 12:23:36 +0200
+
+emacs21 (21.3+1-5ubuntu2) warty; urgency=low
+
+  * Import debian/patches/fix-batch-mode-signal-handling.dpatch
+    from 21.3+1-6 to fix Warty bug #58
+
+ -- Matt Zimmerman <mdz@alcor.net>  Mon, 26 Jul 2004 11:06:23 -0700
+
+emacs21 (21.3+1-5ubuntu1) warty; urgency=low
+
+  * Apply amd64 patch aggregated from #248796
+
+ -- LaMont Jones <lamont@mmjgroup.com>  Wed, 14 Jul 2004 01:34:05 +0000
+
+emacs21 (21.3+1-5) unstable; urgency=low
+
+  * Apply patch allowing emacsclient to handle ALTERNATE_EDITOR properly
+    when the command is run without any parameter [Jérôme Marant]
+    (closes: #219658)
+    - debian/patches/emacsclient-alternate-editor.dpatch: new file.
+
+  * Provide the `editor' virtual package. [Jérôme Marant]
+    (closes: #66243, #90154, #158807) 
+    - debian/control.in: emacs and emacs-nox now provide the `editor'
+      virtual package. 
+    - debian/control: synchronized with debian/control.in.
+    - debian/emacs.postinst: adding an `editor' alternative with a priority
+      of 0 as discussed in
+      http://lists.debian.org/debian-policy/2000/debian-policy-200006/msg00122.html
+    - debian/emacs.prerm: removing the `editor' alternative on package
+      removal.
+
+  * Added automatic switching to UTF-8 encoding when editing the debian
+    changelog file. [Jérôme Marant]
+    - debian/changelog: added Emacs local variables forcing coding
+      to UTF-8.
+
+  * Fix handling of menu entry for text version of Emacs [Jérôme Marant]
+    (closes: #221171)
+    - debian/menu.in: call the text version of emacs with the `-nw'
+      parameter.
+
+  * Install the emacsclient manpage [Jérôme Marant] (closes: #222767) 
+    - debian/build-common-pkg: install missing emacsclient manpage.
+    - debian/emacs-common.postinst: install alternative for emacsclient
+      manpage.
+  
+  * Install .desktop entry in order to make Emacs easy to start in
+    both GNOME and KDE. Thanks to Adam C Powell IV <hazelsct@debian.org>
+    [Jérôme Marant] (closes: #233711)
+    - emacs.desktop: new template file for desktop entries
+    - debian/rules: generate desktop file from emacs.desktop template
+      and install it for emacs21.
+
+  * test -n "${major_ver}" in a few places so that we don't accidentally
+    generate bad output files from our .in files. [rlb]
+    - debian/rules
+
+  * truncate aclocal.m4 during autofiles-sync so that old bits won't kill new
+    autoconf run.  Also ignore autom4te.cache when generating
+    autofiles.diff. [rlb]
+    - debian/rules
+  
+  * fix bug in prepare-release autodiff prompt handling. [rlb]
+    - debian/rules
+
+  * update configure.in for newer autoconf versions. [rlb]
+    - autoconf-updates.dpatch
+
+  * add an emacsXY-bin-common package containing all the architecture
+    specific bits, so that emacsXY-common can be architecture independent.
+    This should save many megabytes * architectures in the debian pool.
+    [rlb] (closes: #232888, #233345)
+    - debian/rules: move some build-* code from debian/ scripts to rules
+      and adjust to build emacsXY-bin-common.
+    - debian/emacs-common.postinst debian/emacs-common.prerm: some code
+      moved to new emacs-bin-common scripts.
+    - debian/emacs-common.postrm: deleted.
+    - debian/emacs-bin-common.postinst: new file.
+    - debian/emacs-bin-common.prerm: new file.
+    - debian/emacs-bin-common.postrm: new file.
+    - debian/build-common-pkg: deleted - code now in debian/rules.
+    - debian/build--pkg: deleted - code now in debian/rules.
+    - debian/emacs-el.postinst: deleted - was empty.
+    - debian/control.in: add emacsXY-bin-common and adjust other entries.
+    - debian/fix-debian-scripts: deleted - no longer used.
+    - debian/build-binary-pkg: adjusted to handle more of the common code.
+  
+  * Add support for linux 2.6 to ACPI in lisp/battery.el. Thanks to
+    Mario Lang <mlang@debian.org> [Jérôme Marant] (closes: #228658)
+    - debian/patches/battery-acpi-support.dpatch: updated.
+  
+  * Generate md5sums file for every package [Jérôme Marant] (closes: #22590)
+    - debian/rules: generate md5sums file just before building packages.
+    - debian/build-binary-pkg: likewise.
+  
+  * no point in byte-compiling fns-*.el according to upstream authors
+    (closes: #189277)
+
+  * fix configure args (--build alone doesn't seem to work anymore). [rlb]
+    - debian/rules
+  
+  * re-enable gif support via libungif. [rlb]
+    - debian/rules
+
+  * re-enable toolkit scrollbars, but make it really easy for people to
+    disable them in debian/rules.  Search for
+    --without-toolkit-scrollbars.  [rlb]
+    - debian/rules
+    - debian/README.in
+
+  * fix problem with upgrades by adding emacs21-common (<< 21.3+1-4) to
+    Replaces for the common packages. [rlb]
+    - debian/control.in
+    - debian/control
+
+ -- Rob Browning <rlb@defaultvalue.org>  Tue,  6 Apr 2004 18:07:38 -0500
+
+emacs21 (21.3+1-4) unstable; urgency=medium
+
+  * debian/changelog: converted to UTF-8 as per Policy. [Jérôme Marant]
+  * debian/control.in:
+    - Bumped Standards-Version to 3.6.1. [Jérôme Marant]
+    - Added versioned build-dependency on dpatch >= 1.23 since this version
+      no longer requires numerial prefixes to dpatches. [Jérôme Marant]
+  * debian/patches/*.dpatch: removed numerical prefix since the patch order
+    is specified in debian/patches/00list. [Jérôme Marant]
+  * debian/patches/hurd-libio-glibc.dpatch: new patch allowing Emacs
+    to be built on Hurd systems using a libio-based glibc.
+    Thanks to Markus Brinkmann <marcus@gnu.org>.
+    (closes: #143220) [Jérôme Marant]
+  * debian/patches/battery-acpi-support.dpatch: new patch adding ACPI
+    support to lisp/battery.el. Thanks to Mario Lang <mlang@debian.org>.
+    (closes: #208812) [Jérôme Marant]
+  * debian/patches/scroll-margin.dpatch: new patch preventing emacs
+    to hang with a non-0 scroll-margin set.
+    (closes: #175658) [Jérôme Marant]
+  * debian/patches/save-buffer.dpatch: new patch fixing a bug which
+    makes a file being removed when the coding system of its buffer
+    has changed and saving the changes was canceled.
+    (closes: #194171) [Jérôme Marant]
+  * debian/patches/00list: updated with respect to new patches.
+    [Jérôme Marant]
+  * debian/menu.in:
+    - Added hints to menu entries. (closes: #144282) [Jérôme Marant]
+    - Changed titles for both text and X11 entries in order to
+      differenciate them. (closes: #197527, #188598) [Jérôme Marant]
+  * debian/patches/browse-url.dpatch:
+    - Updated patch fixing a wrong call to galeon. Thanks to
+      Mikael Hedin <micce@debian.org>. (closes: #208206) [Jérôme Marant]
+    - Updated patch fixing browse-url's invocation of Mozilla.
+      Thanks to Jeff Sheinberg <jeffsh@erols.com>,
+      Martin Pool <mbp@sourcefrog.net> and KATO Kazuyoshi <kzys@users.sf.net>.
+      (closes: #148408, #216067) [Jérôme Marant]
+  * Use -O1 rather than -O2 on m68k.  Fixes a build failure (looks like a
+    broken byte compiler) with newer versions of gcc.  (closes: #207580)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Fri, 31 Oct 2003 00:00:10 -0600
+
+emacs21 (21.3+1-3) unstable; urgency=low
+
+  * create debian/stmap it doesn't exist. (closes: #210802)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Sat, 13 Sep 2003 14:49:18 -0500
+
+emacs21 (21.3+1-2) unstable; urgency=low
+
+  * add back accidentally removed dpatch Build-Depends. (closes: #210627)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Fri, 12 Sep 2003 10:30:21 -0500
+
+emacs21 (21.3+1-1) unstable; urgency=low
+
+  * repackage without .elc files since we regenerate all of them anyway.
+    This will save space, and will also allow us to use dpatch in a
+    straightforward way.
+  * modify debian/rules computation of version numbers to handle
+    (i.e. ignore) the +1 in 21.3+1.
+  * rework to use dpatch and to patch/unpatch the debian source in-place
+    rather than using a debian/build-src copy of the whole source tree.
+  * incorporated patch (500-detect-coding-iso2022.dpatch) to fix raw-text
+    coding problem.  Thanks to Kenichi Handa <handa@etl.go.jp>.
+    (closes: #198736)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Thu, 11 Sep 2003 23:15:44 -0500
+
+emacs21 (21.3-2) unstable; urgency=low
+
+  * Compile --without-toolkit-scroll-bars for now (my pref, and to avoid
+    xaw3d issues for the moment).
+  * Update copyright to reflect documentation licenses. (closes: #161500)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Wed, 13 Aug 2003 08:53:35 -0500
+
+emacs21 (21.3-1) unstable; urgency=low
+
+  * new upstream version.
+
+ -- Rob Browning <rlb@defaultvalue.org>  Wed, 23 Apr 2003 13:16:06 -0500
+
+emacs21 (21.2-6) unstable; urgency=low
+
+  * changed sort behavior for x-vs-no-x fix in cus-dep.el based on
+    suggestion from Matt Kraai <kraai@alumni.cmu.edu>. (closes: #166139)
+  * finish breaking up most of the debian/patch/* files.
+  * set up automatic generation for autofiles.diff which contains all the
+    diffs to automatically generated files and is applied after all of the
+    debian/patch/*.diff files.
+  * add an apply-patches-upto command so it's easier to create partially
+    patched trees for editing.
+
+ -- Rob Browning <rlb@defaultvalue.org>  Thu,  6 Feb 2003 18:12:41 -0600
+
+emacs21 (21.2-5) unstable; urgency=low
+
+  * fix bug in rules and binary-pkg generation. (closes: #164770)
+  * fix problem with config.sub and config.guess updates. (closes: #164763)
+  * time to stop creating the /usr/doc symlinks...
+
+ -- Rob Browning <rlb@defaultvalue.org>  Tue, 15 Oct 2002 16:34:52 -0500
+
+emacs21 (21.2-4) unstable; urgency=low
+
+  * create debian/patches/ and start migrating to represent
+    changes as patches against the upstream source.  Don't edit the main
+    tree anymore.
+  * rework tree and packaging to have emacs21-common, emacs21, and
+    emacs21-nox packages with emacs21-common containing nearly all the
+    data.
+
+ -- Rob Browning <rlb@defaultvalue.org>  Sat, 12 Oct 2002 15:09:37 -0500
+
+emacs21 (21.2-3) unstable; urgency=low
+
+  * Update emacs21-nox package description.
+
+ -- Rob Browning <rlb@defaultvalue.org>  Wed, 29 May 2002 14:04:57 -0500
+
+emacs21 (21.2-2) unstable; urgency=low
+
+  * fix control file priorities to match overrides.
+  * fix rules to handle autotools more correctly.  See
+    /usr/share/doc/autotools-dev/README.Debian.gz for details.
+    (closes: #139998)
+  * firewall, headless box, and anti-X users everywhere rejoice!
+    Introducing emacs21-nox package :>
+
+ -- Rob Browning <rlb@defaultvalue.org>  Tue, 28 May 2002 12:09:48 -0500
+
+emacs21 (21.2-1) unstable; urgency=low
+
+  * new upstream release.
+  * move outline of Debian specific Emacs changes to
+    /usr/share/doc/*/README.Debian.gz.x
+
+ -- Rob Browning <rlb@defaultvalue.org>  Fri, 22 Mar 2002 11:41:17 -0600
+
+emacs21 (21.1-9) unstable; urgency=low
+
+  * fix control.in to use ${Source-Version}. (closes: #138994)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Mon, 18 Mar 2002 21:54:47 -0600
+
+emacs21 (21.1-8) unstable; urgency=low
+
+  * Fix .texi problems with upstream patch. (closes: #138236)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Sun, 17 Mar 2002 11:58:59 -0600
+
+emacs21 (21.1-7) unstable; urgency=high
+
+  * fix vc-path to be correct for a Debian system. (closes: #107251)
+  * re-add lost hppa and s390 patches. (closes: #120079)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Thu,  6 Dec 2001 14:10:45 -0600
+
+emacs21 (21.1-6) unstable; urgency=medium
+
+  * modify order in browse-url.el.
+  * added upstream iso-acc.el patch to fix accent bug. (closes: #119852)
+  * fix ppc nocombreloc bug with upstream patch. (closes: #117557)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Tue,  4 Dec 2001 08:43:38 -0600
+
+emacs21 (21.1-5) unstable; urgency=low
+
+  * Run autoconf to remove stale ppc code. (closes: #119189)
+  * Write new browse-url.el code with support for galeon and to default to
+    searching for a suitable browser, free browsers first.  (closes: #116822)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Tue, 13 Nov 2001 09:51:31 -0600
+
+emacs21 (21.1-4) unstable; urgency=low
+
+  * Really fix alternatives problem this time.
+
+ -- Rob Browning <rlb@defaultvalue.org>  Fri,  9 Nov 2001 10:24:49 -0600
+
+emacs21 (21.1-3) unstable; urgency=low
+
+  * Fix but in grep in postinst. (closes: #117251, #117256, #117415, #118792)
+  * Remove vestigal ppc bits and add upstream patch for ppc nocombreloc
+    problem. (closes: #117557)
+  * fix bug in upstream-files.tar handling.
+  * don't configure gif support until our libungif is new enough.  See bug
+    #117729.
+  * Fix manpage to list correct default window size. (closes: #118641)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Thu,  8 Nov 2001 21:15:20 -0600
+
+emacs21 (21.1-2) unstable; urgency=low
+
+  * change to priority optional.
+  * use xaw3d scrollbars after checking upstream preferences.
+    (closes: #116831, #116911, #116638)
+  * added some build-depends. (closes: #116981)
+  * fixed typo in NEWS. (closes: #116814)
+  * fixed alternatives bug in postinst/prerm for emacsclient (closes: #116915)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Thu, 25 Oct 2001 16:02:45 -0500
+
+emacs21 (21.1-1) unstable; urgency=low
+
+  * New emacs21 packages.  Many changes -- reviewed all Debian files.
+
+ -- Rob Browning <rlb@defaultvalue.org>  Thu, 18 Oct 2001 17:28:03 -0500
+
+emacs20 (20.7-10) unstable; urgency=medium
+
+  * Add arch header for mipsel and fix configure.in and
+    configure. (closes: #103959)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Mon, 23 Jul 2001 09:23:06 -0500
+
+emacs20 (20.7-9) unstable; urgency=low
+
+  * Added more Build-Depends. (closes: #101832)
+  * Disable ralloc on Hurd.  Thanks to Robert Bihlmeyer
+    <robbe@orcus.priv.at>. (closes: #101926)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Tue, 10 Jul 2001 12:48:22 -0500
+
+emacs20 (20.7-8) unstable; urgency=low
+
+  * Added ia64 patches from Bdale Garbee <bdale@gag.com> for ia64.h.
+    (closes: #90518)
+  * Added Build-Depends on mailx for now (though this is *wrong* for the
+    long run -- I need to fix my fakemail handling).
+    (closes: #95903, #96761)
+  * Fix fakeroot sgid problem (move movemail chmod +s in debian/rules).
+  * Remove emacs' overzealous dir.gz file.
+  * Shrink gnu.xpm to 32x32 and make it the menu icon. (closes: #20253, #21310)
+  * Update manpage to not refer to kitchen sink anymore -- though with
+    emacs21, we're going to move back to using whatever they choose.
+    (closes: #81682)
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Wed, 13 Jun 2001 23:56:16 -0500
+
+emacs20 (20.7-7) unstable; urgency=low
+
+  * Fixed reftex-info problem. (closes: #44837).
+  * Fix install-strip target in Makefile.in.  Thanks to 
+    Kalle Olavi Niemitalo <tosi@ees2.oulu.fi>.  (closes: #51348)
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Sat,  5 May 2001 23:50:50 -0500
+
+emacs20 (20.7-6) unstable; urgency=low
+
+  * Fix improper usage of dpkg-statoverride and make sure movemail is set
+    up right. (closes: #95953)
+  * Fix bad manpage location in postinst update-alternatives call.
+  * Fix bad .so in ctags manpage (closes: #88231, #45317, #65017, #74570)
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Sat,  5 May 2001 09:47:40 -0500
+
+emacs20 (20.7-5) unstable; urgency=low
+
+  * configure.in: add detection of CONF_MAIL_PROGRAM_NAME.
+  * lib-src/fakemail.c: use CONF_MAIL_PROGRAM_NAME when appropriate
+    (closes: #72103) -- need to forward upstream.
+  * Add "modified by Debian" clause to (emacs-version) at RMS's request.
+  * Start Debian modifications section in copyright file as per policy.
+  * Add build fixes for hurd (closes: #78461).  Changes suggested by
+    Marcus.Brinkmann@ruhr-uni-bochum.de.  Thanks.
+  * Switch from Debian sendmail.el hack to Francesco's suggestion of
+    setting mail-from-style to 'system-default by default at startup
+    (closes: #35128).  This allows the user to override when desired in
+    the normal way.  This should be discussed with the upstream
+    maintainers.  They may be amenable to making this the default on
+    Debian systems.
+  * add dependency on dpkg (>= 1.9.0) for new install-info.
+  * info pages should finally work right (or at least closer to right).
+    They're now installed in /usr/share/info/emacs-20/ under their normal
+    names, and install-info can add the appropriate (emacs-20/emacs),
+    etc. entries to /usr/share/info/dir.  This hopefully closes a bunch of
+    old bugs.
+    (closes: #64994, #64512, #64025, #62155, #59332, #51163, #40443)
+  * No more files in /usr/doc. (closes: #91454, #63768)
+  * /usr/man moved to /usr/share/man. (closes: #91149)
+  * This should be fixed, in addition we've switched to dpkg-statoverride
+    (closes: #73007)
+  * /usr/share/info/dir.gz should be gone.
+    (closes: #75594, #68551, #65012)
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Sun, 29 Apr 2001 22:03:33 -0500
+
+emacs20 (20.7-4) unstable frozen; urgency=low
+
+  * Upload to unstable *and* frozen since this fixes outstanding grave
+    bugs.
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Thu, 27 Jul 2000 16:21:15 -0500
+
+emacs20 (20.7-3) unstable; urgency=low
+
+  * Change code to rebuild *all* the install tree .elc files at build
+    time.  This should fix the grave problems with gnus trashing mail at
+    the expense of more CPU at build time.
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Wed, 19 Jul 2000 20:27:27 -0500
+
+emacs20 (20.7-2) frozen unstable; urgency=low
+
+  * Revert to setting debian-emacs-flavor in startup.el as per recent
+    flip-flop in debian-emacs-policy :<  This was a *tiny* source change,
+    and definitely has to go into frozen - too much breaks otherwise.
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Tue, 20 Jun 2000 11:31:29 -0500
+
+emacs20 (20.7-1) frozen unstable; urgency=low
+
+  * New upstream bug-fix version.  Fixes security bugs, among others.
+  * Removed some now redundant Debian patches.
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Sat, 17 Jun 2000 12:59:48 -0500
+
+emacs20 (20.6-3) unstable frozen; urgency=medium
+
+  * Temp fix for alpha corruption problem in cm/src.h
+    src/termcap.c, src/terminfo.c, and src/sysdep.c (forwarded bug 63993).
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Mon, 12 Jun 2000 18:55:22 -0500
+
+emacs20 (20.6-2) frozen unstable; urgency=low
+
+  * Make sure info files get registered after /usr/share migration.
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Fri, 12 May 2000 15:30:02 -0500
+
+emacs20 (20.6-1) frozen unstable; urgency=low
+
+  * Let emacsen-common handle setting debian-emacs-flavor and modify
+    "Depends:" accordingly.
+  * Maintainer release of 20.6 - fixes same issues as 20.6-0.1, so it
+    should go into frozen.
+  * Move info files to /usr/share/info.
+  * Make sure .elc files for .el files we've modified are *always* rebuilt.
+  * Add new unexelf.c from Gerd Moellmann <gerd@gnu.org>.  Without this,
+    emacs20 will *not* build on either frozen or unstable x86 machines.
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Fri, 12 May 2000 11:00:33 -0500
+
+emacs20 (20.6-0.1) frozen unstable; urgency=low
+
+  * Non-maintainer release.
+  * New upstream bug fix release (closes:#60931).
+  * ARM support merged upstream.
+  * Add security patches from RUS-CERT posting on BugTraq.
+  * postinst: Use 2775 as directory permissions in /usr/local (closes:#59919)
+
+ -- Joel Klecker <espy@debian.org>  Wed, 26 Apr 2000 11:26:28 -0700
+
+emacs20 (20.5a-2) unstable; urgency=low
+
+  * Check in a bogus modification to all the .el files that we modified
+    before 20.5a so that new .elc files with our changes will be generated
+    when we build.  This must be done every time an upstream change is
+    merged in.
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Tue, 28 Dec 1999 19:51:14 -0600
+
+emacs20 (20.5a-1) unstable; urgency=high
+
+  * Upstream version number is just fine (20.5a *is* newer than 20.5).
+    Switch to use it.
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Wed, 22 Dec 1999 11:12:44 -0600
+
+emacs20 (20.4.pre20.5a-1) unstable; urgency=high
+
+  * New upstream version, including some Y2K fixes.
+  * Use weird version to avoid epochs.  This is upstream 20.5a.
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Wed, 22 Dec 1999 00:16:52 -0600
+
+emacs20 (20.4-3) unstable; urgency=low
+
+  * Fix mistake in this file.  Fix bug number in architecture
+    dependency "closes" in last revision.
+  * Powerpc configure.in patch from Susumu OSAWA <susumuo@debian.org>.
+    (Should close bug 48997, but marked forwarded instead until patch is
+    resolved upstream.)
+  * Jargon problems apparently fixed. (closes: #31103 #37030)
+  * Gnus printing problems apparently fixed (closes: #20760)
+  * Fix manpage to refer to more accurate Debian file locations.
+    (closes: #35267)
+  * cperl-mode problem apparently fixed. (closes: #46739)
+  * Fix build stripping problem (use INSTALL_STRIP=-s rather than
+    INSTALL_PROGRAM="install -s").
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Sat,  4 Dec 1999 19:24:07 -0600
+
+emacs20 (20.4-2) unstable; urgency=low
+
+  * Modify mail-spool-directory/movemail patch in preparation for upstream
+    inclusion.
+  * Fix architecture dependency. (closes: #48997)
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Fri, 12 Nov 1999 17:59:01 -0600
+
+emacs20 (20.4-1) unstable; urgency=low
+
+  * New upstream version.
+  * I decided to go ahead and get this out without the major overhaul
+    that's coming, but I'm going to be working more tightly the core
+    upstream developers from now on, so there will be some more
+    substantial changes soon, including getting rid of more Debianisms and
+    double checking all our current patches.
+  * Fix movemail liblockfile detection to be non-Debian specific
+    (currently working out the appropriate upstream patch (see etc/NEWS)).
+  * Fix emacs to support a --with-mail-spool-directory configure option and to
+    automagically detect the right answer most of the time without it
+    (currently working out the appropriate upstream patch (see etc/NEWS)).
+  * Add the lisp-level variable mail-spool-directory which always contains
+    the location of the mail spool, and hack movemail, nnmail, rmail, and
+    friends to use it (currently working out the appropriate upstream
+    patch (see etc/NEWS)) .
+  * hexl-mode bug fixed upstream. (closes: #21762)
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Sat, 30 Oct 1999 13:24:39 -0500
+
+emacs20 (20.3-11) unstable; urgency=low
+
+  * Fix liblockfile version skew. (closes: #43803 #45123)
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Thu, 23 Sep 1999 13:27:00 -0500
+
+emacs20 (20.3-10) unstable; urgency=low
+
+  * Restructure debian/rules to build -el in binary-indep
+    (closes: #26761)
+  * Add emacsclient.1 manpage submitted ages ago. (closes: #22463)
+  * Handle duplicate DOC files (closes: #27668)
+  * Switch to gnu icon from old B&W drippy sink (closes: #33260)
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Tue,  6 Jul 1999 23:21:44 -0500
+
+emacs20 (20.3-9) unstable; urgency=low
+
+  * Added HURD patch from Marcus Brinkmann <brinkmd@debian.org>.
+    (closes: #38571).
+  * Backed out (global-set-key [delete] 'delete-char) modification 
+    (Ref: #26366).  This is too controversial (think cross-platform)
+    and needs to be resolved by the Debian Keyboard Czar in concert with
+    others.  For now we revert to the upstream behavior...
+  * Add /usr/share/info to info search path (closes: #38285).
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Fri, 11 Jun 1999 00:43:51 -0500
+
+emacs20 (20.3-8) unstable; urgency=low
+
+  * Added patch to emacs.c from Wolfram Gloger
+    <wmglo@dent.med.uni-muenchen.de> to fix exit segfaults.
+    (closes: #37745)
+  * Fixed suidregister inconsistency between postinst and postrm
+    (closes #36845)
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Sun, 30 May 1999 14:38:51 -0500
+
+emacs20 (20.3-7) unstable frozen; urgency=low
+
+  * Needed to go to frozen too: --print-architecture was an important
+    bug.  Should be OK since other fixes since -5 are minor and
+    important.
+  * Add conflict with w3-el (as per Ben Pfaff's <pfaffben@pilot.msu.edu>
+    request). (closes: #30413).
+  * Undo broken (and unneeded) "fix" for suidregister call in postrm.
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Thu, 28 Jan 1999 14:49:27 -0600
+
+emacs20 (20.3-6) unstable; urgency=low
+
+  * Use --print-installation-architecture rather than --print-architecture
+    (closes: #28177).
+  * Remove "#undef SIGIO" from m/arm.h as indicated by David Welton
+    <davidw@debian.org> (closes: #31279).
+  * Fix call to suidunregister (I didn't realize that it can't take
+    multiple file arguments) (closes: #21243 #26886).
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Wed, 27 Jan 1999 11:50:14 -0600
+
+emacs20 (20.3-5) frozen unstable; urgency=low
+
+  * Added NetWinder patches (closes: #28277).  (Thanks to David Welton)
+  * Rebuilt emacs20-el so the versions coincide.  In the future, people
+    need to be sure to build *both* binary packages when doing a
+    non-maintainer binary release.  (This fix justifies inclusion into
+    frozen).
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Sun,  1 Nov 1998 20:14:36 -0600
+
+emacs20 (20.3-4) unstable; urgency=low
+
+  * Fix gnus to default to /var/spool/mail rather than /usr/spool/mail for
+    mailbox locations (closes: #21364).
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Sat, 17 Oct 1998 14:28:45 -0500
+
+emacs20 (20.3-3) unstable; urgency=low
+
+  * Fixed leim.  All the input methods should work now (closes: #27398).
+  * Made (global-set-key [delete] 'delete-char) the default (closes: #26366).
+  * Fix ownership on emacs20-el files (closes: #27398).
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Tue, 13 Oct 1998 16:57:51 -0500
+
+emacs20 (20.3-2) unstable; urgency=low
+
+  * Added 20.2 patches for powerpc.  I omitted the patches to the
+    following files because it looks like equivalent fixes have already
+    made it into 20.3.  If anyone who understands that code better knows
+    differently, please let me know.  The rest of the patches applied
+    cleanly.
+      src/callproc.c.rej
+      src/dired.c.rej
+      src/fileio.c.rej
+      src/process.c.rej
+      src/regex.c.rej
+    I also modified src/m/powerpc.h to fix problems calling the ldscript.
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Mon,  7 Sep 1998 18:20:41 -0500
+
+emacs20 (20.3-1) unstable; urgency=low
+
+  * New upstream version.
+  * Modify all the debian/* stuff to automatically track version changes.
+  * Major changes to info page handling.  Emacs20 info is now integrated into
+    the main info page.  This was the best way I could think of to handle
+    cross references, etc. without major source changes.
+  * Locked emacs20-el and emacs20 package versions together with dependencies.
+  * Add info direntries for widget, info, and customize.
+  * Fix handling of /usr/local/share (which was badly broken).
+  * Turn stripping back on.  It appears to work.
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Tue,  1 Sep 1998 11:44:04 -0500
+
+emacs20 (20.2-9) unstable; urgency=low
+
+  * Fixes for leim problems (closes: #25536).  Thanks to
+    Junio Hamano <junio@twinsun.com>
+  * update-elc now made executable (closes: #25899).  Thanks to
+    Junio Hamano <junio@twinsun.com>
+  * Fix problem with package including dirs in /usr/local/share
+    (closes: #23431).
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Sat, 22 Aug 1998 11:45:16 -0500
+
+emacs20 (20.2-8) unstable; urgency=low
+
+  * Regenerate .elc files for .el files we've modified.  I didn't realize
+    that some of the .elc files were in the upstream tar file.  Hope this
+    doesn't break anything.  We haven't been using our sendmail and
+    message modifications until now.  (closes: #21079).
+  * Fix i386ism in debian scripts use "dpkg --print-architecture"
+    instead. (closes: #20548).
+  * Fixed reference in README.add-on-package-maintainers
+    (closes: #23445)
+  * Fix some alpha problems (closes: #21834).
+  * Had to add Replaces: emacs20 to emacs20-el to fix problem with
+    copyright files being in the wrong package (closes: #21531).
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Fri,  7 Aug 1998 20:39:59 -0500
+
+emacs20 (20.2-7) frozen unstable; urgency=low
+
+  * Changed emacs20-el from standard to optional.
+  * Fixed broken postrm (release critical) (closes: #24236)
+  * Don't strip emacs binary (strip is broken see binutils #23153).
+  * Since we can't strip, don't compile or link with "-g".
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Thu, 16 Jul 1998 16:58:04 -0500
+
+emacs20 (20.2-6) frozen unstable; urgency=low
+
+  * Gack.  Fix reject due to changed .tar.gz file (./leim added to tar).
+	
+ -- Rob Browning <rlb@cs.utexas.edu>  Wed,  8 Apr 1998 14:04:54 -0500
+
+emacs20 (20.2-5) frozen unstable; urgency=low
+
+  * Make sure to preserve timestamps on .el files in emacs20-el
+    (closes: #20274)
+  * Add leim support for alternate input methods.  May close several
+    bugs.
+	
+ -- Rob Browning <rlb@cs.utexas.edu>  Sun,  5 Apr 1998 10:38:20 -0500
+
+emacs20 (20.2-4) frozen unstable; urgency=low
+
+  * Added copright file to emacs20-el package (closes: #19300)
+  * suidmanager doesn't understand symbolic perms
+    (closes: #18448, #19213)
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Fri, 13 Mar 1998 13:01:07 -0600
+
+emacs20 (20.2-3) unstable; urgency=low
+
+  * Fixed problem with permissions on /usr/share/emacs/20.2/site-lisp/
+    (closes: #18717)
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Mon,  2 Mar 1998 12:02:33 -0600
+
+emacs20 (20.2-2) unstable; urgency=low
+
+  * fixed bad menu line (closes: #18362).
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Thu, 19 Feb 1998 10:52:58 -0600
+
+emacs20 (20.2-2) unstable; urgency=low
+
+  * Explicit dependency on liblockfile0 until bug is fixed
+    (closes #18186)
+  * added lisp/site-lisp.el to fix info path problem (closes #18190)
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Sat, 14 Feb 1998 19:19:09 -0600
+
+emacs20 (20.2-1) unstable; urgency=low
+
+  * movemail no longer suid -- not needed.
+  * start from scratch with emacs-20.2 source and old emacs-19.34 and
+    xemacs patches.
+
+ -- Rob Browning <rlb@cs.utexas.edu>  Tue, 16 Dec 1997 01:20:27 -0600
+
+Local Variables:
+coding: utf-8
+End:
--- emacs-21.3.orig/debian/control.in
+++ emacs-21.3/debian/control.in
@@ -0,0 +1,64 @@
+Source: emacs@MAJOR_VERSION@
+Section: editors
+Priority: optional
+Maintainer: Rob Browning <rlb@defaultvalue.org>
+Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, libungif4-dev, libtiff4-dev, xaw3dg-dev, libpng3-dev, libjpeg62-dev, autotools-dev, dpkg-dev (>> 1.10.0), dpatch (>= 1.23)
+Standards-Version: 3.6.1 
+
+Package: emacs@MAJOR_VERSION@
+Section: editors
+Priority: optional
+Architecture: any
+Depends: emacs@MAJOR_VERSION@-bin-common (= ${Source-Version}), ${shlibs:Depends}
+Provides: emacsen, editor, info-browser, mail-reader, news-reader, www-browser
+Conflicts: emacs@MAJOR_VERSION@-nox, w3-el
+Replaces: emacs@MAJOR_VERSION@-nox
+Description: The GNU Emacs editor
+ GNU Emacs is the extensible self-documenting text editor.
+
+Package: emacs@MAJOR_VERSION@-nox
+Section: editors
+Priority: optional
+Architecture: any
+Depends: emacs@MAJOR_VERSION@-bin-common (= ${Source-Version}), ${shlibs:Depends}
+Provides: emacs@MAJOR_VERSION@, editor, emacsen, info-browser, mail-reader, news-reader, www-browser
+Conflicts: emacs@MAJOR_VERSION@, w3-el
+Replaces: emacs@MAJOR_VERSION@
+Description: The GNU Emacs editor (without X support)
+ GNU Emacs is the extensible self-documenting text editor.
+ This package contains a version of Emacs compiled without support for X.
+
+Package: emacs@MAJOR_VERSION@-bin-common
+Section: editors
+Priority: optional
+Architecture: any
+Depends: emacs@MAJOR_VERSION@-common (= ${Source-Version}), ${shlibs:Depends}
+Replaces: emacs21 (<< 21.2-4), emacs21-common (<< 21.3+1-4)
+Description: The GNU Emacs editor's shared, architecture dependent files
+ GNU Emacs is the extensible self-documenting text editor.
+ This package contains the architecture dependent infrastructure
+ that's shared by emacs@MAJOR_VERSION@ and emacs@MAJOR_VERSION@-nox.
+
+Package: emacs@MAJOR_VERSION@-common
+Section: editors
+Priority: optional
+Architecture: all
+Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.9.0), ${shlibs:Depends}
+Suggests: emacs@MAJOR_VERSION@-el
+Conflicts: emacs@MAJOR_VERSION@-el (<< ${Source-Version}), w3-el
+Replaces: emacs21 (<< 21.2-4)
+Description: The GNU Emacs editor's shared, architecture independent infrastructure
+ GNU Emacs is the extensible self-documenting text editor.
+ This package contains the architecture independent infrastructure
+ that's shared by emacs@MAJOR_VERSION@ and emacs@MAJOR_VERSION@-nox.
+
+Package: emacs@MAJOR_VERSION@-el
+Section: editors
+Priority: optional
+Architecture: all
+Depends: emacs@MAJOR_VERSION@-common (= ${Source-Version})
+Replaces: emacs@MAJOR_VERSION@ (<< 21.2-4)
+Description: GNU Emacs LISP (.el) files
+ GNU Emacs is the extensible self-documenting text editor.
+ This package contains the elisp sources for the convenience of users,
+ saving space in the main package for small systems.
--- emacs-21.3.orig/debian/emacs-common.postinst
+++ emacs-21.3/debian/emacs-common.postinst
@@ -0,0 +1,106 @@
+#!/bin/sh -e
+
+MAJOR=@MAJOR_VERSION@
+MINOR=@MINOR_VERSION@
+FULL=@FULL_VERSION@
+INFOFILES="@INFOFILES@"
+
+PRIORITY=24
+
+# Fix from Manoj so we don't clean up more than we should.
+if [ -f /usr/share/info/gnus.gz ]; then
+    CRUFT_INFOFILES="ccmode cl dired-x ediff emacs forms info mh-e reftex sc \
+                     vip viper widget"
+else
+    CRUFT_INFOFILES="ccmode cl dired-x ediff emacs forms gnus info message \
+                     mh-e reftex sc vip viper widget"
+fi
+
+# We have to clean these up because the old package didn't.  The info
+# files were being removed in the postinst, not the prerm, and so
+# install-info wasn't doing anything because the files weren't there..
+for file in ${CRUFT_INFOFILES}
+do
+  install-info --quiet --remove-exactly ${file} || true
+done
+
+for file in ${INFOFILES}
+do
+  install-info --quiet --section Emacs Emacs \
+    /usr/share/info/emacs-${MAJOR}/${file}.gz || true
+done
+
+# Create the site-lisp dir for this flavor if we're allowed
+
+#### Begin Bug fix hack for old emacs20 package brain damage.
+#
+# We have to handle /usr/local/share and /usr/local/share/emacs here
+# because emacs20 used to contain /usr/local/share :< .  Normally
+# these dirs should have been handled exclusively by emacsen-common.
+
+parentdir=/usr/local
+newdir=share
+
+if [ -d ${parentdir} ]
+then
+  if mkdir ${parentdir}/${newdir} 2>/dev/null
+  then
+    chown root:staff ${parentdir}/${newdir}
+    chmod 2775 ${parentdir}/${newdir}
+  fi
+fi
+
+parentdir=/usr/local/share
+newdir=emacs
+
+if [ -d ${parentdir} ]
+then
+  if mkdir ${parentdir}/${newdir} 2>/dev/null
+  then
+    chown root:staff ${parentdir}/${newdir}
+    chmod 2775 ${parentdir}/${newdir}
+  fi
+fi
+
+parentdir=/usr/local/share/emacs
+newdir=site-lisp
+
+if [ -d ${parentdir} ]
+then
+  if mkdir ${parentdir}/${newdir} 2>/dev/null
+  then
+    chown root:staff ${parentdir}/${newdir}
+    chmod 2775 ${parentdir}/${newdir}
+  fi
+fi
+
+#### End Bug fix hack for old emacs20 package brain damage.
+
+
+parentdir=/usr/local/share/emacs
+newdir=${FULL}
+
+if [ -d ${parentdir} ]
+then
+  if mkdir ${parentdir}/${newdir} 2>/dev/null
+  then
+    chown root:staff ${parentdir}/${newdir}
+    chmod 2775 ${parentdir}/${newdir}
+  fi
+fi
+
+parentdir=/usr/local/share/emacs/${FULL}
+newdir=site-lisp
+
+if [ -d ${parentdir} ]
+then
+  if mkdir ${parentdir}/${newdir} 2>/dev/null
+  then
+    chown root:staff ${parentdir}/${newdir}
+    chmod 2775 ${parentdir}/${newdir}
+  fi
+fi
+
+# emacsen-common/emacs-install used to be here.
+
+exit 0
--- emacs-21.3.orig/debian/control
+++ emacs-21.3/debian/control
@@ -0,0 +1,64 @@
+Source: emacs21
+Section: editors
+Priority: optional
+Maintainer: Rob Browning <rlb@defaultvalue.org>
+Build-Depends: mailx, libncurses5-dev, texinfo, liblockfile-dev, libungif4-dev, libtiff4-dev, xaw3dg-dev, libpng3-dev, libjpeg62-dev, autotools-dev, dpkg-dev (>> 1.10.0), dpatch (>= 1.23)
+Standards-Version: 3.6.1 
+
+Package: emacs21
+Section: editors
+Priority: optional
+Architecture: any
+Depends: emacs21-bin-common (= ${Source-Version}), ${shlibs:Depends}
+Provides: emacsen, editor, info-browser, mail-reader, news-reader, www-browser
+Conflicts: emacs21-nox, w3-el
+Replaces: emacs21-nox
+Description: The GNU Emacs editor
+ GNU Emacs is the extensible self-documenting text editor.
+
+Package: emacs21-nox
+Section: editors
+Priority: optional
+Architecture: any
+Depends: emacs21-bin-common (= ${Source-Version}), ${shlibs:Depends}
+Provides: emacs21, editor, emacsen, info-browser, mail-reader, news-reader, www-browser
+Conflicts: emacs21, w3-el
+Replaces: emacs21
+Description: The GNU Emacs editor (without X support)
+ GNU Emacs is the extensible self-documenting text editor.
+ This package contains a version of Emacs compiled without support for X.
+
+Package: emacs21-bin-common
+Section: editors
+Priority: optional
+Architecture: any
+Depends: emacs21-common (= ${Source-Version}), ${shlibs:Depends}
+Replaces: emacs21 (<< 21.2-4), emacs21-common (<< 21.3+1-4)
+Description: The GNU Emacs editor's shared, architecture dependent files
+ GNU Emacs is the extensible self-documenting text editor.
+ This package contains the architecture dependent infrastructure
+ that's shared by emacs21 and emacs21-nox.
+
+Package: emacs21-common
+Section: editors
+Priority: optional
+Architecture: all
+Depends: emacsen-common (>= 1.4.10), dpkg (>= 1.9.0), ${shlibs:Depends}
+Suggests: emacs21-el
+Conflicts: emacs21-el (<< ${Source-Version}), w3-el
+Replaces: emacs21 (<< 21.2-4)
+Description: The GNU Emacs editor's shared, architecture independent infrastructure
+ GNU Emacs is the extensible self-documenting text editor.
+ This package contains the architecture independent infrastructure
+ that's shared by emacs21 and emacs21-nox.
+
+Package: emacs21-el
+Section: editors
+Priority: optional
+Architecture: all
+Depends: emacs21-common (= ${Source-Version})
+Replaces: emacs21 (<< 21.2-4)
+Description: GNU Emacs LISP (.el) files
+ GNU Emacs is the extensible self-documenting text editor.
+ This package contains the elisp sources for the convenience of users,
+ saving space in the main package for small systems.
--- emacs-21.3.orig/debian/emacs-bin-common.postinst
+++ emacs-21.3/debian/emacs-bin-common.postinst
@@ -0,0 +1,30 @@
+#!/bin/sh -e
+
+MAJOR=@MAJOR_VERSION@
+MINOR=@MINOR_VERSION@
+FULL=@FULL_VERSION@
+INFOFILES="@INFOFILES@"
+ALTERNATIVES="@ALTERNATIVES@"
+
+PRIORITY=24
+
+# update-alternatives on things that collide with xemacs, other editors
+for i in ctags etags emacsclient
+do
+  update-alternatives \
+    --install /usr/bin/$i $i /usr/bin/$i.emacs${MAJOR} ${PRIORITY} \
+    --slave /usr/share/man/man1/$i.1.gz $i.1.gz \
+            /usr/share/man/man1/$i.1emacs${MAJOR}.gz 
+done
+
+for i in ${ALTERNATIVES}
+do
+  test $i = ctags && continue
+  test $i = etags && continue
+  test $i = emacs && continue
+  test $i = emacsclient && continue
+  update-alternatives --install /usr/bin/$i $i /usr/bin/$i.emacs${MAJOR} \
+    ${PRIORITY}
+done
+
+exit 0
--- emacs-21.3.orig/debian/emacs-bin-common.prerm
+++ emacs-21.3/debian/emacs-bin-common.prerm
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+set -e
+
+MAJOR=@MAJOR_VERSION@
+MINOR=@MINOR_VERSION@
+FULL=@FULL_VERSION@
+INFOFILES="@INFOFILES@"
+ALTERNATIVES="@ALTERNATIVES@"
+
+if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/@PKG_NAME@ ]
+then
+  rm -f /usr/doc/@PKG_NAME@
+fi
+
+# update-alternatives on things that collide with xemacs, other editors
+if [ "$1" != "upgrade" ]
+then
+  for i in `echo ${ALTERNATIVES} | grep -v emacs`
+  do
+    update-alternatives --remove $i /usr/bin/$i.emacs${MAJOR}
+  done
+fi
+
+exit 0
--- emacs-21.3.orig/debian/emacsclient-plus
+++ emacs-21.3/debian/emacsclient-plus
@@ -0,0 +1,31 @@
+#!/usr/bin/perl
+
+# If there is an Emacs server, runs emacsclient.
+# Otherwise, launches Emacs.
+# Only for systems with Berkeley sockets (like Debian GNU/Linux).
+
+$real_emacsclient = "/usr/bin/emacsclient";
+$socket_prefix = "esrv";
+$id = `id --user`;
+chomp $id;
+$socket_dir = "/tmp/";
+$hostname = `hostname`;
+chomp $hostname;
+
+if (-S "$socket_dir$socket_prefix$id-$hostname") {
+    exec ("$real_emacsclient " . join (" ", @ARGV));            
+    die "Cannot run $real_emacsclient: $!";
+}
+else {
+    if ($ENV{'DISPLAY'}) {
+        system "emacs &";
+        # Wait the server (Emacs is slow)
+        sleep 2;
+        exec ("$real_emacsclient " . join (" ", @ARGV));                
+        die "Cannot run $real_emacsclient: $!";
+    }
+    else {
+        exec ("emacs " . join (" ", @ARGV));            
+        die "Cannot run emacs: $!";
+    }
+}
--- emacs-21.3.orig/debian/patches/00list
+++ emacs-21.3/debian/patches/00list
@@ -0,0 +1,19 @@
+autoconf-updates
+misc-unseparated
+arch-hppa
+arch-mipsel
+arch-s390
+browse-url
+bzero-and-have-stdlib
+detect-coding-iso2022
+movemail-mailspool
+version-mention-debian
+hurd-libio-glibc
+battery-acpi-support
+scroll-margin
+save-buffer
+emacsclient-alternate-editor
+fix-x-vs-no-x-diffs
+fix-batch-mode-signal-handling
+fix-insecure-permissions-on-restore
+CAN-2005-0100
--- emacs-21.3.orig/debian/patches/arch-hppa.dpatch
+++ emacs-21.3/debian/patches/arch-hppa.dpatch
@@ -0,0 +1,105 @@
+#! /bin/sh -e
+## 500-arch-hppa.dpatch by Rob Browning <rlb@defaultvalue.org>
+##
+## DP: ** Support for the hppa architecture has been added.
+## DP: Status: appears to be incorporated upstream
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+	*)
+		echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+		exit 1;;
+esac
+
+exit 0
+@DPATCH@
+--- emacs21-21.2.orig/configure.in
++++ emacs21-21.2/configure.in
+@@ -552,6 +552,9 @@
+   hppa*-*-nextstep* )
+     machine=hp800 opsys=nextstep
+   ;;
++  hppa*-*-linux-gnu* )
++    machine=hp800 opsys=gnu-linux
++  ;;
+ 
+   ## Orion machines
+   orion-orion-bsd* )
+--- emacs21-21.2.orig/src/m/hp800.h
++++ emacs21-21.2/src/m/hp800.h
+@@ -85,7 +85,7 @@
+ #define bcmp		memcmp
+ #endif
+ \f
+-#ifdef __hpux
++#if defined(__hpux) || defined(__linux__)
+ /* Now define a symbol for the cpu type, if your compiler
+    does not define it automatically:
+    Ones defined so far include vax, m68000, ns16000, pyramid,
+@@ -94,6 +94,15 @@
+ #     define hp9000s800
+ #endif
+ 
++#ifdef __linux__
++/* Data type of load average, as read out of kmem.  */
++
++#define LOAD_AVE_TYPE long
++
++/* Convert that into an integer that is 100 for a load average of 1.0  */
++
++#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
++#else
+ /* Data type of load average, as read out of kmem.  */
+ 
+ #define LOAD_AVE_TYPE double
+@@ -101,7 +110,7 @@
+ /* Convert that into an integer that is 100 for a load average of 1.0  */
+ 
+ #define LOAD_AVE_CVT(x) ((int) (x * 100.0))
+-
++#endif
+ 
+ /* Define CANNOT_DUMP on machines where unexec does not work.
+    Then the function dump-emacs will not be defined
+@@ -116,6 +125,7 @@
+    Otherwise Emacs assumes that text space precedes data space,
+    numerically.  */
+ 
++#ifdef __hpux
+ #define VIRT_ADDR_VARIES
+ 
+ /* Define C_ALLOCA if this machine does not support a true alloca
+@@ -134,6 +144,9 @@
+ 
+ #define DATA_START    0x40000000
+ #define TEXT_START    0x00000000
++#else
++#define HAVE_ALLOCA
++#endif
+ 
+ #define STACK_DIRECTION 1 
+ 
+@@ -147,6 +160,7 @@
+ /* This machine requires completely different unexec code
+    which lives in a separate file.  Specify the file name.  */
+ 
++#ifdef __hpux
+ #define UNEXEC unexhp9k800.o
+ 
+ #define LIBS_MACHINE
+@@ -179,5 +193,5 @@
+ 
+ #define index strchr
+ #define rindex strrchr
+-
+-#endif /* __hpux */
++#endif
++#endif
--- emacs-21.3.orig/debian/patches/CAN-2005-0100.dpatch
+++ emacs-21.3/debian/patches/CAN-2005-0100.dpatch
@@ -0,0 +1,35 @@
+#! /bin/sh -e
+## CAN-2005-0100.dpatch by  <martin.pitt@ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix format string vulnerability in movemal (CAN-2005-0100).
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+	*)
+		echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+		exit 1;;
+esac
+
+exit 0
+@DPATCH@
+diff -urNad emacs-21.3/lib-src/movemail.c /tmp/dpep.yMvw2I/emacs-21.3/lib-src/movemail.c
+--- emacs-21.3/lib-src/movemail.c	2005-02-04 10:07:21.636219680 +0000
++++ /tmp/dpep.yMvw2I/emacs-21.3/lib-src/movemail.c	2005-02-04 10:08:17.325885034 +0000
+@@ -786,7 +786,7 @@
+       mbx_delimit_begin (mbf);
+       if (pop_retr (server, i, mbf) != OK)
+ 	{
+-	  error (Errmsg, 0, 0);
++	  error ("%s", Errmsg, 0);
+ 	  close (mbfi);
+ 	  return (1);
+ 	}
--- emacs-21.3.orig/debian/patches/misc-unseparated.dpatch
+++ emacs-21.3/debian/patches/misc-unseparated.dpatch
@@ -0,0 +1,248 @@
+#! /bin/sh -e
+## 400-misc-unseparated.dpatch by Rob Browning <rlb@defaultvalue.org>
+##
+## DP: ** Some documentation references to /usr/local/ have been changed to /usr.
+## DP: 
+## DP: ** Emacs runs debian-startup
+## DP: Emacs runs debian-startup during the startup process unless
+## DP: site-run-file is false.
+## DP: 
+## DP: ** The default for message-sendmail-f-is-evil has been changed to t.
+## DP: This is correct for Debian systems where we know the MTA should be
+## DP: trusted.
+## DP: 
+## DP: ** mail-from-style changed from 'angles to 'system-default by default.
+## DP: 
+## DP: ** debian-emacs-flavor is a global variable bound to 'emacs21.
+## DP: Author: rlb
+## DP: 
+## DP: ** Info-default-directory-list includes /usr/share/info/emacs-MAJOR
+## DP: Author: rlb
+## DP: Info-default-directory-list was modified to reflect the install
+## DP: location of the info files.  This location allows multiple emacsen to
+## DP: coexist on the same Debian system.
+## DP: 
+## DP: ** The build process was modified to accommodate Debian packaging.
+## DP: Author: rlb
+## DP: Emacs has to be able to install into a directory that will
+## DP: not be the eventual run directory without embedding the install
+## DP: directory in any of the resulting files.
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+	*)
+		echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+		exit 1;;
+esac
+
+exit 0
+@DPATCH@
+diff -urNad /home/rlb/deb/emacs21/trunk/Makefile.in trunk/Makefile.in
+--- /home/rlb/deb/emacs21/trunk/Makefile.in	2003-09-11 01:16:07.000000000 -0500
++++ trunk/Makefile.in	2003-09-11 01:16:53.000000000 -0500
+@@ -474,11 +474,16 @@
+ 	  $(srcdir)/mkinstalldirs ${datadir}; \
+ 	  chmod a+r ${datadir};\
+ 	fi
++	test "${debepkgdir}"
+ 	$(srcdir)/mkinstalldirs ${COPYDESTS} ${infodir} ${man1dir} \
+ 	  ${bindir} ${docdir} ${libexecdir} \
+ 	  ${datadir}/emacs/site-lisp \
+ 	  ${datadir}/emacs/${version}/site-lisp \
+-	  `echo ${locallisppath} | sed 's/:/ /g'`
++	  `echo ${debepkgdir}${locallisppath} | sed 's|:| ${debepkgdir}|g'`
++
++# debepkgdir (above) is set in debian/rules
++
++#	  `echo debian/tmp-emacs${locallisppath} | sed 's/:/ debian\/tmp-emacs/g'`
+ 
+ ### Delete all the installed files that the `install' target would
+ ### create (but not the noninstalled files such as `make all' would
+diff -urNad /home/rlb/deb/emacs21/trunk/etc/NEWS trunk/etc/NEWS
+--- /home/rlb/deb/emacs21/trunk/etc/NEWS	2003-09-11 01:16:07.000000000 -0500
++++ trunk/etc/NEWS	2003-09-11 01:16:53.000000000 -0500
+@@ -6,6 +6,11 @@
+ For older news, see the file ONEWS
+ 
+ \f
++* Debian specific changes to Emacs
++
++Please see /usr/share/doc/emacs21/README.Debian.gz.
++
++\f
+ * Installation changes in Emacs 21.3
+ 
+ ** Support for GNU/Linux on little-endian MIPS and on IBM S390 has
+diff -urNad /home/rlb/deb/emacs21/trunk/etc/emacs.1 trunk/etc/emacs.1
+--- /home/rlb/deb/emacs21/trunk/etc/emacs.1	2003-09-11 01:16:07.000000000 -0500
++++ trunk/etc/emacs.1	2003-09-11 01:16:53.000000000 -0500
+@@ -169,7 +169,7 @@
+ window in reverse video.
+ .TP
+ .B \-i
+-Use the "kitchen sink" bitmap icon when iconifying the
++Use the Emacs icon when iconifying the
+ .I Emacs
+ window.
+ .TP
+@@ -221,7 +221,7 @@
+ .IR X (1)
+ for more information.
+ The width and height are specified in characters; the default is 80 by
+-24.
++40.
+ .PP
+ .TP 8
+ .BI \-fg " color"
+@@ -411,29 +411,29 @@
+ manual is also included in the Emacs source distribution.
+ .PP
+ .SH FILES
+-/usr/local/info - files for the Info documentation browser
++/usr/info - files for the Info documentation browser
+ (a subsystem of Emacs) to refer to.  Currently not much of Unix
+ is documented here, but the complete text of the Emacs reference
+ manual is included in a convenient tree structured form.
+ 
+-/usr/local/share/emacs/$VERSION/src - C source files and object files
++/usr/share/emacs/$VERSION/src - C source files and object files
+ 
+-/usr/local/share/emacs/$VERSION/lisp - Lisp source files and compiled files
++/usr/share/emacs/$VERSION/lisp - Lisp source files and compiled files
+ that define most editing commands.  Some are preloaded;
+ others are autoloaded from this directory when used.
+   
+-/usr/local/share/emacs/$VERSION/etc - various programs that are used with
++/usr/share/emacs/$VERSION/etc - various programs that are used with
+ GNU Emacs, and some files of information.
+ 
+-/usr/local/share/emacs/$VERSION/etc/DOC.* - contains the documentation
++/usr/share/emacs/$VERSION/etc/DOC.* - contains the documentation
+ strings for the Lisp primitives and preloaded Lisp functions
+ of GNU Emacs.  They are stored here to reduce the size of
+ Emacs proper.
+ 
+-/usr/local/share/emacs/$VERSION/etc/OTHER.EMACSES discusses GNU Emacs
++/usr/share/emacs/$VERSION/etc/OTHER.EMACSES discusses GNU Emacs
+ vs. other versions of Emacs.
+ .br
+-/usr/local/share/emacs/$VERSION/etc/SERVICE lists people offering
++/usr/share/emacs/$VERSION/etc/SERVICE lists people offering
+ various services to assist users of GNU Emacs, including education,
+ troubleshooting, porting and customization.
+ .br
+@@ -441,7 +441,7 @@
+ programs in the Emacs Lisp extension language, which has not yet been fully
+ documented.
+ 
+-/usr/local/com/emacs/lock - holds lock files that are made for all
++/usr/com/emacs/lock - holds lock files that are made for all
+ files being modified in Emacs, to prevent simultaneous modification
+ of one file by two users.
+ 
+@@ -468,7 +468,7 @@
+ Send requests to be added to mailing lists to the special list
+ info-gnu-emacs-request@prep.ai.mit.edu (or the corresponding UUCP
+ address).  For more information about Emacs mailing lists, see the
+-file /usr/local/emacs/etc/MAILINGLISTS.  Bugs tend actually to be
++file /usr/emacs/etc/MAILINGLISTS.  Bugs tend actually to be
+ fixed if they can be isolated, so it is in your interest to report
+ them in such a way that they can be easily reproduced.
+ .PP
+diff -urNad /home/rlb/deb/emacs21/trunk/lisp/gnus/message.el trunk/lisp/gnus/message.el
+--- /home/rlb/deb/emacs21/trunk/lisp/gnus/message.el	2003-09-11 01:16:07.000000000 -0500
++++ trunk/lisp/gnus/message.el	2003-09-11 01:16:53.000000000 -0500
+@@ -402,9 +402,14 @@
+ 		 (const use)
+ 		 (const ask)))
+ 
+-(defcustom message-sendmail-f-is-evil nil
+-  "*Non-nil means don't add \"-f username\" to the sendmail command line.
+-Doing so would be even more evil than leaving it out."
++;; message-sendmail-f-is-evil is nil here in the upstream source, but
++;; sendmail works right under Debian Linux, so we want t. [was
++;; orignally reported for emacs 19 as debian#7051]
++(defcustom message-sendmail-f-is-evil t
++  "*Non-nil means don't add \"-f username\" to the sendmail command
++line, because adding it would be more evil than leaving it out.  Under
++Debian/GNU/Linux, sendmail works right, so it should be safe for this
++to be set to true."
+   :group 'message-sending
+   :type 'boolean)
+ 
+diff -urNad /home/rlb/deb/emacs21/trunk/lisp/mail/sendmail.el trunk/lisp/mail/sendmail.el
+--- /home/rlb/deb/emacs21/trunk/lisp/mail/sendmail.el	2003-09-11 01:16:07.000000000 -0500
++++ trunk/lisp/mail/sendmail.el	2003-09-11 01:16:53.000000000 -0500
+@@ -43,7 +43,7 @@
+   :group 'mail)
+ 
+ ;;;###autoload
+-(defcustom mail-from-style 'angles "\
++(defcustom mail-from-style 'system-default "\
+ *Specifies how \"From:\" fields look.
+ 
+ If `nil', they contain just the return address like:
+diff -urNad /home/rlb/deb/emacs21/trunk/lisp/site-init.el trunk/lisp/site-init.el
+--- /home/rlb/deb/emacs21/trunk/lisp/site-init.el	1969-12-31 18:00:00.000000000 -0600
++++ trunk/lisp/site-init.el	2003-09-11 01:16:53.000000000 -0500
+@@ -0,0 +1,3 @@
++(setq Info-default-directory-list
++      ;; the command line info doesn't seem to need this, but emacs does.
++      (append Info-default-directory-list '("/usr/share/info/emacs-21/")))
+diff -urNad /home/rlb/deb/emacs21/trunk/lisp/startup.el trunk/lisp/startup.el
+--- /home/rlb/deb/emacs21/trunk/lisp/startup.el	2003-09-11 01:16:07.000000000 -0500
++++ trunk/lisp/startup.el	2003-09-11 01:16:53.000000000 -0500
+@@ -339,6 +339,10 @@
+ 
+ (defvar normal-top-level-add-subdirs-inode-list nil)
+ 
++(defconst debian-emacs-flavor 'emacs21
++  "A symbol representing the particular debian flavor of emacs running.
++Something like 'emacs20, 'xemacs20, etc.")
++
+ (defun normal-top-level-add-subdirs-to-load-path ()
+   "Add all subdirectories of current directory to `load-path'.
+ More precisely, this uses only the subdirectories whose names
+@@ -848,8 +852,18 @@
+     ;; Run the site-start library if it exists.  The point of this file is
+     ;; that it is run before .emacs.  There is no point in doing this after
+     ;; .emacs; that is useless.
+-    (if site-run-file 
+-	(load site-run-file t t))
++    ;; (if site-run-file 
++    ;;     (load site-run-file t t))
++
++    ;; Debian version of site-start.
++    (if site-run-file
++        (progn
++          ;; Load all the debian package snippets.
++          ;; It's in here because we want -q to kill it too.
++          (if (load "debian-startup" t t nil)
++              (debian-startup debian-emacs-flavor))
++          ;; Now the normal site file...
++          (load site-run-file t t nil)))
+ 
+     ;; Sites should not disable this.  Only individuals should disable
+     ;; the startup message.
+diff -urNad /home/rlb/deb/emacs21/trunk/lisp/vc-hooks.el trunk/lisp/vc-hooks.el
+--- /home/rlb/deb/emacs21/trunk/lisp/vc-hooks.el	2003-09-11 01:16:07.000000000 -0500
++++ trunk/lisp/vc-hooks.el	2003-09-11 01:16:53.000000000 -0500
+@@ -54,8 +54,8 @@
+   :group 'vc)
+ 
+ (defcustom vc-path
+-  (if (file-directory-p "/usr/sccs")
+-      '("/usr/sccs")
++  (if (file-directory-p "/usr/lib/cssc")
++      '("/usr/lib/cssc")
+     nil)
+   "*List of extra directories to search for version control commands."
+   :type '(repeat directory)
--- emacs-21.3.orig/debian/patches/fix-insecure-permissions-on-restore.dpatch
+++ emacs-21.3/debian/patches/fix-insecure-permissions-on-restore.dpatch
@@ -0,0 +1,35 @@
+#! /bin/sh -e
+## 500-version-mention-debian.dpatch by Rob Browning <rlb@defaultvalue.org>
+##
+## DP: ** (version) has been modified to indicate Debian modifications.
+## DP: Author: rlb
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+	*)
+		echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+		exit 1;;
+esac
+
+exit 0
+@DPATCH@
+diff -Narud emacs-21.3.orig/src/fileio.c emacs-21.3/src/fileio.c
+--- emacs-21.3.orig/src/fileio.c	2003-02-04 11:52:40.000000000 +0100
++++ emacs-21.3/src/fileio.c	2004-10-10 07:14:11.891375352 +0200
+@@ -5438,6 +5438,8 @@
+       && stat (XSTRING (current_buffer->filename)->data, &st) >= 0)
+     /* But make sure we can overwrite it later!  */
+     auto_save_mode_bits = st.st_mode | 0600;
++  else if (! NILP (current_buffer->filename))
++    auto_save_mode_bits = XINT (Ffile_modes (current_buffer->filename)) | 0600;
+   else
+     auto_save_mode_bits = 0666;
+ 
--- emacs-21.3.orig/debian/patches/fix-batch-mode-signal-handling.dpatch
+++ emacs-21.3/debian/patches/fix-batch-mode-signal-handling.dpatch
@@ -0,0 +1,57 @@
+#! /bin/sh -e
+## fix-batch-mode-signal-handling.dpatch by  <rlb@defaultvalue.org>
+##
+## DP: ** A problem with emacs non-interactive signal handling has been fixed.
+## DP: An upstream patch from 2003-06-21 was backported to fix Bug#253887.
+## DP: Under certain conditions running "emacs --batch ... < /dev/null" would
+## DP: trigger a process exit via SIGIO or SIGHUP.  This has been fixed.
+## DP: Status: patch backported from upstream.
+
+if [ $# -lt 1 ]; then
+    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+    -patch) patch -p1 ${patch_opts} < $0;;
+    -unpatch) patch -R -p1 ${patch_opts} < $0;;
+    *)
+        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+        exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/rlb/deb/emacs/trunk-21/src/keyboard.c trunk-21/src/keyboard.c
+--- /home/rlb/deb/emacs/trunk-21/src/keyboard.c	2003-09-09 17:26:14.000000000 -0500
++++ trunk-21/src/keyboard.c	2004-07-18 17:10:35.000000000 -0500
+@@ -6186,7 +6186,12 @@
+ 	/* ??? Is it really right to send the signal just to this process
+ 	   rather than to the whole process group?
+ 	   Perhaps on systems with FIONREAD Emacs is alone in its group.  */
+-	kill (getpid (), SIGHUP);
++        {
++          if (! noninteractive)
++            kill (getpid (), SIGHUP);
++          else
++            n_to_read = 0;
++        }
+       if (n_to_read == 0)
+ 	return 0;
+       if (n_to_read > sizeof cbuf)
+diff -urNad /home/rlb/deb/emacs/trunk-21/src/process.c trunk-21/src/process.c
+--- /home/rlb/deb/emacs/trunk-21/src/process.c	2003-09-09 17:28:35.000000000 -0500
++++ trunk-21/src/process.c	2004-07-18 17:11:21.000000000 -0500
+@@ -2734,7 +2734,7 @@
+ 	 but select says there is input.  */
+ 
+       if (XINT (read_kbd) && interrupt_input
+-	  && keyboard_bit_set (&Available))
++	  && keyboard_bit_set (&Available) && ! noninteractive)
+ 	kill (getpid (), SIGIO);
+ #endif
+ 
--- emacs-21.3.orig/debian/patches/browse-url.dpatch
+++ emacs-21.3/debian/patches/browse-url.dpatch
@@ -0,0 +1,312 @@
+#! /bin/sh -e
+## 500-browse-url.dpatch by Rob Browning <rlb@defaultvalue.org>
+##
+## DP: ** Added new browse-url.el code.
+## DP: Fixes support for mozilla, adds support for galeon, and defaults to
+## DP: free browsers when available, rather than just trying netscape.
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+	*)
+		echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+		exit 1;;
+esac
+
+exit 0
+@DPATCH@
+--- emacs21-21.2.orig/lisp/net/browse-url.el
++++ emacs21-21.2/lisp/net/browse-url.el
+@@ -4,7 +4,7 @@
+ ;;   Free Software Foundation, Inc.
+ 
+ ;; Author: Denis Howe <dbh@doc.ic.ac.uk>
+-;; Maintainer: Dave Love <fx@gnu.org>
++;; Maintainer: FSF
+ ;; Created: 03 Apr 1995
+ ;; Keywords: hypertext, hypermedia, mouse
+ 
+@@ -66,14 +66,6 @@
+ ;; control but which window DO you want to control and how do you
+ ;; discover its id?
+ 
+-;; If using XMosaic before version 2.5, check the definition of
+-;; browse-url-usr1-signal below.
+-;; <URL:http://www.ncsa.uiuc.edu/SDG/Software/XMosaic/remote-control.html>
+-
+-;; XMosaic version 2.5 introduced Common Client Interface allowing you
+-;; to control mosaic through Unix sockets.
+-;; <URL:http://www.ncsa.uiuc.edu/SDG/Software/XMosaic/CCI/cci-spec.html>
+-
+ ;; William M. Perry's excellent "w3" WWW browser for
+ ;; Emacs <URL:ftp://cs.indiana.edu/pub/elisp/w3/>
+ ;; has a function w3-follow-url-at-point, but that
+@@ -90,10 +82,6 @@
+ ;; Python see <url:http://www.python.org/>.  Grail support in
+ ;; browse-url.el written by Barry Warsaw <bwarsaw@python.org>.
+ 
+-;; MMM is a semi-free WWW browser implemented in Objective Caml, an
+-;; interesting impure functional programming language.  See
+-;; <URL:http://pauillac.inria.fr/%7Erouaix/mmm/>.
+-
+ ;; Lynx is now distributed by the FSF.  See also
+ ;; <URL:http://lynx.browser.org/>.
+ 
+@@ -226,8 +214,10 @@
+ (eval-when-compile (require 'thingatpt)
+                    (require 'term)
+ 		   (require 'dired)
++                   (require 'executable)
+ 		   (require 'w3-auto nil t))
+ 
++
+ (defgroup browse-url nil
+   "Use a web browser to look at a URL."
+   :prefix "browse-url-"
+@@ -238,7 +228,8 @@
+ (defcustom browse-url-browser-function
+   (if (memq system-type '(windows-nt ms-dos))
+       'browse-url-default-windows-browser
+-    'browse-url-netscape)
++    'browse-url-default-browser)
++
+   "*Function to display the current buffer in a WWW browser.
+ This is used by the `browse-url-at-point', `browse-url-at-mouse', and
+ `browse-url-of-file' commands.
+@@ -252,6 +243,8 @@
+ 	  (function-item :tag "Emacs W3" :value  browse-url-w3)
+ 	  (function-item :tag "W3 in another Emacs via `gnudoit'"
+ 			 :value  browse-url-w3-gnudoit)
++	  (function-item :tag "Mozilla" :value  browse-url-mozilla)
++	  (function-item :tag "Galeon" :value  browse-url-galeon)
+ 	  (function-item :tag "Netscape" :value  browse-url-netscape)
+ 	  (function-item :tag "Mosaic" :value  browse-url-mosaic)
+ 	  (function-item :tag "Mosaic using CCI" :value  browse-url-cci)
+@@ -269,6 +262,8 @@
+ 			 :value browse-url-default-windows-browser)
+ 	  (function-item :tag "GNOME invoking Mozilla"
+ 			 :value browse-url-gnome-moz)
++	  (function-item :tag "Default browser"
++			 :value browse-url-default-browser)
+ 	  (function :tag "Your own function")
+ 	  (alist :tag "Regexp/function association list"
+ 		 :key-type regexp :value-type function))
+@@ -300,6 +295,47 @@
+   :group 'browse-url)
+ 
+ ;;;###autoload
++(defcustom browse-url-browser-display nil
++  "*The X display for running the browser, if not same as Emacs'."
++  :type '(choice string (const :tag "Default" nil))
++  :group 'browse-url)
++
++(defcustom browse-url-mozilla-program "mozilla"
++  "The name by which to invoke Mozilla."
++  :type 'string
++  :group 'browse-url)
++
++(defcustom browse-url-mozilla-arguments nil
++  "A list of strings to pass to Mozilla as arguments."
++  :type '(repeat (string :tag "Argument"))
++  :group 'browse-url)
++
++(defcustom browse-url-mozilla-startup-arguments browse-url-mozilla-arguments
++  "A list of strings to pass to Mozilla when it starts up.
++Defaults to the value of `browse-url-mozilla-arguments' at the time
++`browse-url' is loaded."
++  :type '(repeat (string :tag "Argument"))
++  :group 'browse-url)
++
++;;;###autoload
++(defcustom browse-url-galeon-program "galeon"
++  "The name by which to invoke Galeon."
++  :type 'string
++  :group 'browse-url)
++
++(defcustom browse-url-galeon-arguments nil
++  "A list of strings to pass to Galeon as arguments."
++  :type '(repeat (string :tag "Argument"))
++  :group 'browse-url)
++
++(defcustom browse-url-galeon-startup-arguments browse-url-galeon-arguments
++  "A list of strings to pass to Galeon when it starts up.
++Defaults to the value of `browse-url-galeon-arguments' at the time
++`browse-url' is loaded."
++  :type '(repeat (string :tag "Argument"))
++  :group 'browse-url)
++
++;;;###autoload
+ (defcustom browse-url-new-window-flag nil
+   "*If non-nil, always open a new browser window with appropriate browsers.
+ Passing an interactive argument to \\[browse-url], or specific browser
+@@ -308,12 +344,6 @@
+   :type 'boolean
+   :group 'browse-url)
+ 
+-;;;###autoload
+-(defcustom browse-url-netscape-display nil
+-  "*The X display for running Netscape, if not same as Emacs'."
+-  :type '(choice string (const :tag "Default" nil))
+-  :group 'browse-url)
+-
+ (defcustom browse-url-mosaic-program "xmosaic"
+   "The name by which to invoke Mosaic (or mMosaic)."
+   :type 'string
+@@ -681,11 +711,11 @@
+ ;; --- Netscape ---
+ 
+ (defun browse-url-process-environment ()
+-  "Set DISPLAY in the environment to the X display Netscape is running on.
+-This is either the value of variable `browse-url-netscape-display' if
++  "Set DISPLAY in the environment to the X display the browser will use.
++This is either the value of variable `browse-url-browser-display' if
+ non-nil, or the same display as Emacs if different from the current
+ environment, otherwise just use the current environment."
+-  (let ((display (or browse-url-netscape-display (browse-url-emacs-display))))
++  (let ((display (or browse-url-browser-display (browse-url-emacs-display))))
+     (if display
+ 	(cons (concat "DISPLAY=" display) process-environment)
+       process-environment)))
+@@ -701,6 +731,35 @@
+          display)))
+ 
+ ;;;###autoload
++(defun browse-url-default-browser (url &rest args)
++  "Find a suitable browser and ask it to load URL.
++Default to the URL around or before point.
++
++When called interactively, if variable `browse-url-new-window-flag' is
++non-nil, load the document in a new window, if possible, otherwise use
++a random existing one.  A non-nil interactive prefix argument reverses
++the effect of `browse-url-new-window-flag'.
++
++When called non-interactively, optional second argument NEW-WINDOW is
++used instead of `browse-url-new-window-flag'.
++
++The order attempted is gnome-moz-remote, Mozilla, Galeon, Netscape,
++Mosaic, IXI Mosaic, Lynx in an xterm, MMM, Konqueror, and then W3."
++  (apply
++    (cond
++     ((executable-find "gnome-moz-remote") 'browse-url-gnome-moz)
++     ((executable-find browse-url-mozilla-program) 'browse-url-mozilla)
++     ((executable-find browse-url-galeon-program) 'browse-url-galeon)
++     ((executable-find browse-url-kde-program) 'browse-url-kde)
++     ((executable-find browse-url-netscape-program) 'browse-url-netscape)
++     ((executable-find browse-url-mosaic-program) 'browse-url-mosaic)
++     ((executable-find "tellw3b") 'browse-url-iximosaic)
++     ((executable-find browse-url-xterm-program) 'browse-url-lynx-xterm)
++     ((executable-find "mmm") 'browse-url-mmm)
++     (t 'browse-url-w3))
++     url args))
++
++;;;###autoload
+ (defun browse-url-netscape (url &optional new-window)
+   "Ask the Netscape WWW browser to load URL.
+ Default to the URL around or before point.  The strings in variable
+@@ -767,6 +826,50 @@
+            (append browse-url-netscape-arguments
+                    (list "-remote" command)))))
+ 
++;;;###autoload
++(defun browse-url-mozilla (url &optional new-window)
++  "Ask the Mozilla WWW browser to load URL.
++Default to the URL around or before point.  The strings in variable
++`browse-url-mozilla-arguments' are also passed to Mozilla.
++
++When called interactively, if variable `browse-url-new-window-flag' is
++non-nil, load the document in a new Mozilla window, otherwise use a
++random existing one.  A non-nil interactive prefix argument reverses
++the effect of `browse-url-new-window-flag'.
++
++When called non-interactively, optional second argument NEW-WINDOW is
++used instead of `browse-url-new-window-flag'."
++  (interactive (browse-url-interactive-arg "URL: "))
++  ;; URL encode any `confusing' characters in the URL.  This needs to
++  ;; include at least commas; presumably also close parens.
++  (while (string-match "[,)]" url)
++    (setq url (replace-match
++	       (format "%%%x" (string-to-char (match-string 0 url))) t t url)))
++  (let* ((process-environment (browse-url-process-environment))
++         (process (apply 'start-process
++			 (concat "mozilla " url) nil
++			 browse-url-mozilla-program
++			 (append
++			  browse-url-mozilla-arguments
++			  (list "-remote"
++			        (concat "openurl("
++				        url
++				        (if new-window ",new-window" "")
++				")"))))))
++    (set-process-sentinel process
++			  `(lambda (process change)
++			     (browse-url-mozilla-sentinel process ,url)))))
++
++(defun browse-url-mozilla-sentinel (process url)
++  "Handle a change to the process communicating with Mozilla."
++  (or (eq (process-exit-status process) 0)
++      (let* ((process-environment (browse-url-process-environment)))
++	;; Mozilla is not running - start it
++	(message "Starting Mozilla...")
++	(apply 'start-process (concat "mozilla " url) nil
++	       browse-url-mozilla-program
++	       (append browse-url-mozilla-startup-arguments (list url))))))
++
+ ;; GNOME means of invoking either Mozilla or Netrape.
+ 
+ (defcustom browse-url-gnome-moz-arguments '()
+@@ -776,6 +880,48 @@
+   :group 'browse-url)
+ 
+ ;;;###autoload
++(defun browse-url-galeon (url &optional new-window)
++  "Ask the Galeon WWW browser to load URL.
++Default to the URL around or before point.  The strings in variable
++`browse-url-galeon-arguments' are also passed to Galeon.
++
++When called interactively, if variable `browse-url-new-window-flag' is
++non-nil, load the document in a new Galeon window, otherwise use a
++random existing one.  A non-nil interactive prefix argument reverses
++the effect of `browse-url-new-window-flag'.
++
++When called non-interactively, optional second argument NEW-WINDOW is
++used instead of `browse-url-new-window-flag'."
++  (interactive (browse-url-interactive-arg "URL: "))
++  ;; URL encode any `confusing' characters in the URL.  This needs to
++  ;; include at least commas; presumably also close parens.
++  (while (string-match "[,)]" url)
++    (setq url (replace-match
++	       (format "%%%x" (string-to-char (match-string 0 url))) t t url)))
++  (let* ((process-environment (browse-url-process-environment))
++         (process (apply 'start-process
++			 (concat "galeon " url) nil
++			 browse-url-galeon-program
++			 (append
++			  browse-url-galeon-arguments
++                          (if new-window '("-w" "--noraise")
++                           '("-x"))
++                          (list url)))))
++    (set-process-sentinel process
++			  `(lambda (process change)
++			     (browse-url-galeon-sentinel process ,url)))))
++
++(defun browse-url-galeon-sentinel (process url)
++  "Handle a change to the process communicating with Galeon."
++  (or (eq (process-exit-status process) 0)
++      (let* ((process-environment (browse-url-process-environment)))
++	;; Galeon is not running - start it
++	(message "Starting Galeon...")
++	(apply 'start-process (concat "galeon " url) nil
++	       browse-url-galeon-program
++	       (append browse-url-galeon-startup-arguments (list url))))))
++
++;;;###autoload
+ (defun browse-url-gnome-moz (url &optional new-window)
+   "Ask Mozilla/Netscape to load URL via the GNOME program `gnome-moz-remote'.
+ Default to the URL around or before point.  The strings in variable
--- emacs-21.3.orig/debian/patches/battery-acpi-support.dpatch
+++ emacs-21.3/debian/patches/battery-acpi-support.dpatch
@@ -0,0 +1,187 @@
+#!/bin/sh -e
+## battery-acpi-support.dpatch by Jerome Marant <jerome@debian.org>
+##
+## DP: ** Support for ACPI in battery.el has be added
+## DP: Status: appears to be incorporated upstream
+## DP: Provided by: Mario Lang <mlang@debian.org>
+## DP: Date: Fri, 26 Sep 2003 15:30:43 +0200
+
+if [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+       -patch) patch $patch_opts -p1 < $0;;
+       -unpatch) patch $patch_opts -p1 -R < $0;;
+        *)
+                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+                exit 1;;
+esac
+
+exit 0
+
+@DPATCH@
+diff -urNad /home/jerome/pkg/emacs21/svn/emacs/lisp/battery.el emacs/lisp/battery.el
+--- /home/jerome/pkg/emacs21/svn/emacs/lisp/battery.el	2003-09-26 19:57:43.000000000 +0200
++++ emacs/lisp/battery.el	2003-09-28 17:19:22.000000000 +0200
+@@ -42,7 +42,10 @@
+ (defcustom battery-status-function
+   (cond ((and (eq system-type 'gnu/linux)
+ 	      (file-readable-p "/proc/apm"))
+-	 'battery-linux-proc-apm))
++	 'battery-linux-proc-apm)
++	((and (eq system-type 'gnu/linux)
++	      (file-directory-p "/proc/acpi/battery"))
++	 'battery-linux-proc-acpi))
+   "*Function for getting battery status information.
+ The function has to return an alist of conversion definitions.
+ Its cons cells are of the form
+@@ -56,7 +59,9 @@
+ 
+ (defcustom battery-echo-area-format
+   (cond ((eq battery-status-function 'battery-linux-proc-apm)
+-	 "Power %L, battery %B (%p%% load, remaining time %t)"))
++	 "Power %L, battery %B (%p%% load, remaining time %t)")
++	((eq battery-status-function 'battery-linux-proc-acpi)
++	 "Power %L, battery %B at %r (%p%% load, remaining time %t)"))
+   "*Control string formatting the string to display in the echo area.
+ Ordinary characters in the control string are printed as-is, while
+ conversion specifications introduced by a `%' character in the control
+@@ -70,7 +75,9 @@
+ 
+ (defcustom battery-mode-line-format
+   (cond ((eq battery-status-function 'battery-linux-proc-apm)
+-	 " [%b%p%%]"))
++	 " [%b%p%%]")
++	((eq battery-status-function 'battery-linux-proc-acpi)