--- /dev/null
+# see git-dpm(1) from git-dpm package
+8900499027b692994a3b411954850c3672b9d2f6
+8900499027b692994a3b411954850c3672b9d2f6
+09a20fd582947ca08f0e80bc5353ae8abfe1e5ed
+09a20fd582947ca08f0e80bc5353ae8abfe1e5ed
+emacs25_25.2+1.orig.tar.xz
+655de53b3ee88f19a7c85005636fa8851a6f71b1
+23189972
--- /dev/null
+Please see /usr/share/doc/emacsen-common/debian-emacs-policy.gz for
+information on how to properly structure your emacs add-on packages.
--- /dev/null
+* The autoconf related files have been updated.
+ Patch: autofiles.dpatch
+ Author: N/A (automatically generated)
--- /dev/null
+emacs25 (25.2+1-5) unstable; urgency=medium
+
+ * Build with -O0 on arm64 to avoid FTBS. Without this the build
+ segfaults in marker.c when trying to construct c-by.el.
+ cf. https://lists.gnu.org/archive/html/emacs-devel/2017-03/msg00798.html
+ Thanks to Gianfranco Costamagna for reporting the bug and Barry
+ Warsaw for suggesting the workaround. (Closes: 868165)
+
+ -- Rob Browning <rlb@defaultvalue.org> Mon, 31 Jul 2017 23:34:05 -0500
+
+emacs25 (25.2+1-4) unstable; urgency=medium
+
+ * Disable eieio-test-method-order-list-6. Its behavior is
+ unpredictable, and it was causing the armhf build to fail:
+ https://debbugs.gnu.org/27878
+ https://debbugs.gnu.org/24503#21
+ Add 0011-Disable-eieio-test-method-order-list-6.patch to fix the
+ problem. Thanks to Glen Morris for pointing out the previous report.
+
+ -- Rob Browning <rlb@defaultvalue.org> Sun, 30 Jul 2017 22:31:30 -0500
+
+emacs25 (25.2+1-3) unstable; urgency=medium
+
+ * Actually run tests by default (fix DEB_BUILD_OPTIONS nocheck test)
+ Fix the inverted logic. Thanks to John Paul Adrian Glaubitz for
+ reporting the problem. (Closes: 869328)
+
+ * Completely remove gconf support. Build --without-gconf for the
+ emacs25 flavor (as we already do for lucid and nox), since GConf
+ has been deprecated for years. Thanks to intrigeri for reporting
+ the issue. (Closes: 869085)
+
+ * Fix README.Debian news entry for
+ 0008-Don-t-provide-openssl-s_client-as-an-option-for-ssl-.patch.
+
+ * Fix memory alignment problem causing FTBS on m68k. Thanks to John
+ Paul Adrian Glaubitz for reporting the problem and providing an
+ earlier fix. (Closes: 868868)
+
+ * Don't downcase lookup paths in elisp-mode-tests. This caused the
+ tests to fail under sbuild when the test path contained uppercase
+ characters. Add
+ 0010-Don-t-downcase-real-xref-in-elisp-mode-tests.patch to fix the
+ problem.
+
+ -- Rob Browning <rlb@defaultvalue.org> Sat, 29 Jul 2017 11:58:36 -0500
+
+emacs25 (25.2+1-2) unstable; urgency=medium
+
+ * emacsXY-common: directly depend on install-info. Since Emacs
+ qualifies as an info reader (Debian Policy 12.2). This should
+ make sure the info index is correctly created/updated at install
+ time. Thanks to Francesco Potortì and NIIBE Yutaka for reporting
+ the problem. (Closes: 850808, 863359)
+
+ * Build all flavors from common build-src via VPATH. Instead of
+ building each flavor from scratch in a completely independent
+ debian/build-FLAVOR directory, create debian/build-src and then
+ configure each build-FLAVOR via VPATH. Then the first flavor
+ built will handle all of the common bootstrapping, and subsequent
+ flavors will build much more quickly.
+
+ * Migrate to debhelper 10.
+
+ -- Rob Browning <rlb@defaultvalue.org> Tue, 11 Jul 2017 15:46:35 -0500
+
+emacs25 (25.2+1-1) unstable; urgency=medium
+
+ * Merge upstream version 25.2.
+
+ * Update debian/ for 25.2.
+
+ -- Rob Browning <rlb@defaultvalue.org> Sat, 01 Jul 2017 14:35:18 -0500
+
+emacs25 (25.1+1-4) unstable; urgency=medium
+
+ * Don't offer/use openssl s_client by default: "s_client is a debug
+ tool, it does not set up a secure connection, it ignores all
+ errors and just continues. It also doesn't do checks it should be
+ doing. This is all documented behaviour." -- Kurt Roeckx
+ Add 0009-openssl-s_client-is-no-longer-a-default-for-ssl-conn.patch to
+ fix the problem. Thanks to Kurt Roeckx for reporting the issue.
+ (Closes: 766397)
+
+ -- Rob Browning <rlb@defaultvalue.org> Sun, 23 Apr 2017 11:49:52 -0500
+
+emacs25 (25.1+1-3) unstable; urgency=medium
+
+ * Configure with REL_ALLOC=no to fix crashes. Thanks to Santiago
+ Vila for reporting the problem, and Sean Whitton for helping test
+ the fix. (Closes: 842728)
+
+ * Disable xwidget (webkit) support. Thanks to David Bremner for
+ reporting the issue. (Closes: 843462)
+
+ * Depend on liboss4-salsa-dev on hurd and kfreebsd. Thanks to Aaron
+ M. Ucko for reporting the problem and Svante Signell for providing
+ the fix. (Closes: 840702)
+
+ -- Rob Browning <rlb@defaultvalue.org> Wed, 30 Nov 2016 18:15:33 -0600
+
+emacs25 (25.1+1-2) unstable; urgency=medium
+
+ * Respect DEB_BUILD_OPTIONS=nocheck. Thanks to David Bremner for
+ reporting the issue.
+
+ * Don't dh_auto_clean, and run dh_clean first. Since we don't build
+ in the source tree, we shouldn't clean there either, and let
+ dh_clean take care of its bits before we stomp around.
+
+ * Install emacs.appdata.xml as emacs25.appdata.xml.
+
+ * Drop emacs23 icons to avoid future path conflicts. Thanks to
+ Tatsuya Kinoshita for reporting the problem. (Closes: 841687)
+
+ * Fix fix for package-test gpg-agent cleanup race. Specify
+ --no-autostart so that we don't start an agent if one wasn't
+ already running when we're requesting shutdown, and delete the
+ test dir with "rm -rf" to avoid being affected by vanishing
+ sockets (sockets that gpg-agent may be deleting in parallel).
+
+ * Add gnupg-agent build-dep for package-test.
+
+ * Don't segfault if gcc expects -nopie instead of -no-pie. Thanks
+ to Lucas Nussbaum and Aaron M. Ucko for reporting the problem, and
+ Sven Joachim for tracking down the upstream patch. (Closes:
+ 841551)
+
+ -- Rob Browning <rlb@defaultvalue.org> Mon, 24 Oct 2016 13:10:40 -0500
+
+emacs25 (25.1+1-1) unstable; urgency=medium
+
+ * Merge upstream version 25.1.
+ Remove patches that are no longer needed:
+ 0006-Look-for-NEWS-in-order-to-find-etc-rather-than-GNU.patch
+ 0008-Emacs-won-t-assume-grep-supports-GREP_OPTIONS.patch
+ 0009-Emacs-should-no-longer-hang-during-large-yanks.patch
+ 0010-ELF-unexec-Correct-section-header-index.patch
+ 0011-ELF-unexec-Tidy-code.patch
+ 0012-ELF-unexec-Merge-Alpha-and-MIPS-COFF-debug-handling.patch
+ 0013-ELF-unexec-Symbol-table-patching.patch
+ 0014-ELF-unexec-_OBJC_-symbols-in-bss-sections.patch
+ 0015-ELF-unexec-R_-_NONE-relocs.patch
+ 0016-ELF-unexec-Drive-from-PT_LOAD-header-rather-than-sec.patch
+ 0017-ELF-unexec-Don-t-insert-a-new-section.patch
+ 0018-src-unexelf.c-NEW_PROGRAM_H-Remove-unused-macro-Bug-.patch
+ 0019-ELF-unexec-align-section-header.patch
+ 0020-Emacs-should-show-GTK-icons-again.patch
+ 0021-Emacs-should-work-with-gcc-5.2-and-newer.patch
+ 0022-Emacs-should-work-with-glibc-2.24-on-ppc64.patch
+
+ * debian/upstream-version: update regex for 25.1.
+
+ * debian/.gitignore: update for 25.1.
+
+ * debian/changelog: change the package name to emacs25.
+
+ * debian/copyright.in: change source archive extension to xz.
+
+ * Update debian control and copyright for 25.1.
+
+ * Stop mangling info files.
+
+ * debian/rules: clean additional files for 25.1.
+
+ * Don't copy missing-file.dfsg to THE-GNU-PROJECT. THE-GNU-PROJECT
+ is now compatible with the DFSG. Remove missing-file.dfsg
+ entirely since it it no longer being used.
+
+ * Bump Debian alternatives priority to 28 for 25.1.
+
+ * Remove ia64 CFLAGS "-O1" workaround.
+
+ * Compute version in strip-nondeterminism fix. Use $(runtime_ver)
+ and $(flavor) instead of 24.5 and emacs24.
+
+ * Fix dh_listpackages in strip-nondeterminism target.
+
+ * Set libmagick build-dep to libmagick++-6.q16-dev.
+
+ * debian/setup-stamp: remove redundant mkdir.
+
+ * Don't default to ALSA support; explicitly request it.
+
+ * Run tests in all three debian/ build trees.
+
+ * Enable xwidget (webkit) support for emacs25.
+
+ * Convert debian/copyright to 1.0; update for 25.1. Explicitly
+ mention the unusual debian/rules copyright, which will be
+ addressed via #826347.
+
+ * Add dbus-x11 and procps build-deps for tests.
+
+ * Kill gpg agent in package-test.el to avoid a race. Add
+ 0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch to
+ incorporate the fix.
+
+ -- Rob Browning <rlb@defaultvalue.org> Mon, 10 Oct 2016 21:54:59 -0500
+
+emacs24 (24.5+1-7) unstable; urgency=medium
+
+ * debian/control: make Source-Version source:Version. Thanks to
+ Guillem Jover for reporting the problem. (Closes: 833215)
+
+ * Restore GTK+ toolbar icons.
+ Add 0020-Emacs-should-show-GTK-icons-again.patch to include the relevant
+ upstream code. Thanks to Juerg Haefliger for reporting the problem and
+ pointing out the relevant upstream commit. (Closes: 828000)
+
+ * Fix malloc handling with newer gcc (>= 5.2).
+ Add 0021-Emacs-should-work-with-gcc-5.2-and-newer.patch to incorporate
+ the relevant upstream code. Thanks to Aurelien Jarno for reporting the
+ problem and backporting the fix.
+
+ * Support glibc 2.24.
+ Add 0022-Emacs-should-work-with-glibc-2.24-on-ppc64.patch to incorporate
+ the relevant upstream code. Thanks to Aurelien Jarno for reporting the
+ problem and backporting the fix. (Closes: 833727)
+
+ -- Rob Browning <rlb@defaultvalue.org> Mon, 05 Sep 2016 15:05:00 -0500
+
+emacs24 (24.5+1-6) unstable; urgency=medium
+
+ * Fix a ppc64el, bss-related build problem.
+ Builds on ppc64el were failing like this:
+ emacs: Program segment above .bss in
+ /«BUILDDIR»/emacs24-24.5+1/debian/build-x/src/temacs
+ Add these upstream patches to fix the problem:
+ 0010-ELF-unexec-Correct-section-header-index.patch
+ 0011-ELF-unexec-Tidy-code.patch
+ 0012-ELF-unexec-Merge-Alpha-and-MIPS-COFF-debug-handling.patch
+ 0013-ELF-unexec-Symbol-table-patching.patch
+ 0014-ELF-unexec-_OBJC_-symbols-in-bss-sections.patch
+ 0015-ELF-unexec-R_-_NONE-relocs.patch
+ 0016-ELF-unexec-Drive-from-PT_LOAD-header-rather-than-sec.patch
+ 0017-ELF-unexec-Don-t-insert-a-new-section.patch
+ 0018-src-unexelf.c-NEW_PROGRAM_H-Remove-unused-macro-Bug-.patch
+ 0019-ELF-unexec-align-section-header.patch
+ Thanks to Paul Eggert <eggert@cs.ucla.edu> for help locating the set
+ of patches, and Esa Peuha <esa.peuha@gmail.com> for reporting the
+ problem. (Closes: 808347)
+
+ -- Rob Browning <rlb@defaultvalue.org> Mon, 18 Jan 2016 17:58:10 -0600
+
+emacs24 (24.5+1-5) unstable; urgency=medium
+
+ * Only test timestamp preservation for $(flavor)-el. Only check
+ el.gz timestamp preservation when $(flavor)-el is one of the
+ packages being built (so the canary file will actually be there),
+ but go ahead and fix up the timestamps across all packages.
+ Thanks to David Matthew Mattli <dmm@mattli.us> for reporting the
+ problem. (Closes: 805904)
+
+ -- Rob Browning <rlb@defaultvalue.org> Fri, 27 Nov 2015 14:28:00 -0600
+
+emacs24 (24.5+1-4) unstable; urgency=medium
+
+ * Ensure elc timestamps are newer than el files. Since
+ strip-nodeterminism changes the *.el.gz file timestamps, restore
+ the timestamps after it runs. Otherwise, Emacs will think that
+ corresponding .elc files are stale. Thanks to Yuri D'Elia
+ <wavexx@thregr.org> for reporting the problem. (Closes: 803060)
+
+ -- Rob Browning <rlb@defaultvalue.org> Sat, 07 Nov 2015 13:20:43 -0600
+
+emacs24 (24.5+1-3) unstable; urgency=medium
+
+ * Split desktop file into term and non-term versions. Thanks to
+ Norbert Preining <preining@logic.at> for reporting the
+ problem. (Closes: 799935)
+
+ * Add upstream StartupWMClass/Keywords to *.desktop. Copy them from
+ the upstream etc/emacs.desktop.
+
+ * Suggest ncurses-term, needed by term mode. Thanks to Jorge Morais
+ for reporting the problem and era+debian@iki.fi for forwarding it
+ to Debian. (Closes: 790402)
+
+ * Remove redundant libtiff-dev dependency.
+
+ * emacs-common: recommend emacs-el. Without it, important bits of
+ Emacs don't work (i.e. C-h f, etc.), and it's not likely to be a
+ significant burden these days.
+
+ -- Rob Browning <rlb@defaultvalue.org> Sat, 24 Oct 2015 14:38:04 -0500
+
+emacs24 (24.5+1-2) unstable; urgency=medium
+
+ [ Martin Račák ]
+ * emacsVER.desktop: don't use absolute path to icon. (Closes: 778884)
+
+ [ Rob Browning ]
+ * Remove .menu file as per TC resolution of #741573.
+ * Update .desktop file and add terminal flavor.
+
+ [ David Bremner ]
+ * Explicity specify QUILT_PATCHES_PREFIX in rules. The current use
+ relies on the names of patches being prefixed with debian/patches,
+ which doesn't seem to be completely reliable (e.g. it doesn't
+ happen in a wheezy build environment). The environment variable
+ QUILT_PATCHES_PREFIX is documented to do this. (Closes: 775068)
+
+ [ Rob Browning ]
+ * Don't assume grep supports GREP_OPTIONS.
+ Add 0008-Emacs-won-t-assume-grep-supports-GREP_OPTIONS.patch to
+ incorporate the relevant upstream patch. Thanks to Bob Proulx
+ <bob@proulx.com> for reporting the problem, and Ben Finney
+ <ben+debian@benfinney.id.au> for tracking down the fix. (Closes: 793741)
+ * Don't hang during large yanks.
+ Add 0009-Emacs-should-no-longer-hang-during-large-yanks.patch to
+ incorporate the relevant upstream patch. Thanks to Mike Crowe
+ <mac@mcrowe.com> for reporting the problem and tracking down the
+ fix. (Closes: 795909)
+
+ -- Rob Browning <rlb@defaultvalue.org> Sat, 19 Sep 2015 14:49:07 -0500
+
+emacs24 (24.5+1-1) unstable; urgency=medium
+
+ * Merge upstream version 24.5 (shift from the bzr->git mirror to the
+ new official upstream git repository for the source).
+ Remove redundant patches:
+ 0008-A-race-to-create-info-has-been-eliminated.patch
+ 0009-Nil-load-path-elements-shouldn-t-crash-Emacs.patch
+
+ * Update debian/copyright* for 24.5.
+
+ -- Rob Browning <rlb@defaultvalue.org> Wed, 17 Jun 2015 00:06:26 -0500
+
+emacs24 (24.4+1-5) unstable; urgency=medium
+
+ * emacs24-common: conflict with obsolete gnus-bonus-el package.
+ Thanks to Hilko Bengen for reporting the problem. (Closes: 767949)
+
+ * Add "Breaks: apel (<< 10.8+0.20120427-4)" to emacs24-common to fix
+ a byte-compilation problem with older versions of the package.
+ Thanks to Łukasz Stelmach for the report and Sébastien Villemot
+ for tracking down the correct version. (Closes: 775564)
+
+ -- Rob Browning <rlb@defaultvalue.org> Sat, 07 Mar 2015 13:25:57 -0600
+
+emacs24 (24.4+1-4.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Cherry-pick 0009-lisp-startup.el-command-line.patch to fix handling
+ nil elements in load-path (Closes: #768751)
+
+ -- Balint Reczey <balint@balintreczey.hu> Tue, 09 Dec 2014 16:24:27 +0100
+
+emacs24 (24.4+1-4) unstable; urgency=medium
+
+ * Update emacsen-common dependency as per policy.
+
+ -- Rob Browning <rlb@defaultvalue.org> Sat, 25 Oct 2014 14:37:43 -0500
+
+emacs24 (24.4+1-3) experimental; urgency=medium
+
+ * Eliminate a race to create info/ during the build. Add
+ 0008-A-race-to-create-info-has-been-eliminated.patch with the
+ relevant changes. Thanks to Paul Eggert <eggert@cs.ucla.edu> for
+ tracking down the problem and providing the fix.
+
+ -- Rob Browning <rlb@defaultvalue.org> Thu, 23 Oct 2014 11:13:21 -0500
+
+emacs24 (24.4+1-2) experimental; urgency=medium
+
+ * Adjust update_autogen and make-info-dir for DFSG removals.
+ Change 0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
+ accordingly.
+
+ -- Rob Browning <rlb@defaultvalue.org> Wed, 22 Oct 2014 19:38:20 -0500
+
+emacs24 (24.4+1-1) experimental; urgency=medium
+
+ * Merge upstream version 24.4.
+ Remove (unneeded) src/macuvs.h and admin/unidata/IVD_Sequences.txt
+ until we're sure about the license:
+ https://lists.gnu.org/archive/html/emacs-devel/2014-10/msg00742.html
+ Remove new GFDL files (moved to emacs24-common-non-dfsg):
+ doc/misc/eww.texi
+ doc/misc/ido.texi
+ doc/misc/octave-mode.texi
+ doc/misc/todo-mode.texi
+ Remove redundant patches:
+ 0007-Invoke-the-correct-xmlstarlet-executable-on-Debian-s.patch
+ 0008-Emacs-should-no-longer-hang-at-startup-on-kFreeBSD.patch
+ 0009-Emacs-should-no-longer-hang-at-startup-on-kFreeBSD.patch
+ 0010-Emacs-should-now-build-correctly-on-GNU-Hurd.patch
+ 0011-Gnus-should-no-longer-use-a-predictable-temp-file-na.patch
+ 0012-Security-issues-in-find-gc.el-have-been-fixed-CVE-20.patch
+ 0013-Security-issues-in-tramp-have-been-fixed-CVE-2014-34.patch
+ 0014-Insecure-file-handling-in-browse-url-mosaic-has-been.patch
+ 0015-The-compose-key-should-now-work-better-with-UIM-1-4.patch
+ 0016-The-compose-key-should-now-work-better-with-UIM-2-4.patch
+ 0017-The-compose-key-should-now-work-better-with-UIM-3-4.patch
+ 0018-The-compose-key-should-now-work-better-with-UIM-4-4.patch
+ 0019-fill-region-as-paragraph-should-better-respect-the-f.patch
+ 0020-Emacs-should-now-follow-Make-4.0-directory-changes.patch
+
+ * Update debian/copyright* for 24.4. Update entry for man/faq.texi
+ (now doc/mis/efaq.texi); add entries for doc/misc/efaq-w32.texi,
+ lisp/obsolete/meese.el, msdos/sedadmin.inp, nt/inc/dirent.h, and
+ all of the files in m4/ except gnulib-comp.m4.
+
+ * Ignore src/macuvs.h and IVD_Sequences.txt for now. Add
+ 0007-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch to
+ avoid trying to build src/macuvs.h (via IVD_Sequences.txt) since
+ we removed it for the time being, due to uncertainty over the
+ licensing.
+
+ * Build depend on libacl1-dev for new ACL support
+
+ * Build depend on zlib1g-dev for new zlib support
+
+ * Remove obsolete configure argument --with-crt-dir
+
+ * Look for DOC, not DOC-$(runtime_ver) in debian/rules. The DOC
+ file is now just DOC.
+
+ * Don't try to remove /usr/local in debian/rules. It's not created
+ during the build anymore.
+
+ -- Rob Browning <rlb@defaultvalue.org> Tue, 21 Oct 2014 21:27:56 -0500
+
+emacs24 (24.3+1-5) unstable; urgency=medium
+
+ * Fix patch-to-news: notice error; correct path
+
+ * Fix a problem with UIM and the compose key.
+ Incorporate the relevant upstream patches:
+ 0015-The-compose-key-should-now-work-better-with-UIM-1-4.patch
+ 0016-The-compose-key-should-now-work-better-with-UIM-2-4.patch
+ 0017-The-compose-key-should-now-work-better-with-UIM-3-4.patch
+ 0018-The-compose-key-should-now-work-better-with-UIM-4-4.patch
+ Thanks to Anders Kaseorg <andersk@MIT.EDU> for the report, and for
+ tracking down the relevant patches. (Closes: 753534)
+
+ * Make fill-region-as-paragraph respect the fill-column.
+ Add 0019-fill-region-as-paragraph-should-better-respect-the-f.patch.
+ Thanks to Nobuhiro IMAI <nov@yo.rim.or.jp> for reporting the problem
+ and tracking down the relevant patch. (Closes: 539634)
+
+ * Follow Make 4.0 directory changes in compile mode.
+ Add 0020-Emacs-should-now-follow-Make-4.0-directory-changes.patch
+ to incorporate the relevant upstream patch.
+ Thanks to Christophe Troestler <Christophe.Troestler@umons.ac.be> for
+ reporting the problem. (Closes: 747624)
+
+ -- Rob Browning <rlb@defaultvalue.org> Sat, 06 Sep 2014 11:38:08 -0500
+
+emacs24 (24.3+1-4) unstable; urgency=medium
+
+ [ Rob Browning ]
+ * Fix insecure temp file in gnus-fun.el (CVE-2014-3421)
+ Add 0011-Gnus-should-no-longer-use-a-predictable-temp-file-na.patch to
+ incorporate the relevant upstream patch.
+ Partially-fixes: 748140
+
+ * Fix insecure temp file in gnus-fun.el (CVE-2014-3421)
+ Add 0012-Security-issues-in-find-gc.el-have-been-fixed-CVE-20.patch to
+ incorporate the relevant upstream patch.
+ Partially-fixes: 748140
+
+ * Fix tramp security issues (CVE-2014-3424)
+ Add 0013-Security-issues-in-tramp-have-been-fixed-CVE-2014-34.patch to
+ incorporate the relevant upstream patch.
+ Partially-fixes: 748140
+
+ * Fix browse-url-mosaic security issues (CVE-2014-3423)
+ Add 0014-Insecure-file-handling-in-browse-url-mosaic-has-been.patch to
+ incorporate the relevant upstream patch.
+ Partially-fixes: 748140
+
+ * Given the four fixes above: (Closes: 748140)
+
+ [ Dimitri John Ledkov ]
+ * Build using gnutls28. (Closes: 747448)
+
+ -- Rob Browning <rlb@defaultvalue.org> Wed, 14 May 2014 19:21:11 -0500
+
+emacs24 (24.3+1-3) unstable; urgency=low
+
+ * Describe emacs24/emacs24-lucid/emacs24-nox more clearly in
+ debian/control. Explain the differences more clearly, and mention
+ the emacsclient related crash that emacs24-lucid may help avoid.
+ Thanks to Jonathan Nieder <jrnieder@gmail.com> for the report, and
+ to him and Justin B Rye <jbr@edlug.org.uk> for suggesting
+ improvements. (Closes: 682288)
+
+ * Fix build on GNU/Hurd.
+ Add 0010-Emacs-should-now-build-correctly-on-GNU-Hurd.patch to
+ incorporate the relevant upstream patch. Thanks to Pino Toscano
+ <pino@debian.org> for the report. (Closes: 725099)
+
+ * Change the build dependency from libtiff4-dev to libtiff-dev.
+ Thanks to Jay Berkenbilt <qjb@debian.org> for the report.
+ (Closes: 735999)
+
+ -- Rob Browning <rlb@defaultvalue.org> Mon, 05 May 2014 19:36:05 -0500
+
+emacs24 (24.3+1-2) unstable; urgency=low
+
+ * Set CFLAGS, CPPFLAGS, and LDFLAGS solely via configure in debian/rules.
+ Don't override the CFLAGS, CPPFLAGS, and LDFLAGS values chosen by the
+ upstream configure script; instead, make any adjustments at configure
+ time. Our quashing of "-Wl,-znocombreloc" during the make invocation
+ was causing i386 builds of emacs24-lucid to fail under X.
+ Thanks to Łukasz Pankowski <lukpank@o2.pl> for the report, and Samuel
+ Bronson <naesten@gmail.com> for the patch. (Closes: 684788)
+
+ * debian/rules: clean src/stamp-h.in.
+ Thanks to Samuel Bronson <naesten@gmail.com> for the patch.
+
+ * Explicitly create $(pkgdir_el) in debian/rules (fix FTBS).
+ Thanks to Lucas Nussbaum <lucas@lucas-nussbaum.net> for the report,
+ Matt Kraai <kraai@ftbfs.org> for the patch, and Dmitrijs Ledkovs
+ <xnox@debian.org> for the 24.3+1-1.1 NMU. (Closes: 707488)
+
+ * Specify --without-gsettings for emacsFLAVOR-nox and emacsFLAVOR-lucid.
+ Thanks to Yuri D'Elia <wavexx@thregr.org> for the report.
+ (Closes: 687299, 687303)
+
+ * Fix hang at startup on kFreeBSD.
+ Add debian/patches/0008-Emacs-should-no-longer-hang-at-startup-on-kFreeBSD.patch
+ and debian/patches/0009-Emacs-should-no-longer-hang-at-startup-on-kFreeBSD.patch
+ to incorporate the two relevant upstream patches.
+ Thanks to Christoph Egger <christoph@debian.org> for the report.
+ (Closes: 712974)
+
+ -- Rob Browning <rlb@defaultvalue.org> Thu, 26 Sep 2013 17:42:00 -0500
+
+emacs24 (24.3+1-1) unstable; urgency=low
+
+ * Upgrade to upstream version 24.3 and update debian/copyright,
+ debian/patches, debian/rules, etc.
+
+ * Remove patches that appear to have been incorporated upstream:
+ 0008-Fix-startup-hang-on-Debian-GNU-kFreeBSD.patch
+ 0009-Restore-doc-emacs-emacsver.texi.patch
+ 0010-Don-t-use-IN_FLOAT-when-calling-fabs-since-it-may-cl.patch
+
+ * 0001-Prefer-usr-share-info-emacs-24-over-usr-share-info.patch:
+ remove lisp/site-init.el in favor of a modification to
+ lisp/info.el to directly prepend /usr/share/info/emacs-%d to
+ Info-default-directory-list (setting it directly in site-lisp.el
+ no longer worked, and was more complicated).
+
+ * Automatically compute upstream version in debian/rules.
+
+ * Mention the etc/publicsuffix.txt license in debian/copyright.
+
+ -- Rob Browning <rlb@defaultvalue.org> Sat, 13 Apr 2013 11:11:16 -0500
+
+emacs24 (24.2+1-2) unstable; urgency=low
+
+ * Switch emacs24 from GTK+ 2 to GTK+ 3. (Closes: #679931)
+
+ * Migrate to debhelper 9.
+
+ * Add emacsVER-dbg, emacsVER-lucid-dbg, and emacsVER-nox-dbg packages.
+
+ -- Rob Browning <rlb@defaultvalue.org> Sun, 20 Jan 2013 16:18:00 -0600
+
+emacs24 (24.2+1-1) unstable; urgency=high
+
+ * Upgrade to upstream version 24.2 and update debian/patches.
+
+ * Remove patches that have been incorporated upstream:
+ 0010-Rename-infodir-to-buildinfodir-in-doc-Makefile.in-GN.patch
+
+ * Stop producing the emacs binary metapackage.
+ Move the emacs binary metapackage to its own source package
+ (emacs-defaults, cf. gcc-defaults). This will prevent emacs23 and
+ emacs24 from producing the same binary package.
+
+ * Don't eval code when enable-local-variables is :safe. Previously,
+ Emacs might eval forms in file-local variable sections even when
+ the Emacs user option `enable-local-variables' was set to :safe
+ (CVE-2012-3479). Emacs 24.2 fixes the problem. Thanks to Henri
+ Salo <henri@nerv.fi> for the report. (Closes: #684695)
+
+ * Have debian/% depend on debian/rules since it now sets the
+ upstream_ver.
+
+ * Update debian/rules upstream_ver to 24.2 and run "debian/rules
+ debian-sync".
+
+ -- Rob Browning <rlb@defaultvalue.org> Sun, 09 Sep 2012 12:03:31 -0500
+
+emacs24 (24.1+1-4) unstable; urgency=low
+
+ * Fix FTBS on ia64 with -O1. Remove redundant LDFLAGS+=-g and
+ CFLAGS+=-O2. See also: #582439. (Closes: #679986)
+
+ -- Rob Browning <rlb@defaultvalue.org> Fri, 20 Jul 2012 12:51:32 -0500
+
+emacs24 (24.1+1-3) unstable; urgency=low
+
+ * Add 0011-Don-t-use-IN_FLOAT-when-calling-fabs-since-it-may-cl.patch.
+ Fix FTBS on i386 by adding an upstream patch to skip fabs() errno
+ checking. Since fabs() has no error conditions, it doesn't guarantee
+ that it won't clobber errno.
+
+ -- Rob Browning <rlb@defaultvalue.org> Tue, 17 Jul 2012 19:25:59 -0500
+
+emacs24 (24.1+1-2) unstable; urgency=low
+
+ * Restrict libselinux1-dev build dependency to [linux-any].
+ Thanks to James McCoy <jamessan@debian.org> for the report.
+ (Closes: #679679)
+
+ -- Rob Browning <rlb@defaultvalue.org> Wed, 04 Jul 2012 19:16:00 -0500
+
+emacs24 (24.1+1-1) unstable; urgency=low
+
+ * Upgrade to upstream version 24.1.
+
+ * Fix Prefer-usr-share-info-emacs-23-over-usr-share-info.patch for emacs24.
+
+ * Update Debian-specific documentation in patches/ for emacs24.
+ Adjust 0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
+ header to refer to 'emacs24. Refer to emacs24-common in /etc/NEWS
+ in 0004-Adjust-documentation-references-for-Debian.patch.
+
+ * Update debian/control* and debian/copyright for emacs24.
+
+ * Update debian/.gitignore for emacs24.
+
+ * Add 0009-Restore-doc-emacs-emacsver.texi.patch.
+
+ * Add 0010-Rename-infodir-to-buildinfodir-in-doc-Makefile.in-GN.patch.
+
+ * Add build-deps: libgnutls-dev libxml2-dev libselinux1-dev libmagick++-dev.
+
+ * Clean up debian/rules, and update it for emacs24.
+
+ * Allow DEB_BUILD_OPTIONS parallel builds again.
+
+ * Change emacs package to stick with emacs23 for now.
+
+ * Fix emacsVER.lintian-overrides to refer to the correct icon paths.
+
+ * Fix package descriptions to satisfy lintian.
+
+ * Don't compile with -DDEBIAN anymore (no longer needed).
+
+ * Don't switch to -O1 for m68k and ia64; hopefully unnecessary now.
+
+ * Verify that movemail was compiled against liblockfile.
+
+ * Don't copy .git to build trees.
+
+ * Uncompress manpages before trying to give them versioned names.
+
+ -- Rob Browning <rlb@defaultvalue.org> Fri, 29 Jun 2012 16:16:28 -0500
+
+emacs23 (23.4+1-3) unstable; urgency=low
+
+ * Add 0017-Initialize-xgselect-in-function-xg_select-when-gfds_.patch.
+ Patch xgselect.c to prevent hang when using newer versions of
+ GLib. Thanks to Vincent Lefevre <vincent@vinc17.net> and Sven
+ Arvidsson <sa@whiz.se> for the initial reports, and Karel Klíč
+ <kklic@redhat.com> for the patch. (Closes: #666691)
+
+ -- Rob Browning <rlb@defaultvalue.org> Sat, 07 Apr 2012 14:35:51 -0500
+
+emacs23 (23.4+1-2) unstable; urgency=low
+
+ * Add 0015-coding.c-produce_chars-Fix-updating-of-src_end-Bug-1.patch.
+ Incorporate upstream fix to prevent Emacs from crashing while
+ decoding input with DOS EOLs.
+
+ * Add 0016-quail-indian.el-indian-tlg-base-table-Fix-typo-dev-t.patch.
+ Rename indian-dev-base-table to indian-tlg-base-table to correct a
+ typo in quail/indian.el.
+
+ -- Rob Browning <rlb@defaultvalue.org> Wed, 21 Mar 2012 01:19:53 -0500
+
+emacs23 (23.4+1-1) unstable; urgency=low
+
+ * Upgrade to upstream version 23.4. Emacs 23.4 includes grammars
+ that were missing for some of its bison parsers. Thanks to Julian
+ Andres Klode <jak@debian.org> for the report. (Closes: #635938)
+
+ * Update debian/* for Emacs 23.4.
+
+ * Depend on libpng-dev rather than libpng12-dev. Thanks to Nobuhiro
+ Iwamatsu <iwamatsu@nigauri.org> for the report. (Closes: #662312)
+
+ * Add 0014-Fix-hang-after-C-z-in-gnome-shell.patch. Emacs should no
+ longer hang when C-z is pressed within the Gnome shell. Thanks to
+ Nikolay Pelov <npelov@gmail.com> for the report.
+ (Closes: #655592)
+
+ -- Rob Browning <rlb@defaultvalue.org> Tue, 20 Mar 2012 23:39:44 -0500
+
+emacs23 (23.3+1-5) unstable; urgency=high
+
+ * Add 0017-Define-POSIX_SIGNALS-for-GNU-Hurd.patch. Thanks to
+ Samuel Thibault <sthibault@debian.org> for the report and the
+ patch. (Closes: #650976)
+
+ * Add 0018-Don-t-let-CEDET-execute-code-from-an-arbitrary-Proje.patch.
+ Don't execute arbitrary elisp code from any file named Project.ede
+ in or above a CEDET-related directory (CVE-2012-0035). Thanks to
+ Florian Weimer <fw@deneb.enyo.de> for the report.
+ (Closes: #655299)
+
+ * Add 0019-Add-a-printf-attribute-to-movemail.c-to-allow-harden.patch.
+ Use varargs in movemail.c error() and add a printf attribute to
+ support hardened build flags.
+
+ * Add debian/rules support for hardened build flags. Thanks to
+ Moritz Muehlenhoff <jmm@debian.org> for the report and the
+ patch. (Closes: #655118)
+
+ * Add conflict with cedet, eieio, and speedbar. Don't allow the
+ older standalone packages to remain installed since they break
+ emacs23, emacs23 includes them, and they're no longer in
+ unstable/testing. Thanks to Ivan Vilata i Balaguer
+ <ivan@selidor.net> for the report. (Closes: #632142)
+
+ * Change negated build-dep [!hurd-i386...] to [linux-any]. Thanks
+ to Robert Millan <rmh@debian.org> for the report.
+ (Closes: #634336)
+
+ -- Rob Browning <rlb@defaultvalue.org> Sun, 29 Jan 2012 14:06:03 -0600
+
+emacs23 (23.3+1-4) unstable; urgency=low
+
+ * Add 0016-Use-CRT_DIR-to-find-crt-.o-on-ppc64.patch.
+ Thanks to Hiroyuki Yamamoto <yama1066@gmail.com> for the report
+ and the patch. (Closes: #646609)
+
+ -- Rob Browning <rlb@defaultvalue.org> Tue, 25 Oct 2011 19:58:32 -0500
+
+emacs23 (23.3+1-3) unstable; urgency=low
+
+ * Add 0015-Look-for-crt1.o-in-the-correct-multiarch-location.patch.
+ Thanks to Sven Joachim <svenjoac@gmx.de> for the report and the patch,
+ and and Philipp Kern <pkern@debian.org> for the 23.3+1-1.1 NMU, which
+ included it. (Closes: #629567)
+
+ -- Rob Browning <rlb@defaultvalue.org> Mon, 24 Oct 2011 22:45:37 -0500
+
+emacs23 (23.3+1-2) unstable; urgency=low
+
+ * Add 0014-Add-i386-to-cpp_undefs-in-configure.in-to-fix-i386-m.patch.
+ Thanks to Steve Langasek <steve.langasek@canonical.com> for the
+ report, Sven Joachim <svenjoac@gmx.de> for the patch, and Philipp
+ Kern <pkern@debian.org> for the 23.3+1-1.1 NMU, which included it.
+ (Closes: #620795)
+
+ * Don't explicitly add leim to locallispath since it's no longer
+ necessary. (Closes: #476660)
+
+ * Don't test for src/emacs.c in rules since the whole tree is in git
+ now.
+
+ * Drop dh --with autotools_dev; it doesn't work if config.* files
+ are missing.
+
+ * Build-depend on libjpeg-dev rather than libjpeg62-dev. Thanks to
+ Bill Allombert <ballombe@debian.org> for the report and Philipp
+ Kern <pkern@debian.org> for the 23.3+1-1.1 NMU which included a
+ patch. (Closes: #633744)
+
+ * Pass the correct crt-dir to ./configure for multiarch. Thanks to
+ Sven Joachim <svenjoac@gmx.de> for the report and the patch, and
+ thanks to Philipp Kern <pkern@debian.org> for the 23.3+1-1.1 NMU
+ which included the patch. (Closes: #629567)
+
+ -- Rob Browning <rlb@defaultvalue.org> Sun, 23 Oct 2011 01:22:00 -0500
+
+emacs23 (23.3+1-1) unstable; urgency=low
+
+ * Incorporate new upstream version 23.3.
+
+ * Don't clear FONTCONFIG_LIBS and FONTCONFIG_CFLAGS in configure.
+ Thanks to Peter Fritzsche <peter.fritzsche@gmx.de> for the report
+ and Matthias Klose <doko@ubuntu.com> for the patch.
+ (closes: #554324)
+
+ * Adjust emacsVER-common.README to accommodate new patch headers.
+ Add debian/patch-to-news to handle converting new git-dpm style
+ patch headers to emacsVER-common.README.
+
+ * Rely on autotools-dev for config.guess and config.sub.
+
+ * Fix a tty-related preprocessor inclusion error affecting GNU/Hurd
+ systems. Thanks to Samuel Thibault <sthibault@debian.org> for the
+ report and the patch. (closes: #610576)
+
+ * Expect 0 from kill() for zombies on GNU/Hurd. This should prevent
+ Emacs from hanging on affected systems. Thanks to Samuel Thibault
+ <sthibault@debian.org> for the report and the patch.
+ (closes: #611591)
+
+ * Remove debian/dfsg-splitter since the split is now being handled
+ directly in git.
+
+ -- Rob Browning <rlb@defaultvalue.org> Sun, 10 Apr 2011 10:33:31 -0500
+
+emacs23 (23.2+1-7) unstable; urgency=low
+
+ * Don't initialize the terminal twice. Previously a console-mode
+ Emacs would send the escape sequence to switch to the alternate
+ screen twice. At a minimum, this caused problems with screen.
+ Thanks to Courtney Bane <debian-bugs-5265@cbane.org> for the
+ report and the patch. (closes: #599463)
+
+ * Fix the value for RIPEMD-160 in epg-digest-algorithm-alist
+ according to RFC 4880. Thanks to Daniel Kahn Gillmor
+ <dkg@fifthhorseman.net> for the report and the fix.
+ (closes: #594510)
+
+ -- Rob Browning <rlb@defaultvalue.org> Sat, 11 Dec 2010 11:00:07 -0600
+
+emacs23 (23.2+1-6) unstable; urgency=low
+
+ * Build-depend on "bsd-mailx | mailx" rather than just "mailx" since
+ the latter is a virtual package. Thanks to Cyril Brulebois
+ <kibi@debian.org> for the report, and thanks to Mehdi Dogguy
+ <mehdi@debian.org> for the 23.2+1-5.1 NMU. (closes: #600826)
+
+ -- Rob Browning <rlb@defaultvalue.org> Fri, 26 Nov 2010 11:34:32 -0600
+
+emacs23 (23.2+1-5) unstable; urgency=low
+
+ * Apply upstream patches to prevent the string and unibyte-string
+ functions from overflowing the stack
+ (prevent-string-stack-overflow.diff,
+ prevent-let-eval-apply-stack-overflow.diff, and
+ use-safe-alloca-lisp-in-let-eval-apply-apply_lambda.diff). Thanks
+ to Carl Worth <cworth@debian.org> and Sven Joachim
+ <svenjoac@gmx.de> for finding the patches (closes: #586459).
+
+ * Apply upstream patch to prevent mail destined for
+ mail-archive-file-name from being lost
+ (fix-gnus-output-to-mail-with-live-rmail-buffers.diff). Thanks to
+ Jeroen Nijhof <jeroen@nijhof.uklinux.net> for the report and Sven
+ Joachim <svenjoac@gmx.de> for tracking down the patch.
+ (closes: #597255)
+
+ * Remove debian-adjust-mail-from-addresses-patch.diff to stop
+ adjusting the message-sendmail-f-is-evil default. Match the
+ behavior of the Debian gnus package, Emacs upstream, and
+ emacs-snapshot. Thanks to Artem Chuprina <ran@wizzle.ran.pp.ru>
+ for the report. (closes: #397757)
+
+ * Apply upstream patch to fix the computation of the width of
+ dual-width fonts (fix-fc-dual-font-width-calculation.diff).
+ Thanks to mizuno hajime <hajime.mizuno@gmail.com> for the report
+ and Sven Joachim <svenjoac@gmx.de> for tracking down the
+ patch. (closes: #588808)
+
+ -- Rob Browning <rlb@defaultvalue.org> Mon, 18 Oct 2010 00:17:56 -0500
+
+emacs23 (23.2+1-4) unstable; urgency=low
+
+ * Disable parallel builds (via DEB_BUILD_OPTIONS=parallel) until an
+ upstream race condition is fixed. Thanks to Sven Joachim
+ <svenjoac@gmx.de> for the report. (closes: #592992)
+
+ -- Rob Browning <rlb@defaultvalue.org> Sat, 14 Aug 2010 16:34:11 -0500
+
+emacs23 (23.2+1-3) unstable; urgency=low
+
+ * Don't try to "mkdir $(infodir)" in doc/*/Makefile.in. Thanks to
+ Stéphane Glondu <glondu@debian.org> for the 23.2+1-2.1 NMU.
+
+ * Use -O1 rather than -O2 on ia64. Fixes a build failure (looks
+ like a broken byte compiler) with newer versions of gcc
+ (c.f. #207580). Thanks to Sven Joachim <svenjoac@gmx.de> for the
+ report and thanks to Stéphane Glondu <glondu@debian.org> for the
+ 23.2+1-2.1 NMU. (closes: #582439)
+
+ * Remove deprecated Encoding field from emacsVER.desktop. Thanks to
+ Stéphane Glondu <glondu@debian.org> for the 23.2+1-2.1
+ NMU.
+
+ * Use "set -e" rather than "/bin/sh -e" in emacsVER-common.postinst
+ and emacsVER-bin-common.postinst. Thanks to Stéphane Glondu
+ <glondu@debian.org> for the 23.2+1-2.1 NMU.
+
+ * Add a Homepage field to debian/control.in. Thanks to Stéphane
+ Glondu <glondu@debian.org> for the 23.2+1-2.1 NMU.
+
+ * Remove redundant Section and Priority fields from binary packages
+ in debian/control.in. Thanks to Stéphane Glondu
+ <glondu@debian.org> for the 23.2+1-2.1 NMU.
+
+ * Change quilt Build-Depends from (>= 0.42-1) to (>= 0.42). Thanks
+ to Stéphane Glondu <glondu@debian.org> for the 23.2+1-2.1 NMU.
+
+ * Change debhelper Build-Depends from (>=4) to (>= 7.0.50~) to
+ support rules overrides. Thanks to Sven Joachim
+ <svenjoac@gmx.de>, and thanks to Stéphane Glondu
+ <glondu@debian.org> for the 23.2+1-2.1 NMU.
+
+ * Add ${misc:Depends} to debian/control for debhelper. Thanks to
+ Stéphane Glondu <glondu@debian.org> for the 23.2+1-2.1 NMU.
+
+ * Fix startup hang on GNU/kFreeBSD (fix-kfreebsd-startup.diff).
+ Thanks to antoine beaupre <anarcat@anarcat.ath.cx> for the report
+ and Petr Salinger <Petr.Salinger@seznam.cz> for the patch.
+ (closes: #559392)
+
+ -- Rob Browning <rlb@defaultvalue.org> Sat, 14 Aug 2010 11:57:17 -0500
+
+emacs23 (23.2+1-2) unstable; urgency=low
+
+ * Respect DESTDIR in doc/misc/Makefile.in. (closes: #581642)
+
+ -- Rob Browning <rlb@defaultvalue.org> Fri, 14 May 2010 21:56:27 -0700
+
+emacs23 (23.2+1-1) unstable; urgency=low
+
+ * New emacs23 packages.
+
+ * Update debian/dfsg-splitter.
+
+ * Add dependency on libgconf2-dev and use --without-gconf for
+ emacsFLAVOR-nox and emacsFLAVOR-lucid builds.
+
+ * Remove patches:
+ patches/fix-dynamic-menus.diff
+ patches/fix-gtk-scroll-bar-events.diff
+ patches/fix-rmail-capitalized-month-names.diff
+ patches/use-zwj-and-zwnj-for-indic-scripts.diff
+
+ * Refresh remaining patches.
+
+ -- Rob Browning <rlb@defaultvalue.org> Thu, 13 May 2010 19:21:32 -0700
+
+emacs23 (23.1+1-9) unstable; urgency=low
+
+ * Fix binary-only builds (dpkg-buildpackage -B) and conditionalize
+ all packages in dh_auto_install. (closes: #580067)
+
+ -- Rob Browning <rlb@defaultvalue.org> Thu, 06 May 2010 22:59:26 -0700
+
+emacs23 (23.1+1-8) unstable; urgency=low
+
+ * Add automake to Build-Depends. (closes: #580006)
+
+ -- Rob Browning <rlb@defaultvalue.org> Sun, 02 May 2010 19:53:36 -0700
+
+emacs23 (23.1+1-7) unstable; urgency=low
+
+ * Remove Jerome from debian/control Uploaders since he has
+ retired. (closes: #573442)
+
+ * Support DEB_BUILD_OPTIONS parallel=N.
+
+ * Follow current autotools-dev recommendations - build-depend on
+ autoconf, remove the automatically generated files in clean, and
+ regenerate them before building.
+
+ * Update debian/compat from 4 to 7.
+
+ * Switch to Debian 3.0 (quilt) source format and drop debian/rules
+ "protected_files" handling since we don't build in $(CURDIR) and
+ haven't for a while.
+
+ * Fix ctags manpage rewriting so that ctags.FLAVOR.1 actually refers
+ to man1/etags.FLAVOR.1 as intended.
+
+ * Change debian/rules to use "dh $@" approach.
+
+ * Update emacsFLAVOR-common dpkg dependency to require "dpkg (>=
+ 1.15.4) | install-info" for proper info page handling (Debian
+ Policy 12.2), and remove install-info dependency from packages
+ without info files.
+
+ * Don't define unix when building emacs
+ (add-unix-to-cpp-undefs.diff).
+
+ -- Rob Browning <rlb@defaultvalue.org> Sun, 02 May 2010 10:56:09 -0700
+
+emacs23 (23.1+1-6) unstable; urgency=low
+
+ * Apply an upstream patch to fix a problem with GTK+ scroll
+ bars. Thanks to Eugen Dedu <Eugen.Dedu@pu-pm.univ-fcomte.fr> for
+ the report and Sven Joachim <svenjoac@gmx.de> for tracking down
+ the patch. (closes: #560573)
+
+ * Apply an upstream patch to include ZWJs and ZWNJs for all Indic
+ scripts. Thanks to Praveen A <pravi.a@gmail.com> for the
+ report. (closes: #559292)
+
+ * Fix update-alternatives call for emacs manpage. Thanks to
+ Jörg-Volker Peetz <peetz@dynato-kyma.net> and Sven Joachim
+ <svenjoac@gmx.de> for the report. (closes: #552565)
+
+ -- Rob Browning <rlb@defaultvalue.org> Tue, 26 Jan 2010 22:51:54 -0800
+
+emacs23 (23.1+1-5) unstable; urgency=low
+
+ * Apply upstream patch to fix problem with GTK and dynamically
+ generated menus (which could be unexpectedly empty). Thanks to
+ Baylis Shanks <bshanks3@hotmail.com> for the report.
+ (closes: 550541)
+
+ -- Rob Browning <rlb@defaultvalue.org> Sun, 01 Nov 2009 10:00:58 -0800
+
+emacs23 (23.1+1-4) unstable; urgency=low
+
+ * Remove redundant upstream emacs.desktop files from emacs23-common,
+ and merge some of the upstream emacs.desktop file info into the
+ Debian files. Thanks to Michael Biebl <biebl@debian.org> for the
+ report. (closes: #541173)
+
+ * Handle the fact that the share/info/emacs-VER/dir{,.old} files may
+ not be created during the install (and so may not need to be
+ removed). This may be the case with dpkg 1.5.4 or newer. Thanks
+ to Sven Joachim <svenjoac@gmx.de> for the report and the
+ fix. (closes: 545379)
+
+ * Add a bit to the emacsVER-lucid description. Thanks to Drew
+ Parsons <dparsons@debian.org> for the suggestion.
+ (closes: #545263)
+
+ * Add provides emacs23-gtk to emacs23 as a transition measure (to be
+ deleted in emacs24) to allow more seamless upgrades from the
+ earlier unstable/testing packages. Thanks to Josh Triplett
+ <josh@joshtriplett.org> for the suggestion. (closes: #545405)
+
+ -- Rob Browning <rlb@defaultvalue.org> Sun, 13 Sep 2009 18:10:28 -0700
+
+emacs23 (23.1+1-3) unstable; urgency=low
+
+ * Fix overlooked manpage rename in emacsVER.postinst. Thanks to
+ Sven Joachim <svenjoac@gmx.de>. (closes: #539926)
+
+ * Change emacsVER to be the GTK+ version to match the upstream
+ default, and add an emacsVER-lucid package for those who still
+ want the non-GTK+ version. Thanks to Romain Francoise
+ <rfrancoise@debian.org> and others for the report.
+ (closes: #539800)
+
+ * Don't build-depend on libgmp-dev on hurd or kfreebsd. Thanks to
+ Cyril Brulebois <kibi@debian.org>. (closes: #541353)
+
+ * Fix emacsVER.desktop to refer to SVG file instead of incorrect
+ PNG, remove emacs22.png files from unversioned /usr/share/icons
+ directory, and change emacs*.png and emacs*.svg files to
+ emacsVER*.png and emacsVER*.svg. Also use update-alternatives to
+ manage the unversioned names for these files. Thanks to Atsuhito
+ KOHDA <kohda@pm.tokushima-u.ac.jp> for the initial
+ report. (closes: #539851)
+
+ * Fix Rmail to handle capitalized month names in Date lines,
+ i.e. "Date: Thu, 06 Aug 2009 18:33:32 +0100". Thanks to Jeroen
+ Nijhof <jeroen@nijhof.uklinux.net> for the report and Sven Joachim
+ <svenjoac@gmx.de> for the fix. (closes: #540234)
+
+ -- Rob Browning <rlb@defaultvalue.org> Thu, 03 Sep 2009 21:55:25 -0700
+
+emacs23 (23.1+1-2) unstable; urgency=low
+
+ * Add dependencies on install-info to primary binary packages and
+ remove install-info from meta package provides. Thanks to Norbert
+ Preining <preining@logic.at>. (See emacs21 bugs #532600, #532599,
+ #532597, and #532602.)
+
+ * Add libpm-dev and libdbus-1-dev build dependencies. Thanks to
+ Sven Joachim <svenjoac@gmx.de> for reporting this and most of the
+ following additional issues.
+
+ * Fix a spelling error, fix a menu section error, add a version to
+ the GPL file referred to by debian/copyright, and add a number of
+ debian/emacsVER*.lintian-overrides to quiet long-standing
+ warnings.
+
+ * Fix update-alternatives to reflect the fact that all the binaries
+ have manpages now. Rename manpages from NAME.1FLAVOR to
+ NAME.FLAVOR.1.
+
+ * Remove obsolete dependencies and conflicts (w3-el, emacs22
+ packages, etc.).
+
+ * Remove explicit install-info calls. Rely on triggers now.
+
+ * Set debian-emacs-flavor to 'emacs23. Somehow that change didn't
+ make it in to the initial package and it was still set to emacs22.
+
+ * Search /usr/share/info/emacs-23 rather than
+ /usr/share/info/emacs-22.
+
+ -- Rob Browning <rlb@defaultvalue.org> Sun, 02 Aug 2009 19:55:15 -0700
+
+emacs23 (23.1+1-1) unstable; urgency=low
+
+ * New emacs23 packages.
+
+ * The debian/dfsg-splitter has been updated.
+
+ * Patches have been removed or adjusted.
+
+ -- Rob Browning <rlb@defaultvalue.org> Sat, 18 Jul 2009 18:41:25 -0700
+
+emacs22 (22.3+1-1) unstable; urgency=low
+
+ * New upstream release. (closes: #512134)
+
+ -- Rob Browning <rlb@defaultvalue.org> Sat, 28 Mar 2009 19:18:43 -0700
+
+emacs22 (22.2+2-5) unstable; urgency=low
+
+ * Add a build dependency on libasound2-dev which emacs22 is already
+ linked against on i386. This change just makes things consistent
+ across all the relevant platforms. Thanks to Sven Joachim
+ <svenjoac@gmx.de> for the fix. (closes: #503054)
+
+ * Set mail-interactive to t if /usr/bin/mail is not an executable and
+ fakemail is chosen. This should still help avoid silent mail loss,
+ but won't signal an error if the mailer is never invoked. Thanks to
+ Ralf Resack <horch_loeffelchen@yahoo.de> for proposing the
+ fix. (closes: #429059)
+
+ -- Rob Browning <rlb@defaultvalue.org> Sun, 09 Nov 2008 12:05:33 -0800
+
+emacs22 (22.2+2-4) unstable; urgency=medium
+
+ * Fix a security problem related to the invocation of python
+ (CVE-2008-3949). Avoid including the current directory in the module
+ lookup path when invoking python from python.el. Thanks to Sven
+ Joachim <svenjoac@gmx.de> and Michael Berg <michaeljberg@gmail.com>.
+ (closes: #499568)
+
+ * Invoke xmlstarlet from flymake as xmlstarlet rather than xml. Thanks
+ to Jussi Judin <jjudin+debian@iki.fi>. (closes: #447378)
+
+ * Fix vc-mode's handling of internal temporary buffers. This should
+ avoid failures when trying to open files under monotone version
+ control. Thanks to Sven Joachim <svenjoac@gmx.de> and Michael Berg
+ <michaeljberg@gmail.com>. (closes: #476108)
+
+ -- Rob Browning <rlb@defaultvalue.org> Tue, 14 Oct 2008 21:28:47 -0700
+
+emacs22 (22.2+2-3) unstable; urgency=medium
+
+ * Fix an insecurity related to fast-lock-cache-directories
+ (CVE-2008-2142). Thanks to Sven Joachim <svenjoac@gmx.de> and Morten
+ Welinder <mwelinder@gmail.com>. (closes: #480885)
+
+ * Don't remove /usr/local/share/emacs/site-lisp in emacs22-common.
+ Leave that up to emacsen-common. Thanks to Sven Joachim
+ <svenjoac@gmx.de>. (closes: #490524)
+
+ * Don't prematurely raise an error when trying to save a non-ASCII
+ buffer when select-safe-coding-system-accept-default-p is set to a
+ function. Thanks to Jun Inoue <jun.lambda@gmail.com>.
+ (closes: #488427)
+
+ * Don't look for GNU to find etc/. Look for NEWS instead. Thanks to
+ "Bernhard Michler" <Boregard@gmx.net> for the report and Sven Joachim
+ <svenjoac@gmx.de> for the fix. (closes: #478240)
+
+ * Fix a problem in WoMan which caused it to raise an error for a number
+ of manpages. Thanks to Sven Joachim <svenjoac@gmx.de>. (closes: #476223)
+
+ -- Rob Browning <rlb@defaultvalue.org> Wed, 23 Jul 2008 20:56:33 -0700
+
+emacs22 (22.2+2-2) unstable; urgency=medium
+
+ * Fix debian-expand-file-name-dfsg and describe-gnu-project (C-h C-p).
+ Thanks to Valery V. Vorotyntsev <valery.vv@gmail.com>.
+ (closes: #448391, #477215)
+
+ * Fix an insecurity in vcdiff's temporary file handling
+ (CVE-2008-1694). Thanks to Moritz Muehlenhoff <jmm@debian.org> and
+ Steve Grubb. (closes: #476611)
+
+ -- Rob Browning <rlb@defaultvalue.org> Sat, 26 Apr 2008 22:02:40 -0700
+
+emacs22 (22.2+2-1) unstable; urgency=low
+
+ * Move mh-e.texi here from the non-DFSG package because the license does
+ appear to be DFSG compatible. Thanks to Peter S Galbraith
+ <psg@debian.org>. (closes: #433953)
+
+ * Add Conflicts and Replaces emacs22-common-non-dfsg (<< 22.2+1-2) to
+ debian/control.in to handle move of mh-e.
+
+ -- Rob Browning <rlb@defaultvalue.org> Sun, 20 Apr 2008 13:25:33 -0700
+
+emacs22 (22.2+1-1) unstable; urgency=low
+
+ * New upstream release. (closes: #473021, #474271)
+
+ * Move dired-x.texi to the non-DFSG package because the license has
+ changed.
+
+ * Update debian/copyright to reflect recent changes.
+
+ * Update debian/dfsg-splitter for new upstream release.
+
+ * Add libgif-dev to debian/control. Thanks to Sven Joachim
+ <svenjoac@gmx.de>. (closes: #472419)
+
+ -- Rob Browning <rlb@defaultvalue.org> Thu, 10 Apr 2008 18:41:02 -0700
+
+emacs22 (22.1+1-3) unstable; urgency=low
+
+ * Incorporate a patch to fix a vulnerability in the handling of file
+ local variables (CVE-2007-5795) (closes: #449008). Thanks to Drake
+ Wilson <drake@begriffli.ch>, and also thanks to Romain Francoise for
+ the 22.1+1-2.1 NMU. [rlb]
+
+ * Support has been added for GNU/kFreeBSD. Thanks to Petr Salinger
+ <Petr.Salinger@seznam.cz> (closes: #451178)
+
+ * Incorporate a patch to fix a a stack-based buffer overflow in the
+ format function which can occur when dealing with high precision
+ values. The overflow could lead to arbitrary code execution
+ (CVE-2007-6109). Thanks to Nico Golde <nion@debian.org> for the
+ 22.1+1-2.2 and 22.1+1-2.3 NMUs. The patch fixes both the CVE
+ (#455432) and a bug introduced by an incomplete initial patch
+ (#456235).
+
+ * Don't override install-info anymore. (closes: #438695)
+
+ * Fix a problem with auto save file names. Thanks to Sven Joachim
+ <svenjoac@gmx.de>. (closes: #469017)
+
+ * Fix the switch-to-buffer-other-frame function so that it returns the
+ new buffer. This also means that find-file-read-only-other-frame will
+ now correctly mark the new buffer as read only. Thanks to Sven
+ Joachim <svenjoac@gmx.de>. (closes: #457539)
+
+ -- Rob Browning <rlb@defaultvalue.org> Sun, 02 Mar 2008 14:22:35 -0800
+
+emacs22 (22.1+1-2) unstable; urgency=low
+
+ * Fix mail locking patch for Debian's non-Linux architectures. Thanks
+ to Michael Banck <mbanck@debian.org>. (closes: #433816) [rlb]
+
+ * Fix control file for binary NMUs. Thanks to Lior Kaplan
+ <kaplan@debian.org>. (closes: #432957) [rlb]
+
+ * Fix problem with --no-bitmap-icon with upstream patch. Thanks to Sven
+ Joachim <sven_joachim@web.de>. (closes: #433969) [rlb]
+
+ * Add build dependency versions of quilt that include support for
+ "header". Thanks to Max Dmitrichenko
+ <dmitrmax@rain.ifmo.ru>. (closes: #432695) [rlb]
+
+ * Incorporate upstream fixes to Emacs manpage. Thanks to Sven Joachim
+ <sven_joachim@web.de>. (closes: #432732) [rlb]
+
+ * Symlink etc/COPYING and lisp/COPYING to
+ /usr/share/common-licenses/GPL-2. Thanks to Milan Zamazal
+ <pdm@debian.org> for the report. (closes: #436810) [rlb]
+
+ -- Rob Browning <rlb@defaultvalue.org> Tue, 21 Aug 2007 22:29:09 -0700
+
+emacs22 (22.1+1-1) unstable; urgency=low
+
+ * New upstream release. (closes: #427279) [rlb]
+
+ * Change build dependency from libpng3-dev to libpng12-dev.
+ (closes: #424622) [rlb]
+
+ * If allowed, create and remove non-flavor-specific
+ /usr/local/share/emacs/site-lisp.
+
+ * Fix cc-mode local variable problem. Thanks to Sven Joachim
+ <sven_joachim@web.de> for forwarding the upstream patch.
+ (closes: #428898) [rlb]
+
+ * Add desktop file for emacs22-gtk. (closes: #424069) [rlb]
+
+ * Remove /var/games/emacs/ since Emacs doesn't use it unless
+ update-game-score is setuid and Debian's isn't.
+ (closes: #423948, #430533) [rlb]
+
+ * New release restores python mode. (closes: #430553) [rlb]
+
+ * Add /usr/share/info/emacs-22 to Info-default-directory-list before
+ /usr/share/info. (closes: #425924, #429526) [rlb]
+
+ * Change the desktop file to only use the major version in the name,
+ rather than the full upstream version, so that the string won't change
+ from say 22.0.99 to 22.1.
+
+ -- Rob Browning <rlb@defaultvalue.org> Fri, 06 Jul 2007 20:20:15 -0700
+
+emacs22 (22.0.99+1-1) experimental; urgency=low
+
+ * Update to 22.0.99.
+
+ -- Rob Browning <rlb@defaultvalue.org> Sat, 12 May 2007 11:01:29 -0700
+
+emacs22 (22.0.95+1-1) experimental; urgency=low
+
+ * New emacs22 packages.
+
+ * The debian/dfsg-splitter has been updated. [rlb]
+
+ * Obsolete patches have been removed. [rlb]
+
+ -- Rob Browning <rlb@defaultvalue.org> Sun, 11 Mar 2007 10:14:16 -0700
+
+emacs21 (21.4a+1-5) unstable; urgency=low
+
+ * Move man pages back to emacs21-common. (closes: #414321) [rlb]
+ - debian/rules
+
+ -- Rob Browning <rlb@defaultvalue.org> Sat, 10 Mar 2007 16:16:15 -0800
+
+emacs21 (21.4a+1-4) unstable; urgency=low
+
+ * Merge useful bits from Jerome and my orphaned emacs22 tree (which
+ itself was based on Jérôme's snapshot tree) in preparation for
+ upcoming emacs22 branch. Many thanks to Jérôme. A partial summary of
+ these changes follows:
+
+ Add debian/rules info_subdir variable.
+
+ Modify desktop and menu files version. This approach should work for
+ normal versions, "Emacs 21.4a (X11)", and for snapshots, "Emacs
+ 2006-09-09 (X11)". See the menu_ver variable in debian/rules.
+
+ Overhaul debian/rules to build all of the install trees at once and
+ then call the dh_* programs generically rather than calling them once
+ per package. [rlb]
+
+ - emacsVER-bin-common.postinst
+ - emacsVER-bin-common.prerm
+ - emacsVER-common.postinst
+ - emacsVER-common.prerm
+ - emacsVER.desktop
+ - emacsVER.menu
+ - rules
+
+ -- Rob Browning <rlb@defaultvalue.org> Sat, 3 Mar 2007 16:13:23 -0800
+
+emacs21 (21.4a+1-3) unstable; urgency=high
+
+ * Fix build failure on mipsel.
+ Thanks to Aurelien Jarno <aurelien@aurel32.net>.
+ (closes: #401665) [Jérôme Marant]
+ - debian/patches/arch-mipsel.diff: set OUTPUT_ARCH to `mips'
+ instead of `mipsel'.
+
+ * Changed FSF address in copyright file. [Jérôme Marant]
+ - debian/copyright.in
+ - debian/copyright
+
+ -- Jerome Marant <jerome@debian.org> Thu, 04 Jan 2007 08:31:28 +0100
+
+emacs21 (21.4a+1-2) unstable; urgency=low
+
+ * Make both emacs21 and emacs21-nox packages suggest non-DFSG
+ packages and fix erroneous emacs21-common dependency on it
+ [Jérôme Marant]
+ - debian/control.in
+ - debian/control
+
+ * Grab yow mode from the CVS trunk so it is now compatible with yow.lines
+ replacement which also comes from the CVS trunk.
+ (closes: #395501) [Jérôme Marant]
+ - debian/patches/yow-mode-from-cvs.diff: new patch.
+ - debian/patches/series: updated.
+
+ * Properly handle ldapsearch output from OpenLDAP version 2 and above.
+ Thanks to both Joshua Judson Rosen <joshuar@russound.com> and
+ Henrik Holmboe <henrik@holmboe.se>.
+ (closes: #381484) [Jérôme Marant]
+ - debian/patches/ldapsearch-output.diff: new patch.
+ - debian/patches/series: updated.
+
+ * Mention license of both emacs.1 and etags.1 manpages and add a copy of
+ the GFDL to the copyright file (closes: #396875) [Jérôme Marant]
+ - debian/copyright.in
+ - debian/copyright: re-generated.
+
+ * Fix generation of emacs21-common README.Debian. [rlb]
+
+ -- Rob Browning <rlb@defaultvalue.org> Sat, 2 Dec 2006 11:45:44 -0800
+
+emacs21 (21.4a+1-1) unstable; urgency=low
+
+ * In accordance with the recent General Resolution
+ (http://www.debian.org/vote/2006/vote_001), move all non-DFSG files to
+ new packages that will be included in Debian's non-free section. The
+ debian/dfsg-splitter script has been used to split the upstream
+ archive. (closes: #207932) [rlb]
+ - debian/control.in
+ - debian/copyright.in
+ - debian/dfsg-splitter
+ - debian/emacs-common.README
+ - debian/patches/handle-dfsg-split.diff
+ - debian/patches/series
+ - debian/replacement/yow.lines.uu
+ - debian/rules
+ - debian/missing-file.dfsg: new template file used to generate
+ replacements for non-free files normally accessible through C-h
+ key bindings. Those files will be displayed if the original
+ ones are not available.
+
+ * Acknowledge NMU. Thanks Marc Brockschmidt <he@debian.org>
+ (Closes: #381452) [Jérôme Marant]
+
+ * Separate mipsel from mips autodetection in configure.in [Jérôme Marant]
+ - debian/patches/arch-mipsel.diff: update.
+
+ * Split mips and mipsel ports into two separate patches [Jérôme Marant]
+ - debian/patches/arch-mips.diff: new file. Add mips-specific code
+ from arch-mipsel+mips.diff patch
+ - debian/patches/arch-mipsel.diff: add mipsel-specific code from
+ arch-mipsel+mips.diff patch
+ - debian/patches/arch-mipsel+mips.diff: remove.
+
+ * Bump Standards-Version to 3.7.2 [Jérôme Marant]
+ - debian/control.in
+
+ * Add a new dummy `emacs' package which depends on the latest
+ Emacs release (closes: #82687)
+ - debian/control.in: added new entry for `emacs' package.
+ - debian/control: re-generated.
+ - debian/emacs.*: renamed to debian/emacsVER.*
+ - debian/emacs-*.*: renamed to debian/emacsVER-*.*
+ - debian/rules: changed accordingly.
+
+ * Remove erroneous semicolon character when reading XBM files.
+ Thanks to Jochen Voss <voss@debian.org>.
+ (closes: #392651) [Jérôme Marant]
+ - debian/patches/xbm-read-erroneous-semicolon.diff: new file.
+ - debian/patches/series: updated.
+
+ * Properly point to README.Debian.gz from Emacs NEWS file.
+ Thanks to Per Bojsen <per.bojsen@bojsen.us>.
+ (closes: #389063) [Jérôme Marant]
+ - debian/patches/misc-unseparated.diff: updated.
+
+ -- Rob Browning <rlb@defaultvalue.org> Wed, 25 Oct 2006 00:40:34 -0700
+
+emacs21 (21.4a-6.2) unstable; urgency=low
+
+ * Non-maintainer brown paper bag release.
+ * Apply patch from 21.4a-6.1 properly, somehow quilt hates me.
+
+ -- Marc 'HE' Brockschmidt <he@debian.org> Wed, 27 Sep 2006 08:30:33 +0200
+
+emacs21 (21.4a-6.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/patches/arch-mipsel+mips.diff:
+ Add patch from Max Kellermann <max@duempel.org> (updated by
+ Thiemo Seufer <ths@networkno.de>) to fix segfaults on mips
+ and mipsel. Thanks for the hard work! (Closes: #381452)
+
+ -- Marc 'HE' Brockschmidt <he@debian.org> Wed, 27 Sep 2006 00:13:30 +0200
+
+emacs21 (21.4a-6) unstable; urgency=low
+
+ * When we create an empty aclocal.m4 after patching (to get around
+ quilt's use of patch -E), make the timestamp match the timestamp of
+ configure.in, so that we won't accidentally re-run autoconf given the
+ dependency in Makefile.in. [rlb].
+ - debian/rules
+
+ -- Rob Browning <rlb@defaultvalue.org> Sun, 14 May 2006 15:24:35 -0700
+
+emacs21 (21.4a-5) unstable; urgency=low
+
+ * Don't include dpatch.make in debian/rules since the package no longer
+ depends on dpatch. Thanks to Romain Francoise
+ <rfrancoise@debian.org>. (closes: #367177) [rlb]
+ - debian/rules
+
+ -- Rob Browning <rlb@defaultvalue.org> Sun, 14 May 2006 10:18:04 -0700
+
+emacs21 (21.4a-4) unstable; urgency=low
+
+ * Migrate from dpatch to quilt and update generation of README. [rlb]
+ - debian/README.in
+ - debian/rules
+ - debian/control.in
+ - debian/patches/*
+
+ * Change occurrence of "find ... -perm +u+x" to "find ... -perm /u+x".
+ The former is no longer handled the way it used to be, and *doesn't*
+ find all files with execute permission. Thanks to François Fleuret
+ for pointing out the initial problem. [rlb]
+ - debian/rules
+
+ * Replace $(pwd) with $(CURDIR) in debian/rules.
+ - debian/rules
+
+ * Remove PACKAGE variable.
+ - debian/rules
+
+ * Arrange DEB_ vars as recommended by
+ /usr/share/doc/autotools-dev/README.Debian.gz and do the same with
+ DEB_HOST_ARCH and DEB_HOST_GNU_CPU. [rlb]
+ - debian/rules
+
+ * Use DEB_HOST_GNU_TYPE for the value of target rather than
+ DEB_BUILD_GNU_TYPE. [rlb]
+ - debian/rules
+
+ * Add $(src_name) and $(flavor) and use them. [rlb]
+ - debian/rules
+
+ * Remove show-upstream-diffs target (use check-diff instead). [rlb]
+ - debian/rules
+
+ * Rename orig_tgz and orig_tgz_dir variables to deb_orig_tgz and
+ deb_orig_tgz_dir. [rlb]
+ - debian/rules
+
+ * Lowercase local makefile variable names. [rlb]
+ - debian/rules
+
+ * Migrate to debhelper (while consulting Jérôme Marant's work on
+ emacs-snapshot). There may still be a bit to do. [rlb]
+ - debian/rules
+ - debian/changelog
+ - debian/compat
+ - debian/control
+ - debian/control.in
+ - debian/emacs-bin-common.postinst
+ - debian/emacs-bin-common.postrm
+ - debian/emacs-bin-common.prerm
+ - debian/emacs-common.README
+ - debian/emacs-common.docs
+ - debian/emacs-common.postinst
+ - debian/emacs-common.prerm
+ - debian/emacs-el.prerm
+ - debian/emacs.README
+ - debian/emacs.menu
+ - debian/emacs.postinst
+ - debian/emacs.postrm
+ - debian/emacs.preinst
+ - debian/emacs.prerm
+ - debian/rules
+ - debian/README.binpkg.in (moved to debian/emacs.README)
+ - debian/README.in (moved to debian/emacs-common.README)
+ - debian/build-binary-pkg (removed - now handled in debian/rules)
+ - debian/menu.in (moved to debian/emacs.menu)
+
+ * Change nominal_ver computation to match code in configure.in. [rlb]
+ - debian/rules
+
+ * Add libxaw7-dev dependency to make sure we get that instead of
+ libxaw8-dev. Thanks to Tollef Fog Heen <tfheen@debian.org>.
+ (closes: #365597) [rlb]
+ - debian/control.in
+
+ * Apply an upstream patch to fix an mmap related Hurd build problem.
+ Thanks to Michael Banck <mbanck@debian.org>. (closes: #347554) [rlb]
+ - debian/patches/series
+ - debian/patches/hurd-mmap.diff
+
+ -- Rob Browning <rlb@defaultvalue.org> Sat, 13 May 2006 16:24:05 -0700
+
+emacs21 (21.4a-3) unstable; urgency=low
+
+ * Disable support for the ppc64 architecture: the patch breaks the
+ powerpc support and does not work on ppc64 any more anyway.
+ (closes: #329459) [Jérôme Marant]
+ - debian/patches/00list: disable arch-ppc64 patch.
+ - debian/patches/autofiles.dpatch: regenerated.
+
+ -- Rob Browning <rlb@defaultvalue.org> Sun, 2 Oct 2005 19:00:13 -0700
+
+emacs21 (21.4a-2) unstable; urgency=low
+
+ * Apply patch applying modifiers to multibyte-char keys. Thanks to
+ Martin Stjernholm <mast@lysator.liu.se> (closes: #309963) [Jérôme Marant]
+ - debian/patches/multibyte-char-key-modifiers.dpatch: new file.
+ - debian/00list: updated.
+
+ * Apply patch supporting the ppc64 architecture. This is a slightly
+ modified patch derived from the Emacs CVS mainline.
+ (closes: #300368) [Jérôme Marant]
+ - debian/patches/arch-ppc64.patch: new file.
+ - debian/00list: updated.
+
+ * Add real dependency as an alternative to the libtiff-dev build
+ dependency in order for the build to be deterministic.
+ (closes: #311074) [Jérôme Marant]
+ - debian/control.in: add libtiff4-dev as alternative libtiff-dev
+ build dependency.
+ - debian/control: regenerated.
+
+ * Bump Standards-Version to 3.6.2. [Jérôme Marant]
+ - debian/control.in
+ - debian/control: regenerated.
+
+ * Use the "kitchen sink" bitmap icon when iconifying the Emacs window.
+ (closes: #309930) [Jérôme Marant]
+ - debian/menu.in: pass the `-i' option to the command launching Emacs
+ under X11.
+ - debian/emacs.desktop: likewise.
+
+ * Work around bug in Xorg which makes AltGr incorrectly recognized.
+ This patch has been backported from Emacs CVS trunk. [Jérôme Marant]
+ - debian/patches/xorg-altgr-fix.dpatch: new file.
+ - debian/00list: updated.
+
+ * Apply patch preventing an infinite loop in whitespace.el if kill-read-only
+ is set to t. Thanks to Romain Francoise <rfrancoise@debian.org>
+ (closes: #273123) [Jérôme Marant]
+ - debian/patches/whitespace-readonly-infloop.dpatch: new file.
+ - debian/00list: updated.
+
+ -- Rob Browning <rlb@defaultvalue.org> Sat, 17 Sep 2005 23:39:52 -0700
+
+emacs21 (21.4a-1) unstable; urgency=medium
+
+ * New upstream release. (closes: #294313) [Jérôme Marant]
+ - debian/patches/movemail-pop-fmt-vulnerability.dpatch: removed since
+ it has been applied upstream.
+
+ * Apply patch from Romain Francoise <rfrancoise@debian.org> making PCL-CVS
+ compliant with recent versions of CVS. (closes: #291221) [Jérôme Marant]
+ - debian/patches/pcl-cvs-format.dpatch: new file.
+ - debian/00list: updated.
+ - debian/control: tightened dependency on dpatch (>= 2.0.9).
+
+ * Add MIME type to desktop file. (closes: #296618) [Jérôme Marant]
+ - debian/emacs.desktop: added MimeType entry.
+
+ * Apply patch supporting the AMD64 architecture. This is a slightly
+ modified patch derived from the Emacs CVS mainline. Thanks to
+ Goswin von Brederlow <brederlo@informatik.uni-tuebingen.de> and
+ amd64 porters. (closes: #248796) [Jérôme Marant]
+ - debian/patches/arch-amd64.patch: new file.
+ - debian/00list: updated.
+
+ * Hard code leim version in copyright.in for now. with 21.4a the emacs
+ tar.gz name changed, but the leim archive name didn't. [rlb]
+ - debian/copyright.in
+ - debian/copyright
+
+ * Remove prebuild target from debian/rules. Instead, just issue
+ instructions to the user. [rlb]
+ - debian/rules
+
+ * Fix invocation of wc -l when counting fns-*.el files. [rlb]
+ - debian/rules
+
+ * Use dpatch for the autotool related diff rather than generating and
+ applying a diff manually. What was the debian/autofiles.diff is now
+ handled via debian/patches/autofiles.dpatch. Also, we no longer try
+ to automatically generate the diff when needed. Instead, the diff
+ must be generated manually via "debian/rules autofiles-sync".
+
+ The earlier approach was broken because dpatch files that
+ autofiles.diff depended on could end up later in the Debian diff (and
+ hence have newer timestamps). This would cause an unexpected run of
+ aclocal, etc. and break the buildds. If we ever want to re-automate
+ generation of the autofiles diff, we'll need to use dpatch md5 sigs
+ (or similar) rather than timestamps. (closes: #297796) [rlb]
+ - debian/autofiles.diff: removed
+ - debian/patches/00list: added autofiles
+ - debian/patches/autofiles.dpatch: new
+ - debian/rules: updated
+
+ -- Rob Browning <rlb@defaultvalue.org> Tue, 15 Mar 2005 11:00:04 -0600
+
+emacs21 (21.3+1-9) unstable; urgency=high
+
+ * Modify debian/rules to support using an arch source repository and an
+ archive arrangement somewhat similar to, but not compatible with
+ arch-buildpackage's. [rlb]
+ - debian/rules
+
+ * Applied patch to fix mailspool pop format string vulnerability
+ (CAN-2005-0100). [rlb]
+ Thanks to Max Vozeler <max@hinterhof.net>.
+ - debian/patches/movemail-pop-fmt-vulnerability.dpatch
+
+ -- Rob Browning <rlb@defaultvalue.org> Thu, 3 Feb 2005 21:02:03 -0600
+
+emacs21 (21.3+1-8) unstable; urgency=medium
+
+ * Apply patch allowing Emacs to properly interpret logo keys as Meta
+ rather than Meta+Super+Hyper. This problem has been showing up since
+ latest XFree86 and Xorg introducted `fake keys'.
+ Thanks to Denis Barbier <barbier@linufr.org>
+ (closes: #255286, #274103) [Jérôme Marant]
+ - debian/patches/xfree86-4.3-modifiers.dpatch: new file
+ - debian/patches/00list: updated.
+
+ * Apply patch fixing long-standing memory leak in decode-coding-region
+ and similar routines. Thanks to Florian Weimer <fw@deneb.enyo.de>.
+ (closes: #273919) [Jérôme Marant]
+ - debian/patches/coding-region-leak.dpatch: new file.
+ - debian/patches/00list: updated.
+
+ * Apply patch tightening permissions of local backup copies of remote
+ files. Thanks to Michael Albinus <michael.albinus@gmx.de>.
+ (closes: #274427) [Jérôme Marant]
+ - debian/patches/remote-files-permissions.dpatch: new file.
+ - debian/patches/00list: updated.
+
+ -- Rob Browning <rlb@defaultvalue.org> Sat, 16 Oct 2004 11:10:32 -0500
+
+emacs21 (21.3+1-7) unstable; urgency=medium
+
+ * set recompile against libtiff4-dev and upload with
+ urgency=medium. (closes: #262828) [rlb]
+ - debian/changelog
+
+ -- Rob Browning <rlb@defaultvalue.org> Tue, 3 Aug 2004 11:34:43 -0500
+
+emacs21 (21.3+1-6) unstable; urgency=low
+
+ * fix debian/README rendering problem. [rlb]
+
+ * Stop provinding www-browser since the w3-el-e21 package provides it
+ now. [Jérôme Marant]
+ - debian/control.in: remove www-browser provides for emacs and
+ emacs-nox.
+ - debian/control: synced.
+
+ * Fixed installation of .desktop entry. [Jérôme Marant]
+ - debian/build-binary-pkg: fixed typo.
+
+ * Set value of the auto-save-file-name-transforms variable at run-time
+ in order to override its build-time value.
+ (closes: #160615, #167295, #175346, #241826, #250676, #178792)
+ [Jérôme Marant]
+ - debian/patches/startup-auto-save-file-name-transforms.dpatch: new file.
+ - debian/patches/00list: updated.
+
+ * Add Python byte-compiled file extensions to completion-ignore-extensions
+ variable. (closes: #177276) [Jérôme Marant]
+ - debian/patches/python-completion-ignored-extensions.dpatch: new file.
+ - debian/patches/00list: updated.
+
+ * Fixed removal of alternatives
+ (closes: #251822, #206901, #241820, #163034) [Jérôme Marant]
+ - debian/emacs-bin-common.prerm
+
+ * Add a slave alternative for "editor" manpage.
+ Thanks to Daniel Kraft <da_kraft@web.de>. (closes: #255639) [Jérôme Marant]
+ - debian/emacs.postinst
+
+ * Apply a 2003-06-21 patch from upstream CVS to fix a non-interactive
+ signal handling problem that could cause Emacs to die prematurely as
+ the result of a SIGIO or SIGHUP. (closes: #253887) [rlb]
+ - debian/patches/fix-batch-mode-signal-handling.dpatch
+ - debian/patches/00list
+
+ * Add warning message to prepare-release explaining that you have to run
+ it as a normal user (not root). [rlb]
+ - debian/rules
+
+ -- Rob Browning <rlb@defaultvalue.org> Mon, 26 Jul 2004 10:27:10 -0500
+
+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: #120079)
+ * re-add lost hppa and s390 patches. (closes: #107251)
+
+ -- 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:
--- /dev/null
+Source: emacs25
+Section: editors
+Priority: optional
+Maintainer: Rob Browning <rlb@defaultvalue.org>
+Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev,
+ dbus-x11,
+ gnupg-agent,
+ libgif-dev | libungif4-dev,
+ libtiff-dev,
+ procps,
+ xaw3dg-dev,
+ libpng-dev, libjpeg-dev, libm17n-dev, libotf-dev,
+ libgpm-dev [linux-any], libdbus-1-dev,
+ autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42),
+ debhelper (>= 9), libxaw7-dev, sharutils, imagemagick, libgtk-3-dev,
+ libgnutls28-dev, libxml2-dev, libselinux1-dev [linux-any],
+ libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
+ libmagick++-6.q16-dev,
+ libacl1-dev,
+ liboss4-salsa-dev [hurd-i386 kfreebsd-i386 kfreebsd-amd64],
+ zlib1g-dev
+Homepage: http://www.gnu.org/software/emacs/
+Standards-Version: 3.7.2
+
+Package: emacs25-lucid
+Architecture: any
+Depends: emacs25-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Provides: emacs25, emacsen, editor, info-browser, mail-reader, news-reader
+Suggests: emacs25-common-non-dfsg
+Conflicts: emacs25, emacs25-nox
+Replaces: emacs25, emacs25-nox
+Description: GNU Emacs editor (with Lucid GUI support)
+ GNU Emacs is the extensible self-documenting text editor. This
+ package contains a version of Emacs with support for a graphical user
+ interface based on the Lucid toolkit (instead of the GTK+ interface
+ provided by the emacs25 package). Until some known GTK+
+ problems are fixed, this version may help avoid crashing Emacs during
+ an emacsclient disconnect. See
+ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=567934 and
+ https://bugzilla.gnome.org/show_bug.cgi?id=85715 for more
+ information.
+
+Package: emacs25-lucid-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: emacs25-lucid-dbg (= ${binary:Version}), ${misc:Depends}
+Description: Debugging symbols for emacs25-lucid
+ GNU Emacs is the extensible self-documenting text editor. This
+ package contains the debugging symbols for the emacs25-lucid
+ package.
+
+Package: emacs25-nox
+Architecture: any
+Depends: emacs25-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Provides: emacs25, editor, emacsen, info-browser, mail-reader, news-reader
+Suggests: emacs25-common-non-dfsg
+Conflicts: emacs25, emacs25-lucid
+Replaces: emacs25, emacs25-lucid
+Description: GNU Emacs editor (without GUI support)
+ GNU Emacs is the extensible self-documenting text editor. This
+ package contains a version of Emacs compiled without support for X,
+ and provides only a text terminal interface.
+
+Package: emacs25-nox-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: emacs25-nox-dbg (= ${binary:Version}), ${misc:Depends}
+Description: Debugging symbols for emacs25-nox
+ GNU Emacs is the extensible self-documenting text editor. This
+ package contains the debugging symbols for the emacs25-nox
+ package.
+
+Package: emacs25
+Architecture: any
+Depends: emacs25-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Provides: editor, emacsen, info-browser, mail-reader, news-reader
+Suggests: emacs25-common-non-dfsg
+Conflicts: emacs25-lucid, emacs25-nox
+Replaces: emacs25-lucid, emacs25-nox
+Description: GNU Emacs editor (with GTK+ GUI support)
+ GNU Emacs is the extensible self-documenting text editor. This
+ package contains a version of Emacs with a graphical user interface
+ based on GTK+ (instead of the Lucid toolkit provided by the
+ emacs25-lucid package).
+
+Package: emacs25-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: emacs25-dbg (= ${binary:Version}), ${misc:Depends}
+Description: Debugging symbols for emacs25
+ GNU Emacs is the extensible self-documenting text editor. This
+ package contains the debugging symbols for the emacs25 package.
+
+Package: emacs25-bin-common
+Architecture: any
+Depends: emacs25-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: 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 emacs25, emacs25-lucid, and emacs25-nox.
+
+Package: emacs25-common
+Architecture: all
+Depends: emacsen-common (>= 2.0.8), install-info, ${shlibs:Depends}, ${misc:Depends}
+Recommends: emacs25-el
+Suggests: emacs25-el, emacs25-common-non-dfsg, ncurses-term
+Conflicts: emacs25-el (<< ${source:Version}), cedet, eieio, speedbar, gnus-bonus-el
+Breaks: apel (<< 10.8+0.20120427-4)
+Description: 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 emacs25, emacs25-lucid, and emacs25-nox.
+
+Package: emacs25-el
+Architecture: all
+Depends: emacs25-common (= ${source:Version}), ${misc:Depends}
+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.
--- /dev/null
+Source: @DEB_FLAVOR@
+Section: editors
+Priority: optional
+Maintainer: Rob Browning <rlb@defaultvalue.org>
+Build-Depends: bsd-mailx | mailx, libncurses5-dev, texinfo, liblockfile-dev, librsvg2-dev,
+ dbus-x11,
+ gnupg-agent,
+ libgif-dev | libungif4-dev,
+ libtiff-dev,
+ procps,
+ xaw3dg-dev,
+ libpng-dev, libjpeg-dev, libm17n-dev, libotf-dev,
+ libgpm-dev [linux-any], libdbus-1-dev,
+ autoconf, automake, autotools-dev, dpkg-dev (>> 1.10.0), quilt (>= 0.42),
+ debhelper (>= 9), libxaw7-dev, sharutils, imagemagick, libgtk-3-dev,
+ libgnutls28-dev, libxml2-dev, libselinux1-dev [linux-any],
+ libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
+ libmagick++-6.q16-dev,
+ libacl1-dev,
+ liboss4-salsa-dev [hurd-i386 kfreebsd-i386 kfreebsd-amd64],
+ zlib1g-dev
+Homepage: http://www.gnu.org/software/emacs/
+Standards-Version: 3.7.2
+
+Package: @DEB_FLAVOR@-lucid
+Architecture: any
+Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Provides: @DEB_FLAVOR@, emacsen, editor, info-browser, mail-reader, news-reader
+Suggests: @DEB_FLAVOR@-common-non-dfsg
+Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-nox
+Replaces: @DEB_FLAVOR@, @DEB_FLAVOR@-nox
+Description: GNU Emacs editor (with Lucid GUI support)
+ GNU Emacs is the extensible self-documenting text editor. This
+ package contains a version of Emacs with support for a graphical user
+ interface based on the Lucid toolkit (instead of the GTK+ interface
+ provided by the @DEB_FLAVOR@ package). Until some known GTK+
+ problems are fixed, this version may help avoid crashing Emacs during
+ an emacsclient disconnect. See
+ https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=567934 and
+ https://bugzilla.gnome.org/show_bug.cgi?id=85715 for more
+ information.
+
+Package: @DEB_FLAVOR@-lucid-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: @DEB_FLAVOR@-lucid-dbg (= ${binary:Version}), ${misc:Depends}
+Description: Debugging symbols for @DEB_FLAVOR@-lucid
+ GNU Emacs is the extensible self-documenting text editor. This
+ package contains the debugging symbols for the @DEB_FLAVOR@-lucid
+ package.
+
+Package: @DEB_FLAVOR@-nox
+Architecture: any
+Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Provides: @DEB_FLAVOR@, editor, emacsen, info-browser, mail-reader, news-reader
+Suggests: @DEB_FLAVOR@-common-non-dfsg
+Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-lucid
+Replaces: @DEB_FLAVOR@, @DEB_FLAVOR@-lucid
+Description: GNU Emacs editor (without GUI support)
+ GNU Emacs is the extensible self-documenting text editor. This
+ package contains a version of Emacs compiled without support for X,
+ and provides only a text terminal interface.
+
+Package: @DEB_FLAVOR@-nox-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: @DEB_FLAVOR@-nox-dbg (= ${binary:Version}), ${misc:Depends}
+Description: Debugging symbols for @DEB_FLAVOR@-nox
+ GNU Emacs is the extensible self-documenting text editor. This
+ package contains the debugging symbols for the @DEB_FLAVOR@-nox
+ package.
+
+Package: @DEB_FLAVOR@
+Architecture: any
+Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Provides: editor, emacsen, info-browser, mail-reader, news-reader
+Suggests: @DEB_FLAVOR@-common-non-dfsg
+Conflicts: @DEB_FLAVOR@-lucid, @DEB_FLAVOR@-nox
+Replaces: @DEB_FLAVOR@-lucid, @DEB_FLAVOR@-nox
+Description: GNU Emacs editor (with GTK+ GUI support)
+ GNU Emacs is the extensible self-documenting text editor. This
+ package contains a version of Emacs with a graphical user interface
+ based on GTK+ (instead of the Lucid toolkit provided by the
+ @DEB_FLAVOR@-lucid package).
+
+Package: @DEB_FLAVOR@-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: @DEB_FLAVOR@-dbg (= ${binary:Version}), ${misc:Depends}
+Description: Debugging symbols for @DEB_FLAVOR@
+ GNU Emacs is the extensible self-documenting text editor. This
+ package contains the debugging symbols for the @DEB_FLAVOR@ package.
+
+Package: @DEB_FLAVOR@-bin-common
+Architecture: any
+Depends: @DEB_FLAVOR@-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: 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 @DEB_FLAVOR@, @DEB_FLAVOR@-lucid, and @DEB_FLAVOR@-nox.
+
+Package: @DEB_FLAVOR@-common
+Architecture: all
+Depends: emacsen-common (>= 2.0.8), install-info, ${shlibs:Depends}, ${misc:Depends}
+Recommends: @DEB_FLAVOR@-el
+Suggests: @DEB_FLAVOR@-el, @DEB_FLAVOR@-common-non-dfsg, ncurses-term
+Conflicts: @DEB_FLAVOR@-el (<< ${source:Version}), cedet, eieio, speedbar, gnus-bonus-el
+Breaks: apel (<< 10.8+0.20120427-4)
+Description: 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 @DEB_FLAVOR@, @DEB_FLAVOR@-lucid, and @DEB_FLAVOR@-nox.
+
+Package: @DEB_FLAVOR@-el
+Architecture: all
+Depends: @DEB_FLAVOR@-common (= ${source:Version}), ${misc:Depends}
+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.
--- /dev/null
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Emacs
+Upstream-Contact: bug-gnu-emacs@gnu.org
+Upstream-Contact: emacs-devel@gnu.org
+Source: https://savannah.gnu.org/projects/emacs
+Comment:
+ This package was debianized by Rob Browning <rlb@defaultvalue.org>
+ on Tue, 16 Dec 1997 00:05:45 -0600.
+
+ The original source for this package can be found at
+ git://git.savannah.gnu.org/emacs.git under the
+ emacs-25.2 tag. That tag was used to create the
+ Debian upstream archive (emacs25_25.2+1.orig.tar.xz)
+ after making adjustments to comply with the DFSG (see below).
+
+ Please see /usr/share/doc/emacs25-common/README.Debian.gz for a
+ description of the Debian specific differences from the upstream
+ version.
+
+ As mentioned there, some files (including some of the Emacs
+ documentation) have been removed from this package because their
+ licenses do not appear to satisfy the requirements of the Debian
+ Free Software Guidelines (DFSG). See
+ http://www.debian.org/social_contract.
+
+ In particular, some of the info pages are covered under the GNU Free
+ Documentation License (GFDL), which Debian has decided does not
+ satisfy the DFSG in cases where "Invariant Sections" are specified
+ (this includes front and back cover texts). See this Debian General
+ Resolution on the topic: http://www.debian.org/vote/2006/vote_001.
+
+ Some other files have been removed because their license only allows
+ verbatim copying, or because there was some other question.
+
+ Please see the files themselves for the relevant Copyright dates.
+
+Files: *
+License: GPL-3+
+
+Files: debian/rules
+License: GPL plus Ian
+ This file is licensed under the terms of the Gnu Public License.
+ With the one additional provision that Ian Jackson's name may not be
+ removed from the file.
+
+Files: doc/man/ebrowse.1
+License: manpage license
+
+Files: doc/man/emacs.1
+License: manpage license
+
+Files: doc/man/etags.1
+License: manpage license
+
+Files: doc/misc/efaq.texi
+License: efaq.texi license
+ This list of frequently asked questions about GNU Emacs with answers
+ (``FAQ'') may be translated into other languages, transformed into
+ other formats (e.g., Texinfo, Info, WWW, WAIS), and updated with new
+ information.
+
+ The same conditions apply to any derivative of the FAQ as apply to
+ the FAQ itself. Every copy of the FAQ must include this notice or
+ an approved translation, information on who is currently maintaining
+ the FAQ and how to contact them (including their e-mail address),
+ and information on where the latest version of the FAQ is archived
+ (including FTP information).
+
+ The FAQ may be copied and redistributed under these conditions,
+ except that the FAQ may not be embedded in a larger literary work
+ unless that work itself allows free copying and redistribution.
+
+ [This version has been heavily edited since it was included in the
+ Emacs distribution.]
+
+Files: doc/misc/efaq-w32.texi
+License: efaq-w32.texi license
+ This list of frequently asked questions about GNU Emacs on MS
+ Windows with answers (``FAQ'') may be translated into other
+ languages, transformed into other formats (e.g., Texinfo, Info,
+ WWW), and updated with new information.
+
+ The same conditions apply to any derivative of the FAQ as apply to
+ the FAQ itself. Every copy of the FAQ must include this notice or
+ an approved translation, information on who is currently maintaining
+ the FAQ and how to contact them (including their e-mail address),
+ and information on where the latest version of the FAQ is archived
+ (including FTP information).
+
+ The FAQ may be copied and redistributed under these conditions,
+ except that the FAQ may not be embedded in a larger literary work
+ unless that work itself allows free copying and redistribution.
+
+Files:
+ etc/images/back-arrow.pbm
+ etc/images/back-arrow.xpm
+ etc/images/close.pbm
+ etc/images/close.xpm
+ etc/images/copy.pbm
+ etc/images/copy.xpm
+ etc/images/cut.pbm
+ etc/images/cut.xpm
+ etc/images/diropen.pbm
+ etc/images/diropen.xpm
+ etc/images/fwd-arrow.pbm
+ etc/images/fwd-arrow.xpm
+ etc/images/help.pbm
+ etc/images/help.xpm
+ etc/images/home.pbm
+ etc/images/home.xpm
+ etc/images/index.pbm
+ etc/images/index.xpm
+ etc/images/info.pbm
+ etc/images/info.pbm
+ etc/images/info.pbm
+ etc/images/info.xpm
+ etc/images/jump-to.pbm
+ etc/images/jump-to.xpm
+ etc/images/left-arrow.pbm
+ etc/images/left-arrow.xpm
+ etc/images/new.pbm
+ etc/images/new.xpm
+ etc/images/open.pbm
+ etc/images/open.xpm
+ etc/images/paste.pbm
+ etc/images/paste.xpm
+ etc/images/preferences.pbm
+ etc/images/preferences.xpm
+ etc/images/print.pbm
+ etc/images/print.xpm
+ etc/images/refresh.pbm
+ etc/images/refresh.xpm
+ etc/images/right-arrow.pbm
+ etc/images/right-arrow.xpm
+ etc/images/save.pbm
+ etc/images/save.xpm
+ etc/images/saveas.pbm
+ etc/images/saveas.xpm
+ etc/images/search.pbm
+ etc/images/search.xpm
+ etc/images/sort-ascending.pbm
+ etc/images/sort-ascending.xpm
+ etc/images/sort-descending.pbm
+ etc/images/sort-descending.xpm
+ etc/images/spell.pbm
+ etc/images/spell.xpm
+ etc/images/undo.pbm
+ etc/images/undo.xpm
+ etc/images/up-arrow.pbm
+ etc/images/up-arrow.xpm
+License: LGPL-2+
+
+Files:
+ etc/images/attach.pbm
+ etc/images/attach.xpm
+ etc/images/bookmark_add.pbm
+ etc/images/bookmark_add.xpm
+ etc/images/cancel.pbm
+ etc/images/cancel.xpm
+ etc/images/connect.pbm
+ etc/images/connect.xpm
+ etc/images/contact.pbm
+ etc/images/contact.xpm
+ etc/images/data-save.pbm
+ etc/images/data-save.xpm
+ etc/images/delete.pbm
+ etc/images/delete.xpm
+ etc/images/describe.pbm
+ etc/images/describe.xpm
+ etc/images/disconnect.pbm
+ etc/images/disconnect.xpm
+ etc/images/exit.pbm
+ etc/images/exit.xpm
+ etc/images/lock-broken.pbm
+ etc/images/lock-broken.xpm
+ etc/images/lock-ok.pbm
+ etc/images/lock-ok.xpm
+ etc/images/lock.pbm
+ etc/images/lock.xpm
+ etc/images/next-node.pbm
+ etc/images/next-node.xpm
+ etc/images/next-page.pbm
+ etc/images/next-page.xpm
+ etc/images/prev-node.pbm
+ etc/images/prev-node.xpm
+ etc/images/redo.pbm
+ etc/images/redo.xpm
+ etc/images/refresh.pbm
+ etc/images/refresh.xpm
+ etc/images/search-replace.pbm
+ etc/images/search-replace.xpm
+ etc/images/separator.pbm
+ etc/images/separator.xpm
+ etc/images/show.pbm
+ etc/images/show.xpm
+ etc/images/sort-ascending.pbm
+ etc/images/sort-ascending.xpm
+ etc/images/sort-column-ascending.pbm
+ etc/images/sort-column-ascending.xpm
+ etc/images/sort-criteria.pbm
+ etc/images/sort-criteria.xpm
+ etc/images/sort-descending.pbm
+ etc/images/sort-descending.xpm
+ etc/images/sort-row-ascending.pbm
+ etc/images/sort-row-ascending.xpm
+ etc/images/up-node.pbm
+ etc/images/up-node.xpm
+ etc/images/zoom-in.pbm
+ etc/images/zoom-in.xpm
+ etc/images/zoom-out.pbm
+ etc/images/zoom-out.xpm
+License: GPL-2+
+
+Files: etc/images/low-color/*
+License: same as corresponding file in /etc/images
+ The images in the low-color/ subdirectory are low-color versions of
+ the files of the same name in etc/images directory, and are subject
+ to the same conditions.
+
+Files:
+ etc/images/gnus/kill-group.pbm
+ etc/images/gnus/kill-group.xpm
+ etc/images/gnus/mail-send.xpm
+ etc/images/gnus/rot13.pbm
+ etc/images/gnus/rot13.xpm
+ etc/images/gnus/toggle-subscription.xpm
+License: GPL-2+
+
+Files:
+ etc/images/mail/compose.pbm
+ etc/images/mail/compose.xpm
+ etc/images/mail/copy.pbm
+ etc/images/mail/copy.xpm
+ etc/images/mail/flag-for-followup.pbm
+ etc/images/mail/flag-for-followup.xpm
+ etc/images/mail/forward.pbm
+ etc/images/mail/forward.xpm
+ etc/images/mail/inbox.pbm
+ etc/images/mail/inbox.xpm
+ etc/images/mail/move.pbm
+ etc/images/mail/move.xpm
+ etc/images/mail/not-spam.pbm
+ etc/images/mail/not-spam.xpm
+ etc/images/mail/outbox.pbm
+ etc/images/mail/outbox.xpm
+ etc/images/mail/preview.pbm
+ etc/images/mail/preview.xpm
+ etc/images/mail/repack.pbm
+ etc/images/mail/repack.xpm
+ etc/images/mail/reply-all.pbm
+ etc/images/mail/reply-all.xpm
+ etc/images/mail/reply-from.pbm
+ etc/images/mail/reply-from.xpm
+ etc/images/mail/reply-to.pbm
+ etc/images/mail/reply-to.xpm
+ etc/images/mail/reply.pbm
+ etc/images/mail/reply.xpm
+ etc/images/mail/save-draft.pbm
+ etc/images/mail/save-draft.xpm
+ etc/images/mail/save.xpm
+ etc/images/mail/send.pbm
+ etc/images/mail/send.xpm
+ etc/images/mail/spam.xpm
+License: GPL-2+
+
+Files: etc/publicsuffix.txt
+License: MPL-2.0
+
+File: lisp/obsolete/meese.el
+License: meese.el license
+ This is in the public domain on account of being distributed since
+ 1985 or 1986 without a copyright notice.
+
+ This file is part of GNU Emacs.
+
+File: m4/gnulib-comp.m4
+License: gnulib-comp.m4 license
+ This file 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 3 of the License, or
+ (at your option) any later version.
+
+ This file 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 this file. If not, see <http://www.gnu.org/licenses/>.
+
+ As a special exception to the GNU General Public License, this file
+ may be distributed as part of a program that contains a
+ configuration script generated by Autoconf, under the same
+ distribution terms as the rest of that program.
+
+File: m4/pkg.m4
+License: pkg.m4 license
+ This program 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 2 of the License, or
+ (at your option) any later version.
+
+ This program 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 this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA.
+
+ As a special exception to the GNU General Public License, if you
+ distribute this file as part of a program that contains a
+ configuration script generated by Autoconf, you may include it under
+ the same distribution terms that you use for the rest of that
+ program.
+
+File: m4/*
+License: m4 license
+ This file is free software; the Free Software Foundation gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+File: msdos/sedadmin.inp
+License: sedadmin.inp license
+ This file is part of GNU Emacs.
+
+ This file is free software; as a special exception, the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This program 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.
+
+File: nt/inc/dirent.h
+License: nt/inc/dirent.h license
+ The code here is forced by the interface, and is not subject to
+ copyright, constituting the only possible expression of the
+ algorithm in this format.
+
+License: MPL-2.0
+ Mozilla Public License Version 2.0
+ ==================================
+
+ 1. Definitions
+ --------------
+
+ 1.1. "Contributor"
+ means each individual or legal entity that creates, contributes to
+ the creation of, or owns Covered Software.
+
+ 1.2. "Contributor Version"
+ means the combination of the Contributions of others (if any) used
+ by a Contributor and that particular Contributor's Contribution.
+
+ 1.3. "Contribution"
+ means Covered Software of a particular Contributor.
+
+ 1.4. "Covered Software"
+ means Source Code Form to which the initial Contributor has attached
+ the notice in Exhibit A, the Executable Form of such Source Code
+ Form, and Modifications of such Source Code Form, in each case
+ including portions thereof.
+
+ 1.5. "Incompatible With Secondary Licenses"
+ means
+
+ (a) that the initial Contributor has attached the notice described
+ in Exhibit B to the Covered Software; or
+
+ (b) that the Covered Software was made available under the terms of
+ version 1.1 or earlier of the License, but not also under the
+ terms of a Secondary License.
+
+ 1.6. "Executable Form"
+ means any form of the work other than Source Code Form.
+
+ 1.7. "Larger Work"
+ means a work that combines Covered Software with other material, in
+ a separate file or files, that is not Covered Software.
+
+ 1.8. "License"
+ means this document.
+
+ 1.9. "Licensable"
+ means having the right to grant, to the maximum extent possible,
+ whether at the time of the initial grant or subsequently, any and
+ all of the rights conveyed by this License.
+
+ 1.10. "Modifications"
+ means any of the following:
+
+ (a) any file in Source Code Form that results from an addition to,
+ deletion from, or modification of the contents of Covered
+ Software; or
+
+ (b) any new file in Source Code Form that contains any Covered
+ Software.
+
+ 1.11. "Patent Claims" of a Contributor
+ means any patent claim(s), including without limitation, method,
+ process, and apparatus claims, in any patent Licensable by such
+ Contributor that would be infringed, but for the grant of the
+ License, by the making, using, selling, offering for sale, having
+ made, import, or transfer of either its Contributions or its
+ Contributor Version.
+
+ 1.12. "Secondary License"
+ means either the GNU General Public License, Version 2.0, the GNU
+ Lesser General Public License, Version 2.1, the GNU Affero General
+ Public License, Version 3.0, or any later versions of those
+ licenses.
+
+ 1.13. "Source Code Form"
+ means the form of the work preferred for making modifications.
+
+ 1.14. "You" (or "Your")
+ means an individual or a legal entity exercising rights under this
+ License. For legal entities, "You" includes any entity that
+ controls, is controlled by, or is under common control with You. For
+ purposes of this definition, "control" means (a) the power, direct
+ or indirect, to cause the direction or management of such entity,
+ whether by contract or otherwise, or (b) ownership of more than
+ fifty percent (50%) of the outstanding shares or beneficial
+ ownership of such entity.
+
+ 2. License Grants and Conditions
+ --------------------------------
+
+ 2.1. Grants
+
+ Each Contributor hereby grants You a world-wide, royalty-free,
+ non-exclusive license:
+
+ (a) under intellectual property rights (other than patent or trademark)
+ Licensable by such Contributor to use, reproduce, make available,
+ modify, display, perform, distribute, and otherwise exploit its
+ Contributions, either on an unmodified basis, with Modifications, or
+ as part of a Larger Work; and
+
+ (b) under Patent Claims of such Contributor to make, use, sell, offer
+ for sale, have made, import, and otherwise transfer either its
+ Contributions or its Contributor Version.
+
+ 2.2. Effective Date
+
+ The licenses granted in Section 2.1 with respect to any Contribution
+ become effective for each Contribution on the date the Contributor first
+ distributes such Contribution.
+
+ 2.3. Limitations on Grant Scope
+
+ The licenses granted in this Section 2 are the only rights granted under
+ this License. No additional rights or licenses will be implied from the
+ distribution or licensing of Covered Software under this License.
+ Notwithstanding Section 2.1(b) above, no patent license is granted by a
+ Contributor:
+
+ (a) for any code that a Contributor has removed from Covered Software;
+ or
+
+ (b) for infringements caused by: (i) Your and any other third party's
+ modifications of Covered Software, or (ii) the combination of its
+ Contributions with other software (except as part of its Contributor
+ Version); or
+
+ (c) under Patent Claims infringed by Covered Software in the absence of
+ its Contributions.
+
+ This License does not grant any rights in the trademarks, service marks,
+ or logos of any Contributor (except as may be necessary to comply with
+ the notice requirements in Section 3.4).
+
+ 2.4. Subsequent Licenses
+
+ No Contributor makes additional grants as a result of Your choice to
+ distribute the Covered Software under a subsequent version of this
+ License (see Section 10.2) or under the terms of a Secondary License (if
+ permitted under the terms of Section 3.3).
+
+ 2.5. Representation
+
+ Each Contributor represents that the Contributor believes its
+ Contributions are its original creation(s) or it has sufficient rights
+ to grant the rights to its Contributions conveyed by this License.
+
+ 2.6. Fair Use
+
+ This License is not intended to limit any rights You have under
+ applicable copyright doctrines of fair use, fair dealing, or other
+ equivalents.
+
+ 2.7. Conditions
+
+ Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+ in Section 2.1.
+
+ 3. Responsibilities
+ -------------------
+
+ 3.1. Distribution of Source Form
+
+ All distribution of Covered Software in Source Code Form, including any
+ Modifications that You create or to which You contribute, must be under
+ the terms of this License. You must inform recipients that the Source
+ Code Form of the Covered Software is governed by the terms of this
+ License, and how they can obtain a copy of this License. You may not
+ attempt to alter or restrict the recipients' rights in the Source Code
+ Form.
+
+ 3.2. Distribution of Executable Form
+
+ If You distribute Covered Software in Executable Form then:
+
+ (a) such Covered Software must also be made available in Source Code
+ Form, as described in Section 3.1, and You must inform recipients of
+ the Executable Form how they can obtain a copy of such Source Code
+ Form by reasonable means in a timely manner, at a charge no more
+ than the cost of distribution to the recipient; and
+
+ (b) You may distribute such Executable Form under the terms of this
+ License, or sublicense it under different terms, provided that the
+ license for the Executable Form does not attempt to limit or alter
+ the recipients' rights in the Source Code Form under this License.
+
+ 3.3. Distribution of a Larger Work
+
+ You may create and distribute a Larger Work under terms of Your choice,
+ provided that You also comply with the requirements of this License for
+ the Covered Software. If the Larger Work is a combination of Covered
+ Software with a work governed by one or more Secondary Licenses, and the
+ Covered Software is not Incompatible With Secondary Licenses, this
+ License permits You to additionally distribute such Covered Software
+ under the terms of such Secondary License(s), so that the recipient of
+ the Larger Work may, at their option, further distribute the Covered
+ Software under the terms of either this License or such Secondary
+ License(s).
+
+ 3.4. Notices
+
+ You may not remove or alter the substance of any license notices
+ (including copyright notices, patent notices, disclaimers of warranty,
+ or limitations of liability) contained within the Source Code Form of
+ the Covered Software, except that You may alter any license notices to
+ the extent required to remedy known factual inaccuracies.
+
+ 3.5. Application of Additional Terms
+
+ You may choose to offer, and to charge a fee for, warranty, support,
+ indemnity or liability obligations to one or more recipients of Covered
+ Software. However, You may do so only on Your own behalf, and not on
+ behalf of any Contributor. You must make it absolutely clear that any
+ such warranty, support, indemnity, or liability obligation is offered by
+ You alone, and You hereby agree to indemnify every Contributor for any
+ liability incurred by such Contributor as a result of warranty, support,
+ indemnity or liability terms You offer. You may include additional
+ disclaimers of warranty and limitations of liability specific to any
+ jurisdiction.
+
+ 4. Inability to Comply Due to Statute or Regulation
+ ---------------------------------------------------
+
+ If it is impossible for You to comply with any of the terms of this
+ License with respect to some or all of the Covered Software due to
+ statute, judicial order, or regulation then You must: (a) comply with
+ the terms of this License to the maximum extent possible; and (b)
+ describe the limitations and the code they affect. Such description must
+ be placed in a text file included with all distributions of the Covered
+ Software under this License. Except to the extent prohibited by statute
+ or regulation, such description must be sufficiently detailed for a
+ recipient of ordinary skill to be able to understand it.
+
+ 5. Termination
+ --------------
+
+ 5.1. The rights granted under this License will terminate automatically
+ if You fail to comply with any of its terms. However, if You become
+ compliant, then the rights granted under this License from a particular
+ Contributor are reinstated (a) provisionally, unless and until such
+ Contributor explicitly and finally terminates Your grants, and (b) on an
+ ongoing basis, if such Contributor fails to notify You of the
+ non-compliance by some reasonable means prior to 60 days after You have
+ come back into compliance. Moreover, Your grants from a particular
+ Contributor are reinstated on an ongoing basis if such Contributor
+ notifies You of the non-compliance by some reasonable means, this is the
+ first time You have received notice of non-compliance with this License
+ from such Contributor, and You become compliant prior to 30 days after
+ Your receipt of the notice.
+
+ 5.2. If You initiate litigation against any entity by asserting a patent
+ infringement claim (excluding declaratory judgment actions,
+ counter-claims, and cross-claims) alleging that a Contributor Version
+ directly or indirectly infringes any patent, then the rights granted to
+ You by any and all Contributors for the Covered Software under Section
+ 2.1 of this License shall terminate.
+
+ 5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+ end user license agreements (excluding distributors and resellers) which
+ have been validly granted by You or Your distributors under this License
+ prior to termination shall survive termination.
+
+ ************************************************************************
+ * *
+ * 6. Disclaimer of Warranty *
+ * ------------------------- *
+ * *
+ * Covered Software is provided under this License on an "as is" *
+ * basis, without warranty of any kind, either expressed, implied, or *
+ * statutory, including, without limitation, warranties that the *
+ * Covered Software is free of defects, merchantable, fit for a *
+ * particular purpose or non-infringing. The entire risk as to the *
+ * quality and performance of the Covered Software is with You. *
+ * Should any Covered Software prove defective in any respect, You *
+ * (not any Contributor) assume the cost of any necessary servicing, *
+ * repair, or correction. This disclaimer of warranty constitutes an *
+ * essential part of this License. No use of any Covered Software is *
+ * authorized under this License except under this disclaimer. *
+ * *
+ ************************************************************************
+
+ ************************************************************************
+ * *
+ * 7. Limitation of Liability *
+ * -------------------------- *
+ * *
+ * Under no circumstances and under no legal theory, whether tort *
+ * (including negligence), contract, or otherwise, shall any *
+ * Contributor, or anyone who distributes Covered Software as *
+ * permitted above, be liable to You for any direct, indirect, *
+ * special, incidental, or consequential damages of any character *
+ * including, without limitation, damages for lost profits, loss of *
+ * goodwill, work stoppage, computer failure or malfunction, or any *
+ * and all other commercial damages or losses, even if such party *
+ * shall have been informed of the possibility of such damages. This *
+ * limitation of liability shall not apply to liability for death or *
+ * personal injury resulting from such party's negligence to the *
+ * extent applicable law prohibits such limitation. Some *
+ * jurisdictions do not allow the exclusion or limitation of *
+ * incidental or consequential damages, so this exclusion and *
+ * limitation may not apply to You. *
+ * *
+ ************************************************************************
+
+ 8. Litigation
+ -------------
+
+ Any litigation relating to this License may be brought only in the
+ courts of a jurisdiction where the defendant maintains its principal
+ place of business and such litigation shall be governed by laws of that
+ jurisdiction, without reference to its conflict-of-law provisions.
+ Nothing in this Section shall prevent a party's ability to bring
+ cross-claims or counter-claims.
+
+ 9. Miscellaneous
+ ----------------
+
+ This License represents the complete agreement concerning the subject
+ matter hereof. If any provision of this License is held to be
+ unenforceable, such provision shall be reformed only to the extent
+ necessary to make it enforceable. Any law or regulation which provides
+ that the language of a contract shall be construed against the drafter
+ shall not be used to construe this License against a Contributor.
+
+ 10. Versions of the License
+ ---------------------------
+
+ 10.1. New Versions
+
+ Mozilla Foundation is the license steward. Except as provided in Section
+ 10.3, no one other than the license steward has the right to modify or
+ publish new versions of this License. Each version will be given a
+ distinguishing version number.
+
+ 10.2. Effect of New Versions
+
+ You may distribute the Covered Software under the terms of the version
+ of the License under which You originally received the Covered Software,
+ or under the terms of any subsequent version published by the license
+ steward.
+
+ 10.3. Modified Versions
+
+ If you create software not governed by this License, and you want to
+ create a new license for such software, you may create and use a
+ modified version of this License if you rename the license and remove
+ any references to the name of the license steward (except to note that
+ such modified license differs from this License).
+
+ 10.4. Distributing Source Code Form that is Incompatible With Secondary
+ Licenses
+
+ If You choose to distribute Source Code Form that is Incompatible With
+ Secondary Licenses under the terms of this version of the License, the
+ notice described in Exhibit B of this License must be attached.
+
+ Exhibit A - Source Code Form License Notice
+ -------------------------------------------
+
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+ If it is not possible or desirable to put the notice in a particular
+ file, then You may include the notice in a location (such as a LICENSE
+ file in a relevant directory) where a recipient would be likely to look
+ for such a notice.
+
+ You may add additional accurate notices of copyright ownership.
+
+ Exhibit B - "Incompatible With Secondary Licenses" Notice
+ ---------------------------------------------------------
+
+ This Source Code Form is "Incompatible With Secondary Licenses", as
+ defined by the Mozilla Public License, v. 2.0.
+
+License: manpage license
+ Permission is granted to make and distribute verbatim copies of this
+ document provided the copyright notice and this permission notice
+ are preserved on all copies.
+
+ Permission is granted to copy and distribute modified versions of
+ this document under the conditions for verbatim copying, provided
+ that the entire resulting derived work is distributed under the
+ terms of a permission notice identical to this one.
+
+ Permission is granted to copy and distribute translations of this
+ document into another language, under the above conditions for
+ modified versions, except that this permission notice may be stated
+ in a translation approved by the Free Software Foundation.
--- /dev/null
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Emacs
+Upstream-Contact: bug-gnu-emacs@gnu.org
+Upstream-Contact: emacs-devel@gnu.org
+Source: https://savannah.gnu.org/projects/emacs
+Comment:
+ This package was debianized by Rob Browning <rlb@defaultvalue.org>
+ on Tue, 16 Dec 1997 00:05:45 -0600.
+
+ The original source for this package can be found at
+ git://git.savannah.gnu.org/emacs.git under the
+ emacs-@UPSTREAM_VERSION@ tag. That tag was used to create the
+ Debian upstream archive (@DEB_FLAVOR@_@DEBSRC_VERSION@.orig.tar.xz)
+ after making adjustments to comply with the DFSG (see below).
+
+ Please see /usr/share/doc/@DEB_FLAVOR@-common/README.Debian.gz for a
+ description of the Debian specific differences from the upstream
+ version.
+
+ As mentioned there, some files (including some of the Emacs
+ documentation) have been removed from this package because their
+ licenses do not appear to satisfy the requirements of the Debian
+ Free Software Guidelines (DFSG). See
+ http://www.debian.org/social_contract.
+
+ In particular, some of the info pages are covered under the GNU Free
+ Documentation License (GFDL), which Debian has decided does not
+ satisfy the DFSG in cases where "Invariant Sections" are specified
+ (this includes front and back cover texts). See this Debian General
+ Resolution on the topic: http://www.debian.org/vote/2006/vote_001.
+
+ Some other files have been removed because their license only allows
+ verbatim copying, or because there was some other question.
+
+ Please see the files themselves for the relevant Copyright dates.
+
+Files: *
+License: GPL-3+
+
+Files: debian/rules
+License: GPL plus Ian
+ This file is licensed under the terms of the Gnu Public License.
+ With the one additional provision that Ian Jackson's name may not be
+ removed from the file.
+
+Files: doc/man/ebrowse.1
+License: manpage license
+
+Files: doc/man/emacs.1
+License: manpage license
+
+Files: doc/man/etags.1
+License: manpage license
+
+Files: doc/misc/efaq.texi
+License: efaq.texi license
+ This list of frequently asked questions about GNU Emacs with answers
+ (``FAQ'') may be translated into other languages, transformed into
+ other formats (e.g., Texinfo, Info, WWW, WAIS), and updated with new
+ information.
+
+ The same conditions apply to any derivative of the FAQ as apply to
+ the FAQ itself. Every copy of the FAQ must include this notice or
+ an approved translation, information on who is currently maintaining
+ the FAQ and how to contact them (including their e-mail address),
+ and information on where the latest version of the FAQ is archived
+ (including FTP information).
+
+ The FAQ may be copied and redistributed under these conditions,
+ except that the FAQ may not be embedded in a larger literary work
+ unless that work itself allows free copying and redistribution.
+
+ [This version has been heavily edited since it was included in the
+ Emacs distribution.]
+
+Files: doc/misc/efaq-w32.texi
+License: efaq-w32.texi license
+ This list of frequently asked questions about GNU Emacs on MS
+ Windows with answers (``FAQ'') may be translated into other
+ languages, transformed into other formats (e.g., Texinfo, Info,
+ WWW), and updated with new information.
+
+ The same conditions apply to any derivative of the FAQ as apply to
+ the FAQ itself. Every copy of the FAQ must include this notice or
+ an approved translation, information on who is currently maintaining
+ the FAQ and how to contact them (including their e-mail address),
+ and information on where the latest version of the FAQ is archived
+ (including FTP information).
+
+ The FAQ may be copied and redistributed under these conditions,
+ except that the FAQ may not be embedded in a larger literary work
+ unless that work itself allows free copying and redistribution.
+
+Files:
+ etc/images/back-arrow.pbm
+ etc/images/back-arrow.xpm
+ etc/images/close.pbm
+ etc/images/close.xpm
+ etc/images/copy.pbm
+ etc/images/copy.xpm
+ etc/images/cut.pbm
+ etc/images/cut.xpm
+ etc/images/diropen.pbm
+ etc/images/diropen.xpm
+ etc/images/fwd-arrow.pbm
+ etc/images/fwd-arrow.xpm
+ etc/images/help.pbm
+ etc/images/help.xpm
+ etc/images/home.pbm
+ etc/images/home.xpm
+ etc/images/index.pbm
+ etc/images/index.xpm
+ etc/images/info.pbm
+ etc/images/info.pbm
+ etc/images/info.pbm
+ etc/images/info.xpm
+ etc/images/jump-to.pbm
+ etc/images/jump-to.xpm
+ etc/images/left-arrow.pbm
+ etc/images/left-arrow.xpm
+ etc/images/new.pbm
+ etc/images/new.xpm
+ etc/images/open.pbm
+ etc/images/open.xpm
+ etc/images/paste.pbm
+ etc/images/paste.xpm
+ etc/images/preferences.pbm
+ etc/images/preferences.xpm
+ etc/images/print.pbm
+ etc/images/print.xpm
+ etc/images/refresh.pbm
+ etc/images/refresh.xpm
+ etc/images/right-arrow.pbm
+ etc/images/right-arrow.xpm
+ etc/images/save.pbm
+ etc/images/save.xpm
+ etc/images/saveas.pbm
+ etc/images/saveas.xpm
+ etc/images/search.pbm
+ etc/images/search.xpm
+ etc/images/sort-ascending.pbm
+ etc/images/sort-ascending.xpm
+ etc/images/sort-descending.pbm
+ etc/images/sort-descending.xpm
+ etc/images/spell.pbm
+ etc/images/spell.xpm
+ etc/images/undo.pbm
+ etc/images/undo.xpm
+ etc/images/up-arrow.pbm
+ etc/images/up-arrow.xpm
+License: LGPL-2+
+
+Files:
+ etc/images/attach.pbm
+ etc/images/attach.xpm
+ etc/images/bookmark_add.pbm
+ etc/images/bookmark_add.xpm
+ etc/images/cancel.pbm
+ etc/images/cancel.xpm
+ etc/images/connect.pbm
+ etc/images/connect.xpm
+ etc/images/contact.pbm
+ etc/images/contact.xpm
+ etc/images/data-save.pbm
+ etc/images/data-save.xpm
+ etc/images/delete.pbm
+ etc/images/delete.xpm
+ etc/images/describe.pbm
+ etc/images/describe.xpm
+ etc/images/disconnect.pbm
+ etc/images/disconnect.xpm
+ etc/images/exit.pbm
+ etc/images/exit.xpm
+ etc/images/lock-broken.pbm
+ etc/images/lock-broken.xpm
+ etc/images/lock-ok.pbm
+ etc/images/lock-ok.xpm
+ etc/images/lock.pbm
+ etc/images/lock.xpm
+ etc/images/next-node.pbm
+ etc/images/next-node.xpm
+ etc/images/next-page.pbm
+ etc/images/next-page.xpm
+ etc/images/prev-node.pbm
+ etc/images/prev-node.xpm
+ etc/images/redo.pbm
+ etc/images/redo.xpm
+ etc/images/refresh.pbm
+ etc/images/refresh.xpm
+ etc/images/search-replace.pbm
+ etc/images/search-replace.xpm
+ etc/images/separator.pbm
+ etc/images/separator.xpm
+ etc/images/show.pbm
+ etc/images/show.xpm
+ etc/images/sort-ascending.pbm
+ etc/images/sort-ascending.xpm
+ etc/images/sort-column-ascending.pbm
+ etc/images/sort-column-ascending.xpm
+ etc/images/sort-criteria.pbm
+ etc/images/sort-criteria.xpm
+ etc/images/sort-descending.pbm
+ etc/images/sort-descending.xpm
+ etc/images/sort-row-ascending.pbm
+ etc/images/sort-row-ascending.xpm
+ etc/images/up-node.pbm
+ etc/images/up-node.xpm
+ etc/images/zoom-in.pbm
+ etc/images/zoom-in.xpm
+ etc/images/zoom-out.pbm
+ etc/images/zoom-out.xpm
+License: GPL-2+
+
+Files: etc/images/low-color/*
+License: same as corresponding file in /etc/images
+ The images in the low-color/ subdirectory are low-color versions of
+ the files of the same name in etc/images directory, and are subject
+ to the same conditions.
+
+Files:
+ etc/images/gnus/kill-group.pbm
+ etc/images/gnus/kill-group.xpm
+ etc/images/gnus/mail-send.xpm
+ etc/images/gnus/rot13.pbm
+ etc/images/gnus/rot13.xpm
+ etc/images/gnus/toggle-subscription.xpm
+License: GPL-2+
+
+Files:
+ etc/images/mail/compose.pbm
+ etc/images/mail/compose.xpm
+ etc/images/mail/copy.pbm
+ etc/images/mail/copy.xpm
+ etc/images/mail/flag-for-followup.pbm
+ etc/images/mail/flag-for-followup.xpm
+ etc/images/mail/forward.pbm
+ etc/images/mail/forward.xpm
+ etc/images/mail/inbox.pbm
+ etc/images/mail/inbox.xpm
+ etc/images/mail/move.pbm
+ etc/images/mail/move.xpm
+ etc/images/mail/not-spam.pbm
+ etc/images/mail/not-spam.xpm
+ etc/images/mail/outbox.pbm
+ etc/images/mail/outbox.xpm
+ etc/images/mail/preview.pbm
+ etc/images/mail/preview.xpm
+ etc/images/mail/repack.pbm
+ etc/images/mail/repack.xpm
+ etc/images/mail/reply-all.pbm
+ etc/images/mail/reply-all.xpm
+ etc/images/mail/reply-from.pbm
+ etc/images/mail/reply-from.xpm
+ etc/images/mail/reply-to.pbm
+ etc/images/mail/reply-to.xpm
+ etc/images/mail/reply.pbm
+ etc/images/mail/reply.xpm
+ etc/images/mail/save-draft.pbm
+ etc/images/mail/save-draft.xpm
+ etc/images/mail/save.xpm
+ etc/images/mail/send.pbm
+ etc/images/mail/send.xpm
+ etc/images/mail/spam.xpm
+License: GPL-2+
+
+Files: etc/publicsuffix.txt
+License: MPL-2.0
+
+File: lisp/obsolete/meese.el
+License: meese.el license
+ This is in the public domain on account of being distributed since
+ 1985 or 1986 without a copyright notice.
+
+ This file is part of GNU Emacs.
+
+File: m4/gnulib-comp.m4
+License: gnulib-comp.m4 license
+ This file 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 3 of the License, or
+ (at your option) any later version.
+
+ This file 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 this file. If not, see <http://www.gnu.org/licenses/>.
+
+ As a special exception to the GNU General Public License, this file
+ may be distributed as part of a program that contains a
+ configuration script generated by Autoconf, under the same
+ distribution terms as the rest of that program.
+
+File: m4/pkg.m4
+License: pkg.m4 license
+ This program 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 2 of the License, or
+ (at your option) any later version.
+
+ This program 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 this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA.
+
+ As a special exception to the GNU General Public License, if you
+ distribute this file as part of a program that contains a
+ configuration script generated by Autoconf, you may include it under
+ the same distribution terms that you use for the rest of that
+ program.
+
+File: m4/*
+License: m4 license
+ This file is free software; the Free Software Foundation gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+File: msdos/sedadmin.inp
+License: sedadmin.inp license
+ This file is part of GNU Emacs.
+
+ This file is free software; as a special exception, the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+
+ This program 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.
+
+File: nt/inc/dirent.h
+License: nt/inc/dirent.h license
+ The code here is forced by the interface, and is not subject to
+ copyright, constituting the only possible expression of the
+ algorithm in this format.
+
+License: MPL-2.0
+ Mozilla Public License Version 2.0
+ ==================================
+
+ 1. Definitions
+ --------------
+
+ 1.1. "Contributor"
+ means each individual or legal entity that creates, contributes to
+ the creation of, or owns Covered Software.
+
+ 1.2. "Contributor Version"
+ means the combination of the Contributions of others (if any) used
+ by a Contributor and that particular Contributor's Contribution.
+
+ 1.3. "Contribution"
+ means Covered Software of a particular Contributor.
+
+ 1.4. "Covered Software"
+ means Source Code Form to which the initial Contributor has attached
+ the notice in Exhibit A, the Executable Form of such Source Code
+ Form, and Modifications of such Source Code Form, in each case
+ including portions thereof.
+
+ 1.5. "Incompatible With Secondary Licenses"
+ means
+
+ (a) that the initial Contributor has attached the notice described
+ in Exhibit B to the Covered Software; or
+
+ (b) that the Covered Software was made available under the terms of
+ version 1.1 or earlier of the License, but not also under the
+ terms of a Secondary License.
+
+ 1.6. "Executable Form"
+ means any form of the work other than Source Code Form.
+
+ 1.7. "Larger Work"
+ means a work that combines Covered Software with other material, in
+ a separate file or files, that is not Covered Software.
+
+ 1.8. "License"
+ means this document.
+
+ 1.9. "Licensable"
+ means having the right to grant, to the maximum extent possible,
+ whether at the time of the initial grant or subsequently, any and
+ all of the rights conveyed by this License.
+
+ 1.10. "Modifications"
+ means any of the following:
+
+ (a) any file in Source Code Form that results from an addition to,
+ deletion from, or modification of the contents of Covered
+ Software; or
+
+ (b) any new file in Source Code Form that contains any Covered
+ Software.
+
+ 1.11. "Patent Claims" of a Contributor
+ means any patent claim(s), including without limitation, method,
+ process, and apparatus claims, in any patent Licensable by such
+ Contributor that would be infringed, but for the grant of the
+ License, by the making, using, selling, offering for sale, having
+ made, import, or transfer of either its Contributions or its
+ Contributor Version.
+
+ 1.12. "Secondary License"
+ means either the GNU General Public License, Version 2.0, the GNU
+ Lesser General Public License, Version 2.1, the GNU Affero General
+ Public License, Version 3.0, or any later versions of those
+ licenses.
+
+ 1.13. "Source Code Form"
+ means the form of the work preferred for making modifications.
+
+ 1.14. "You" (or "Your")
+ means an individual or a legal entity exercising rights under this
+ License. For legal entities, "You" includes any entity that
+ controls, is controlled by, or is under common control with You. For
+ purposes of this definition, "control" means (a) the power, direct
+ or indirect, to cause the direction or management of such entity,
+ whether by contract or otherwise, or (b) ownership of more than
+ fifty percent (50%) of the outstanding shares or beneficial
+ ownership of such entity.
+
+ 2. License Grants and Conditions
+ --------------------------------
+
+ 2.1. Grants
+
+ Each Contributor hereby grants You a world-wide, royalty-free,
+ non-exclusive license:
+
+ (a) under intellectual property rights (other than patent or trademark)
+ Licensable by such Contributor to use, reproduce, make available,
+ modify, display, perform, distribute, and otherwise exploit its
+ Contributions, either on an unmodified basis, with Modifications, or
+ as part of a Larger Work; and
+
+ (b) under Patent Claims of such Contributor to make, use, sell, offer
+ for sale, have made, import, and otherwise transfer either its
+ Contributions or its Contributor Version.
+
+ 2.2. Effective Date
+
+ The licenses granted in Section 2.1 with respect to any Contribution
+ become effective for each Contribution on the date the Contributor first
+ distributes such Contribution.
+
+ 2.3. Limitations on Grant Scope
+
+ The licenses granted in this Section 2 are the only rights granted under
+ this License. No additional rights or licenses will be implied from the
+ distribution or licensing of Covered Software under this License.
+ Notwithstanding Section 2.1(b) above, no patent license is granted by a
+ Contributor:
+
+ (a) for any code that a Contributor has removed from Covered Software;
+ or
+
+ (b) for infringements caused by: (i) Your and any other third party's
+ modifications of Covered Software, or (ii) the combination of its
+ Contributions with other software (except as part of its Contributor
+ Version); or
+
+ (c) under Patent Claims infringed by Covered Software in the absence of
+ its Contributions.
+
+ This License does not grant any rights in the trademarks, service marks,
+ or logos of any Contributor (except as may be necessary to comply with
+ the notice requirements in Section 3.4).
+
+ 2.4. Subsequent Licenses
+
+ No Contributor makes additional grants as a result of Your choice to
+ distribute the Covered Software under a subsequent version of this
+ License (see Section 10.2) or under the terms of a Secondary License (if
+ permitted under the terms of Section 3.3).
+
+ 2.5. Representation
+
+ Each Contributor represents that the Contributor believes its
+ Contributions are its original creation(s) or it has sufficient rights
+ to grant the rights to its Contributions conveyed by this License.
+
+ 2.6. Fair Use
+
+ This License is not intended to limit any rights You have under
+ applicable copyright doctrines of fair use, fair dealing, or other
+ equivalents.
+
+ 2.7. Conditions
+
+ Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+ in Section 2.1.
+
+ 3. Responsibilities
+ -------------------
+
+ 3.1. Distribution of Source Form
+
+ All distribution of Covered Software in Source Code Form, including any
+ Modifications that You create or to which You contribute, must be under
+ the terms of this License. You must inform recipients that the Source
+ Code Form of the Covered Software is governed by the terms of this
+ License, and how they can obtain a copy of this License. You may not
+ attempt to alter or restrict the recipients' rights in the Source Code
+ Form.
+
+ 3.2. Distribution of Executable Form
+
+ If You distribute Covered Software in Executable Form then:
+
+ (a) such Covered Software must also be made available in Source Code
+ Form, as described in Section 3.1, and You must inform recipients of
+ the Executable Form how they can obtain a copy of such Source Code
+ Form by reasonable means in a timely manner, at a charge no more
+ than the cost of distribution to the recipient; and
+
+ (b) You may distribute such Executable Form under the terms of this
+ License, or sublicense it under different terms, provided that the
+ license for the Executable Form does not attempt to limit or alter
+ the recipients' rights in the Source Code Form under this License.
+
+ 3.3. Distribution of a Larger Work
+
+ You may create and distribute a Larger Work under terms of Your choice,
+ provided that You also comply with the requirements of this License for
+ the Covered Software. If the Larger Work is a combination of Covered
+ Software with a work governed by one or more Secondary Licenses, and the
+ Covered Software is not Incompatible With Secondary Licenses, this
+ License permits You to additionally distribute such Covered Software
+ under the terms of such Secondary License(s), so that the recipient of
+ the Larger Work may, at their option, further distribute the Covered
+ Software under the terms of either this License or such Secondary
+ License(s).
+
+ 3.4. Notices
+
+ You may not remove or alter the substance of any license notices
+ (including copyright notices, patent notices, disclaimers of warranty,
+ or limitations of liability) contained within the Source Code Form of
+ the Covered Software, except that You may alter any license notices to
+ the extent required to remedy known factual inaccuracies.
+
+ 3.5. Application of Additional Terms
+
+ You may choose to offer, and to charge a fee for, warranty, support,
+ indemnity or liability obligations to one or more recipients of Covered
+ Software. However, You may do so only on Your own behalf, and not on
+ behalf of any Contributor. You must make it absolutely clear that any
+ such warranty, support, indemnity, or liability obligation is offered by
+ You alone, and You hereby agree to indemnify every Contributor for any
+ liability incurred by such Contributor as a result of warranty, support,
+ indemnity or liability terms You offer. You may include additional
+ disclaimers of warranty and limitations of liability specific to any
+ jurisdiction.
+
+ 4. Inability to Comply Due to Statute or Regulation
+ ---------------------------------------------------
+
+ If it is impossible for You to comply with any of the terms of this
+ License with respect to some or all of the Covered Software due to
+ statute, judicial order, or regulation then You must: (a) comply with
+ the terms of this License to the maximum extent possible; and (b)
+ describe the limitations and the code they affect. Such description must
+ be placed in a text file included with all distributions of the Covered
+ Software under this License. Except to the extent prohibited by statute
+ or regulation, such description must be sufficiently detailed for a
+ recipient of ordinary skill to be able to understand it.
+
+ 5. Termination
+ --------------
+
+ 5.1. The rights granted under this License will terminate automatically
+ if You fail to comply with any of its terms. However, if You become
+ compliant, then the rights granted under this License from a particular
+ Contributor are reinstated (a) provisionally, unless and until such
+ Contributor explicitly and finally terminates Your grants, and (b) on an
+ ongoing basis, if such Contributor fails to notify You of the
+ non-compliance by some reasonable means prior to 60 days after You have
+ come back into compliance. Moreover, Your grants from a particular
+ Contributor are reinstated on an ongoing basis if such Contributor
+ notifies You of the non-compliance by some reasonable means, this is the
+ first time You have received notice of non-compliance with this License
+ from such Contributor, and You become compliant prior to 30 days after
+ Your receipt of the notice.
+
+ 5.2. If You initiate litigation against any entity by asserting a patent
+ infringement claim (excluding declaratory judgment actions,
+ counter-claims, and cross-claims) alleging that a Contributor Version
+ directly or indirectly infringes any patent, then the rights granted to
+ You by any and all Contributors for the Covered Software under Section
+ 2.1 of this License shall terminate.
+
+ 5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+ end user license agreements (excluding distributors and resellers) which
+ have been validly granted by You or Your distributors under this License
+ prior to termination shall survive termination.
+
+ ************************************************************************
+ * *
+ * 6. Disclaimer of Warranty *
+ * ------------------------- *
+ * *
+ * Covered Software is provided under this License on an "as is" *
+ * basis, without warranty of any kind, either expressed, implied, or *
+ * statutory, including, without limitation, warranties that the *
+ * Covered Software is free of defects, merchantable, fit for a *
+ * particular purpose or non-infringing. The entire risk as to the *
+ * quality and performance of the Covered Software is with You. *
+ * Should any Covered Software prove defective in any respect, You *
+ * (not any Contributor) assume the cost of any necessary servicing, *
+ * repair, or correction. This disclaimer of warranty constitutes an *
+ * essential part of this License. No use of any Covered Software is *
+ * authorized under this License except under this disclaimer. *
+ * *
+ ************************************************************************
+
+ ************************************************************************
+ * *
+ * 7. Limitation of Liability *
+ * -------------------------- *
+ * *
+ * Under no circumstances and under no legal theory, whether tort *
+ * (including negligence), contract, or otherwise, shall any *
+ * Contributor, or anyone who distributes Covered Software as *
+ * permitted above, be liable to You for any direct, indirect, *
+ * special, incidental, or consequential damages of any character *
+ * including, without limitation, damages for lost profits, loss of *
+ * goodwill, work stoppage, computer failure or malfunction, or any *
+ * and all other commercial damages or losses, even if such party *
+ * shall have been informed of the possibility of such damages. This *
+ * limitation of liability shall not apply to liability for death or *
+ * personal injury resulting from such party's negligence to the *
+ * extent applicable law prohibits such limitation. Some *
+ * jurisdictions do not allow the exclusion or limitation of *
+ * incidental or consequential damages, so this exclusion and *
+ * limitation may not apply to You. *
+ * *
+ ************************************************************************
+
+ 8. Litigation
+ -------------
+
+ Any litigation relating to this License may be brought only in the
+ courts of a jurisdiction where the defendant maintains its principal
+ place of business and such litigation shall be governed by laws of that
+ jurisdiction, without reference to its conflict-of-law provisions.
+ Nothing in this Section shall prevent a party's ability to bring
+ cross-claims or counter-claims.
+
+ 9. Miscellaneous
+ ----------------
+
+ This License represents the complete agreement concerning the subject
+ matter hereof. If any provision of this License is held to be
+ unenforceable, such provision shall be reformed only to the extent
+ necessary to make it enforceable. Any law or regulation which provides
+ that the language of a contract shall be construed against the drafter
+ shall not be used to construe this License against a Contributor.
+
+ 10. Versions of the License
+ ---------------------------
+
+ 10.1. New Versions
+
+ Mozilla Foundation is the license steward. Except as provided in Section
+ 10.3, no one other than the license steward has the right to modify or
+ publish new versions of this License. Each version will be given a
+ distinguishing version number.
+
+ 10.2. Effect of New Versions
+
+ You may distribute the Covered Software under the terms of the version
+ of the License under which You originally received the Covered Software,
+ or under the terms of any subsequent version published by the license
+ steward.
+
+ 10.3. Modified Versions
+
+ If you create software not governed by this License, and you want to
+ create a new license for such software, you may create and use a
+ modified version of this License if you rename the license and remove
+ any references to the name of the license steward (except to note that
+ such modified license differs from this License).
+
+ 10.4. Distributing Source Code Form that is Incompatible With Secondary
+ Licenses
+
+ If You choose to distribute Source Code Form that is Incompatible With
+ Secondary Licenses under the terms of this version of the License, the
+ notice described in Exhibit B of this License must be attached.
+
+ Exhibit A - Source Code Form License Notice
+ -------------------------------------------
+
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+ If it is not possible or desirable to put the notice in a particular
+ file, then You may include the notice in a location (such as a LICENSE
+ file in a relevant directory) where a recipient would be likely to look
+ for such a notice.
+
+ You may add additional accurate notices of copyright ownership.
+
+ Exhibit B - "Incompatible With Secondary Licenses" Notice
+ ---------------------------------------------------------
+
+ This Source Code Form is "Incompatible With Secondary Licenses", as
+ defined by the Mozilla Public License, v. 2.0.
+
+License: manpage license
+ Permission is granted to make and distribute verbatim copies of this
+ document provided the copyright notice and this permission notice
+ are preserved on all copies.
+
+ Permission is granted to copy and distribute modified versions of
+ this document under the conditions for verbatim copying, provided
+ that the entire resulting derived work is distributed under the
+ terms of a permission notice identical to this one.
+
+ Permission is granted to copy and distribute translations of this
+ document into another language, under the above conditions for
+ modified versions, except that this permission notice may be stated
+ in a translation approved by the Free Software Foundation.
--- /dev/null
+@PKG_NAME@ binary: setgid-binary @MOVEMAIL_BIN@ 2755 root/mail
+@PKG_NAME@ binary: binary-without-manpage usr/bin/b2m.@DEB_FLAVOR@
+@PKG_NAME@ binary: binary-without-manpage usr/bin/ctags.@DEB_FLAVOR@
+@PKG_NAME@ binary: binary-without-manpage usr/bin/ebrowse.@DEB_FLAVOR@
+@PKG_NAME@ binary: binary-without-manpage usr/bin/emacsclient.@DEB_FLAVOR@
+@PKG_NAME@ binary: binary-without-manpage usr/bin/etags.@DEB_FLAVOR@
+@PKG_NAME@ binary: binary-without-manpage usr/bin/grep-changelog.@DEB_FLAVOR@
+@PKG_NAME@ binary: binary-without-manpage usr/bin/rcs-checkin.@DEB_FLAVOR@
--- /dev/null
+#!/bin/sh
+
+set -e
+
+FLAVOR=@DEB_FLAVOR@
+MAJOR=@MAJOR_VERSION@
+MINOR=@MINOR_VERSION@
+FULL=@FULL_VERSION@
+ALTERNATIVES="@ALTERNATIVES@"
+BIN_PRIORITY=@BIN_PRIORITY@
+
+# update-alternatives on things that collide with xemacs, other editors
+for i in ${ALTERNATIVES}
+do
+ update-alternatives \
+ --install /usr/bin/$i $i /usr/bin/$i.${FLAVOR} ${BIN_PRIORITY} \
+ --slave /usr/share/man/man1/$i.1.gz $i.1.gz \
+ /usr/share/man/man1/$i.${FLAVOR}.1.gz
+done
+
+#DEBHELPER#
--- /dev/null
+#!/bin/sh
+
+set -e
+
+FLAVOR=@DEB_FLAVOR@
+MAJOR=@MAJOR_VERSION@
+MINOR=@MINOR_VERSION@
+FULL=@FULL_VERSION@
+ALTERNATIVES="@ALTERNATIVES@"
+
+# update-alternatives on things that collide with xemacs, other editors
+if [ "$1" != "upgrade" ]
+then
+ for i in ${ALTERNATIVES}
+ do
+ update-alternatives --remove $i /usr/bin/$i.${FLAVOR}
+ done
+fi
+
+#DEBHELPER#
+
--- /dev/null
+This file details the Debian specific changes to Emacs.
+
+The following tags may be used in the sections below: Patch, Status,
+Author, Added-by, Provided-by, and Date. When known, Author is used
+to indicate the person believed to have written the relevant code.
+Provided-by may be used to indicate the person who submitted the code
+to Debian, and Added-by indicates the person who actually added the
+code to the Debian package.
+
+* The Debian copy of the upstream source contains no .elc files.
+
+ The .elc files have been removed because we always regenerate them
+ and because Emacs modifies them in the source tree during the build
+ process, even when using a VPATH build. This means that a "make
+ clean" can't easily return the tree to the upstream state, resulting
+ in a giant Debian binary diff. There are other solutions if this
+ turns out to be a problem. If nothing else, we can keep the current
+ infrastructure and just add the .elc files to protected_files in
+ debian/rules. Removing the .elc files doesn't affect whether or not
+ our source archive would match the upstream md5sum because we have
+ to repackage it anyway to add leim support.
+
+* Those who prefer the old-style scrollbars can edit debian/rules
+
+ If you prefer the old-style, non-toolkit scrollbars, just edit
+ debian/rules to add --without-toolkit-scrollbars where indicated and
+ rebuild.
+
+@@PATCH_LIST_HERE@@
+
+Local Variables:
+mode: outline
+outline-regexp: " *\\*+"
+End:
--- /dev/null
+BUGS
+README
+debian/README.add-on-package-maintainers
--- /dev/null
+@PKG_NAME@ binary: desktop-command-not-in-package /usr/share/applications/emacs.desktop emacs
--- /dev/null
+#!/bin/sh
+
+set -e
+
+MAJOR=@MAJOR_VERSION@
+MINOR=@MINOR_VERSION@
+FULL=@FULL_VERSION@
+
+# Create the site-lisp dir for this flavor if we're allowed
+
+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
+
+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
+
+#DEBHELPER#
--- /dev/null
+#!/bin/sh
+
+set -e
+
+MAJOR=@MAJOR_VERSION@
+MINOR=@MINOR_VERSION@
+FULL=@FULL_VERSION@
+
+set +e
+# Only remove these directories if they're empty.
+rmdir /usr/local/share/emacs/${FULL}/site-lisp 2>/dev/null
+rmdir /usr/local/share/emacs/${FULL} 2>/dev/null
+set -e
+
+#DEBHELPER#
--- /dev/null
+[Desktop Entry]
+Version=1.0
+Name=GNU Emacs @MENU_VERSION@ (Terminal)
+GenericName=Text Editor
+Comment=GNU Emacs is an extensible, customizable text editor - and more
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+TryExec=/usr/bin/@DEB_FLAVOR@
+Exec=/usr/bin/@DEB_FLAVOR@ -nw %F
+Icon=@DEB_FLAVOR@
+Type=Application
+Terminal=true
+Categories=Utility;Development;TextEditor;
+Keywords=Text;Editor;
--- /dev/null
+
+Please see /usr/share/doc/@PKG_NAME@-common/ as the primary
+documentation directory.
--- /dev/null
+
+Please see /usr/share/doc/emacs@MAJOR_VERSION@-common/ as the primary
+documentation directory.
--- /dev/null
+[Desktop Entry]
+Version=1.0
+Name=GNU Emacs @MENU_VERSION@ (GUI)
+GenericName=Text Editor
+Comment=GNU Emacs is an extensible, customizable text editor - and more
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+TryExec=/usr/bin/@DEB_FLAVOR@
+Exec=/usr/bin/@DEB_FLAVOR@ %F
+Icon=@DEB_FLAVOR@
+Type=Application
+Terminal=false
+Categories=Utility;Development;TextEditor;
+StartupWMClass=Emacs
+Keywords=Text;Editor;
--- /dev/null
+@PKG_NAME@ binary: menu-icon-missing usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/16x16/apps/emacs.xpm
+@PKG_NAME@ binary: menu-icon-missing usr/share/emacs/@FULL_VERSION@/etc/images/icons/hicolor/32x32/apps/emacs.xpm
--- /dev/null
+#!/bin/sh
+
+set -e
+
+FLAVOR=@DEB_FLAVOR@
+
+update-alternatives \
+ --install /usr/bin/emacs emacs \
+ /usr/bin/${FLAVOR}-@X_SUPPORT@ @BIN_PRIORITY@ \
+ --slave /usr/share/man/man1/emacs.1.gz emacs.1.gz \
+ /usr/share/man/man1/emacs.${FLAVOR}.1.gz \
+ --slave /usr/share/icons/hicolor/scalable/apps/emacs.svg emacs.svg \
+ /usr/share/icons/hicolor/scalable/apps/${FLAVOR}.svg \
+ --slave /usr/share/icons/hicolor/scalable/mimetypes/emacs-document.svg \
+ emacs-document.svg \
+ /usr/share/icons/hicolor/scalable/mimetypes/${FLAVOR}-document.svg \
+ --slave /usr/share/icons/hicolor/16x16/apps/emacs.png emacs-16x16.png \
+ /usr/share/icons/hicolor/16x16/apps/${FLAVOR}.png \
+ --slave /usr/share/icons/hicolor/24x24/apps/emacs.png emacs-24x24.png \
+ /usr/share/icons/hicolor/24x24/apps/${FLAVOR}.png \
+ --slave /usr/share/icons/hicolor/32x32/apps/emacs.png emacs-32x32.png \
+ /usr/share/icons/hicolor/32x32/apps/${FLAVOR}.png \
+ --slave /usr/share/icons/hicolor/48x48/apps/emacs.png emacs-48x48.png \
+ /usr/share/icons/hicolor/48x48/apps/${FLAVOR}.png \
+ --slave /usr/share/icons/hicolor/128x128/apps/emacs.png emacs-128x128.png \
+ /usr/share/icons/hicolor/128x128/apps/${FLAVOR}.png
+
+update-alternatives \
+ --install /usr/bin/editor editor \
+ /usr/bin/${FLAVOR} 0 \
+ --slave /usr/share/man/man1/editor.1.gz editor.1.gz \
+ /usr/share/man/man1/emacs.${FLAVOR}.1.gz
+
+# emacsen-common registration.
+/usr/lib/emacsen-common/emacs-install ${FLAVOR}
+
+#DEBHELPER#
--- /dev/null
+#!/bin/sh
+
+set -e
+
+MAJOR=@MAJOR_VERSION@
+FLAVOR=@DEB_FLAVOR@
+
+# update-alternatives on things that collide with xemacs, other editors
+if [ "$1" != "upgrade" ]
+then
+ update-alternatives --remove emacs /usr/bin/${FLAVOR}-@X_SUPPORT@
+ update-alternatives --remove editor /usr/bin/${FLAVOR}
+fi
+
+# emacsen-common registration.
+/usr/lib/emacsen-common/emacs-remove ${FLAVOR}
+
+#DEBHELPER#
--- /dev/null
+#!/bin/bash
+
+set -eo pipefail
+
+patch="$1"
+
+sed '
+ # delete everything after the first line starting with "--- " (the diff)
+ /^--- [^ ]/,$d' < "$patch" \
+| tac \
+| sed '
+ # delete everything up to the first line containing only "---" (the diffstat)
+ 1,/^---$/d' \
+| tac \
+| sed '
+ # delete everything before the first blank line (git summary line)
+ 1,/^$/d' \
+| sed '
+ # convert to our README.Debian NEWS format
+ 1 s/^/* /
+ 2,$ s/^/ /'
+
+echo " Patch: $(basename $patch)"
--- /dev/null
+From 060a24af491b07c293e6d998d58e343e42d71e70 Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Sun, 7 Apr 2013 15:03:05 -0500
+Subject: Prefer /usr/share/info/emacs-MAJORVERSION
+
+Emacs prefers /usr/share/info/emacs-MAJORVERSION to /usr/share/info.
+
+The value of Info-default-directory-list has been augmented via
+lisp/info.el to include /usr/share/info/emacs-MAJORVERSION before
+/usr/share/info.
+---
+ lisp/info.el | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lisp/info.el b/lisp/info.el
+index 40b2f90ebd6..63402780d42 100644
+--- a/lisp/info.el
++++ b/lisp/info.el
+@@ -218,7 +218,8 @@ Info-default-directory-list
+ (nconc standard-info-dirs (list config-dir))
+ (cons config-dir standard-info-dirs))))
+ (if (not (eq system-type 'windows-nt))
+- dirs
++ ;; Debian: add per-flavor info directory in front.
++ (cons (format "/usr/share/info/emacs-%d" emacs-major-version) dirs)
+ ;; Include the info directory near where Emacs executable was installed.
+ (let* ((instdir (file-name-directory invocation-directory))
+ (dir1 (expand-file-name "../info/" instdir))
--- /dev/null
+From ae16c941cd1b1cfae352136af9db2d698f5e4388 Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Mon, 4 Apr 2011 22:46:22 -0500
+Subject: Run debian-startup and set debian-emacs-flavor
+
+Emacs runs debian-startup and sets debian-emacs-flavor.
+
+* Emacs runs debian-startup during the startup process unless
+ site-run-file is false.
+
+* The global variable debian-emacs-flavor is bound to 'emacs25.
+
+Author: Rob Browning <rlb@defaultvalue.org>
+---
+ lisp/startup.el | 21 +++++++++++++++++++--
+ 1 file changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/lisp/startup.el b/lisp/startup.el
+index 2855e7c31ca..b0df4f59d0c 100644
+--- a/lisp/startup.el
++++ b/lisp/startup.el
+@@ -438,6 +438,10 @@ tutorial-directory
+ :type 'directory
+ :initialize #'custom-initialize-delay)
+
++(defconst debian-emacs-flavor 'emacs25
++ "A symbol representing the particular debian flavor of emacs running.
++Something like 'emacs20, 'xemacs20, etc.")
++
+ (defun normal-top-level-add-subdirs-to-load-path ()
+ "Recursively add all subdirectories of `default-directory' to `load-path'.
+ More precisely, this uses only the subdirectories whose names
+@@ -1124,8 +1128,21 @@ command-line
+ ;; be loaded from site-run-file and wants to test if -q was given
+ ;; should check init-file-user instead, since that is already set.
+ ;; See cus-edit.el for an example.
+- (if site-run-file
+- (load site-run-file t t))
++
++ ;; Original upstream startup
++ ;; (if site-run-file
++ ;; (load site-run-file t t))
++ ;;
++
++ ;; Debian startup
++ (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)))
+
+ ;; Sites should not disable this. Only individuals should disable
+ ;; the startup screen.
--- /dev/null
+From 83f3a4a687c29df447fffc9bf416db64c75c3a0d Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Mon, 4 Apr 2011 22:46:24 -0500
+Subject: Remove files that appear to be incompatible with the DFSG
+
+Files that appear to be incompatible with the DFSG have been removed.
+
+A number of files have been removed from this package because their
+licenses are not compatible with the Debian Free Software Guidelines
+(DFSG), or because it wasn't completely clear that their licenses are
+compatible.
+
+In particular, all of the files which are covered under the GFDL and
+have invariant sections have been removed in accordance with this
+General Resolution: http://www.debian.org/vote/2006/vote_001.
+
+The files that have been removed, but still appear to be
+distributable, have been moved to packages in Debian's non-free
+section.
+
+Author: Rob Browning <rlb@defaultvalue.org>
+Added-by: Rob Browning <rlb@defaultvalue.org>
+Status: new
+---
+ Makefile.in | 44 +++++++++++++++++---------------------------
+ admin/update_autogen | 3 +--
+ configure.ac | 19 ++++++++-----------
+ doc/misc/Makefile.in | 44 +++++---------------------------------------
+ lisp/help.el | 8 ++++++++
+ 5 files changed, 39 insertions(+), 79 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index bba9bb158cc..da42196bd7b 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -161,7 +161,9 @@ man1dir=$(mandir)/man1
+ # Where to install and expect the info files describing Emacs.
+ infodir=@infodir@
+ # Info files not in the doc/misc directory (we get those via make echo-info).
+-INFO_NONMISC=emacs.info eintr.info elisp.info
++# Debian: moved DFSG incompatible files to emacs*-common-non-dfsg
++# package (see /usr/share/doc/emacs*-common/copyright).
++INFO_NONMISC=
+
+ # If no makeinfo was found and configured --without-makeinfo, "no"; else "yes".
+ HAVE_MAKEINFO=@HAVE_MAKEINFO@
+@@ -808,8 +810,7 @@ endef
+ ### normally don't want to recompile. For example, the 'mostlyclean'
+ ### target for GCC does not delete 'libgcc.a', because recompiling it
+ ### is rarely necessary and takes a lot of time.
+-mostlyclean_dirs = src oldXMenu lwlib lib lib-src nt doc/emacs doc/misc \
+- doc/lispref doc/lispintro
++mostlyclean_dirs = src oldXMenu lwlib lib lib-src nt doc/misc
+
+ $(foreach dir,$(mostlyclean_dirs),$(eval $(call submake_template,$(dir),mostlyclean)))
+
+@@ -936,11 +937,11 @@ check check-expensive: all
+ dist:
+ cd ${srcdir}; ./make-dist
+
+-DVIS = lispref-dvi lispintro-dvi emacs-dvi misc-dvi
+-HTMLS = lispref-html lispintro-html emacs-html misc-html
+-INFOS = lispref-info lispintro-info emacs-info misc-info
+-PDFS = lispref-pdf lispintro-pdf emacs-pdf misc-pdf
+-PSS = lispref-ps lispintro-ps emacs-ps misc-ps
++DVIS = misc-dvi
++HTMLS = misc-html
++INFOS = misc-info
++PDFS = misc-pdf
++PSS = misc-ps
+
+ DOCS = $(DVIS) $(HTMLS) $(INFOS) $(PDFS) $(PSS)
+ $(DOCS):
+@@ -961,9 +962,6 @@ info-dir: ${srcdir}/info/dir
+
+ ## Hopefully doc/misc/*.texi is not too long for some systems?
+ srcdir_doc_info_dir_inputs = \
+- ${srcdir}/doc/emacs/emacs.texi \
+- ${srcdir}/doc/lispintro/emacs-lisp-intro.texi \
+- ${srcdir}/doc/lispref/elisp.texi \
+ $(sort $(wildcard ${srcdir}/doc/misc/*.texi))
+ info_dir_inputs = \
+ ../build-aux/dir_top \
+@@ -988,14 +986,10 @@ ${srcdir}/info/dir: ${info_dir_deps}
+ ) >$$tempfile && \
+ ${srcdir}/build-aux/move-if-change $${tempfile} ${srcdir}/info/dir
+
+-INSTALL_DVI = install-emacs-dvi install-lispref-dvi \
+- install-lispintro-dvi install-misc-dvi
+-INSTALL_HTML = install-emacs-html install-lispref-html \
+- install-lispintro-html install-misc-html
+-INSTALL_PDF = install-emacs-pdf install-lispref-pdf \
+- install-lispintro-pdf install-misc-pdf
+-INSTALL_PS = install-emacs-ps install-lispref-ps \
+- install-lispintro-ps install-misc-ps
++INSTALL_DVI = install-misc-dvi
++INSTALL_HTML = install-misc-html
++INSTALL_PDF = install-misc-pdf
++INSTALL_PS = install-misc-ps
+ INSTALL_DOC = $(INSTALL_DVI) $(INSTALL_HTML) $(INSTALL_PDF) $(INSTALL_PS)
+
+ ## Install non .info forms of the documentation.
+@@ -1013,14 +1007,10 @@ install-pdf: $(INSTALL_PDF)
+ install-ps: $(INSTALL_PS)
+
+
+-UNINSTALL_DVI = uninstall-emacs-dvi uninstall-lispref-dvi \
+- uninstall-lispintro-dvi uninstall-misc-dvi
+-UNINSTALL_HTML = uninstall-emacs-html uninstall-lispref-html \
+- uninstall-lispintro-html uninstall-misc-html
+-UNINSTALL_PDF = uninstall-emacs-pdf uninstall-lispref-pdf \
+- uninstall-lispintro-pdf uninstall-misc-pdf
+-UNINSTALL_PS = uninstall-emacs-ps uninstall-lispref-ps \
+- uninstall-lispintro-ps uninstall-misc-ps
++UNINSTALL_DVI = uninstall-misc-dvi
++UNINSTALL_HTML = uninstall-misc-html
++UNINSTALL_PDF = uninstall-misc-pdf
++UNINSTALL_PS = uninstall-misc-ps
+ UNINSTALL_DOC = $(UNINSTALL_DVI) $(UNINSTALL_HTML) $(UNINSTALL_PDF) $(UNINSTALL_PS)
+
+ $(UNINSTALL_DOC):
+diff --git a/admin/update_autogen b/admin/update_autogen
+index 86054aef9fd..5bc8aeafd45 100755
+--- a/admin/update_autogen
++++ b/admin/update_autogen
+@@ -269,8 +269,7 @@ info_dir ()
+ $topic
+ EOF
+ ## Bit faster than doc/*/*.texi.
+- for file in doc/emacs/emacs.texi doc/lispintro/*.texi \
+- doc/lispref/elisp.texi doc/misc/*.texi; do
++ for file in doc/misc/*.texi; do
+
+ ## FIXME do not ignore w32 if OS is w32.
+ case $file in
+diff --git a/configure.ac b/configure.ac
+index 5853cbbac85..7278ef64cb6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -5387,11 +5387,11 @@ dnl This will work, but you get a config.status that is not quite right
+ dnl (see http://lists.gnu.org/archive/html/bug-autoconf/2008-08/msg00028.html).
+ dnl That doesn't have any obvious consequences for Emacs, but on the whole
+ dnl it seems better to just live with the duplication.
+-SUBDIR_MAKEFILES="lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile nt/Makefile"
++SUBDIR_MAKEFILES="lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/misc/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile nt/Makefile"
+
+ AC_CONFIG_FILES([Makefile lib/Makefile lib-src/Makefile oldXMenu/Makefile \
+- doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile \
+- doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile \
++ doc/misc/Makefile \
++ src/Makefile lwlib/Makefile lisp/Makefile \
+ leim/Makefile nextstep/Makefile nt/Makefile])
+
+ dnl test/ is not present in release tarfiles.
+@@ -5443,14 +5443,11 @@ if test ! -f src/.gdbinit && test -f "$srcdir/src/.gdbinit"; then
+ fi
+ ])
+
+-dnl Perhaps this would be better named doc-emacs-emacsver.texi?
+-dnl See comments for etc-refcards-emacsver.tex.
+-dnl Since we get a doc/emacs directory generated anyway, for the Makefile,
+-dnl it is not quite the same. But we are generating in $srcdir.
+-AC_CONFIG_COMMANDS([doc/emacs/emacsver.texi], [
+-${MAKE-make} -s --no-print-directory -C doc/emacs doc-emacsver || \
+-AC_MSG_ERROR(['doc/emacs/emacsver.texi' could not be made.])
+-])
++# This file is normally generated indirectly via
++# doc/emacs/Makefile.in, but since we've removed the other doc/emacs
++# files for the DFSG split, and we don't have any prebuilt info files,
++# generate it directly here.
++AC_CONFIG_FILES([doc/emacs/emacsver.texi])
+
+ dnl If we give this the more natural name, etc/refcards/emacsver.texi,
+ dnl then a directory etc/refcards is created in the build directory,
+diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
+index 741d56cd207..39d09abeed7 100644
+--- a/doc/misc/Makefile.in
++++ b/doc/misc/Makefile.in
+@@ -61,18 +61,14 @@ INSTALL_DATA = @INSTALL_DATA@
+ MAKEINFO = @MAKEINFO@
+ MAKEINFO_OPTS = --force -I$(emacsdir)
+
++# Debian: moved DFSG incompatible files to emacs*-common-non-dfsg
++# package (see /usr/share/doc/emacs*-common/copyright).
++
+ ## On MS Windows, efaq-w32; otherwise blank.
+ DOCMISC_W32 = @DOCMISC_W32@
+
+ ## Info files to build and install on all platforms.
+-INFO_COMMON = ada-mode auth autotype bovine calc ccmode cl \
+- dbus dired-x ebrowse ede ediff edt eieio \
+- emacs-mime epa erc ert eshell eudc efaq eww \
+- flymake forms gnus emacs-gnutls htmlfontify idlwave ido info.info \
+- mairix-el message mh-e newsticker nxml-mode octave-mode \
+- org pcl-cvs pgg rcirc remember reftex sasl \
+- sc semantic ses sieve smtpmail speedbar srecode todo-mode tramp \
+- url vhdl-mode vip viper widget wisent woman
++INFO_COMMON = efaq
+
+ ## Info files to install on current platform.
+ INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_W32)
+@@ -150,9 +146,6 @@ define info_template
+ $(1): $$(buildinfodir)/$(1).info
+ endef
+
+-## "info" is already taken.
+-info.info: $(buildinfodir)/info.info
+-
+ $(foreach ifile,$(filter-out info.info,$(INFO_TARGETS)),$(eval $(call info_template,$(ifile))))
+
+
+@@ -174,20 +167,11 @@ $(foreach ifile,$(filter-out info.info,$(INFO_TARGETS)),$(eval $(call info_templ
+
+ ## Extra dependencies.
+
+-need_emacsver = calc cl dired-x efaq efaq-w32 erc ido reftex woman
++need_emacsver = efaq efaq-w32
+ need_emacsver_prefix = $(addprefix ${buildinfodir}/,${need_emacsver})
+
+ $(need_emacsver_prefix:=.info) $(need_emacsver:=.dvi) $(need_emacsver:=.pdf) $(need_emacsver:=.html) : ${emacsdir}/emacsver.texi
+
+-$(buildinfodir)/gnus.info gnus.html: ${srcdir}/gnus-faq.texi
+-
+-$(buildinfodir)/semantic.info semantic.dvi semantic.pdf semantic.html: ${srcdir}/sem-user.texi
+-
+-
+-## Please can we just rename cc-mode.texi to ccmode.texi...
+-${buildinfodir}/ccmode.info: \
+- ${srcdir}/cc-mode.texi ${gfdl} ${style} | ${buildinfodir}
+- $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $<
+
+ ## efaq, efaq_w32 do not depend on gfdl.
+ ## Maybe we can use .SECONDEXPANSION for this.
+@@ -203,24 +187,6 @@ efaq%.pdf: ${srcdir}/efaq%.texi
+ efaq%.html: ${srcdir}/efaq%.texi
+ $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $<
+
+-${buildinfodir}/emacs-mime.info emacs-mime.html: EXTRA_OPTS = --enable-encoding
+-
+-gnus_deps = ${srcdir}/gnus.texi ${srcdir}/gnus-faq.texi ${gfdl} ${style}
+-gnus.dvi: $(gnus_deps)
+- sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmpdvi.texi
+- $(ENVADD) $(TEXI2DVI) gnustmpdvi.texi
+- cp gnustmpdvi.dvi $@
+- rm gnustmpdvi.*
+-
+-gnus.pdf: $(gnus_deps)
+- sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmppdf.texi
+- $(ENVADD) $(TEXI2PDF) gnustmppdf.texi
+- cp gnustmppdf.pdf $@
+- rm gnustmppdf.*
+-
+-${buildinfodir}/tramp.info tramp.html: EXTRA_OPTS = -D emacs
+-${buildinfodir}/tramp.info tramp.html: ${srcdir}/trampver.texi
+-
+
+ .PHONY: mostlyclean clean distclean bootstrap-clean maintainer-clean
+
+diff --git a/lisp/help.el b/lisp/help.el
+index 68e8890ee1b..13a80cfa604 100644
+--- a/lisp/help.el
++++ b/lisp/help.el
+@@ -292,6 +292,14 @@ view-help-file
+ (goto-address-mode 1)
+ (goto-char (point-min)))
+
++(defun debian-expand-file-name-dfsg (filename)
++ "Apply expand-file-name to FILENAME.
++If expand-file-name does not find a file, append `.dfsg' and try again."
++ (let ((file (expand-file-name filename data-directory)))
++ (if (file-exists-p file)
++ file
++ (expand-file-name (concat file ".dfsg") data-directory))))
++
+ (defun describe-distribution ()
+ "Display info on how to obtain the latest version of GNU Emacs."
+ (interactive)
--- /dev/null
+From e6dd4351ffb417f050de9b77b3621d97374104de Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Mon, 4 Apr 2011 22:46:25 -0500
+Subject: Adjust documentation references for Debian
+
+Various documentation references have been adjusted for Debian.
+
+References to /usr/local/... have been changed to /usr/... as
+appropriate, etc.
+---
+ etc/NEWS | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/etc/NEWS b/etc/NEWS
+index 539e56e42a0..1d8a47b6549 100644
+--- a/etc/NEWS
++++ b/etc/NEWS
+@@ -15,6 +15,11 @@ and NEWS.1-17 for changes in older Emacs versions.
+ You can narrow news to a specific version by calling 'view-emacs-news'
+ with a prefix argument or by typing C-u C-h C-n.
+
++ \f
++* Debian specific changes to Emacs
++
++Please see /usr/share/doc/emacs25-common/README.Debian.gz.
++
+ \f
+ * Changes in Emacs 25.2
+
--- /dev/null
+From e7fd49e3547acb756c6c8036f7055c885da83a68 Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Mon, 4 Apr 2011 22:46:28 -0500
+Subject: Modify the output of (version) to indicate Debian modifications
+
+The output of (version) has been modified to indicate Debian modifications.
+
+Author: Rob Browning <rlb@defaultvalue.org>
+Added-by: Rob Browning <rlb@defaultvalue.org>
+---
+ lisp/version.el | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lisp/version.el b/lisp/version.el
+index 0e21ab2cad6..518cd4fb850 100644
+--- a/lisp/version.el
++++ b/lisp/version.el
+@@ -59,8 +59,8 @@ emacs-version
+ (interactive "P")
+ (let ((version-string
+ (format (if (not (called-interactively-p 'interactive))
+- "GNU Emacs %s (%s%s%s%s)\n of %s"
+- "GNU Emacs %s (%s%s%s%s) of %s")
++ "GNU Emacs %s (%s%s%s%s)\n of %s, modified by Debian"
++ "GNU Emacs %s (%s%s%s%s) of %s, modified by Debian")
+ emacs-version
+ system-configuration
+ (cond ((featurep 'motif)
--- /dev/null
+From bc4a4c2ece7a047e0de8191514bdeac7d3c3a0a6 Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Tue, 21 Oct 2014 19:10:17 -0500
+Subject: Don't try to build src/macuvs.h (via IVD_Sequences.txt)
+
+These are OS X specific, and were removed for now, due to uncertainty
+over the licensing.
+---
+ admin/unidata/Makefile.in | 13 ++-----------
+ 1 file changed, 2 insertions(+), 11 deletions(-)
+
+diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
+index f58303b6d76..408a4cd5a0d 100644
+--- a/admin/unidata/Makefile.in
++++ b/admin/unidata/Makefile.in
+@@ -53,16 +53,7 @@ am__v_at_1 =
+
+ .PHONY: all unifiles
+
+-all: ${top_srcdir}/src/macuvs.h unifiles ${unidir}/charscript.el
+-
+-## Specify .elc as an order-only prereq so as to not needlessly rebuild
+-## target just because the .elc is missing.
+-## Same with charprop.el below.
+-${top_srcdir}/src/macuvs.h: ${srcdir}/uvs.el ${srcdir}/IVD_Sequences.txt | \
+- ${srcdir}/uvs.elc
+- $(AM_V_GEN)${emacs} -L ${srcdir} -l uvs \
+- --eval '(uvs-print-table-ivd (unmsys--file-name "${srcdir}/IVD_Sequences.txt") "Adobe-Japan1")' \
+- > $@
++all: unifiles ${unidir}/charscript.el
+
+ %.elc: %.el
+ $(AM_V_ELC)${emacs} -f batch-byte-compile $<
+@@ -122,7 +113,7 @@ maintainer-clean: distclean
+ ## change and it slows down bootstrap (a tiny bit).
+ ## Cf leim/ja-dic (which is much slower).
+ extraclean:
+- rm -f ${top_srcdir}/src/macuvs.h ${unidir}/charscript.el*
++ rm -f ${unidir}/charscript.el*
+ ifneq (,$(wildcard $(unidir)/charprop.el))
+ cd $(unidir) && \
+ rm -f `sed -n 's/^;; FILE: //p' < charprop.el` charprop.el
--- /dev/null
+From 3456bf7e394316db2cde7522f233cf5b2d5dda83 Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Mon, 10 Oct 2016 17:35:56 -0500
+Subject: Kill gpg agent in package-test.el to avoid a race
+
+package-test.el should no longer fail during clean up.
+
+* Previously a delete-directories call raced with the gpg agent's own
+ cleanup process (presumably triggered by the first deletion of one of
+ the agent's sockets). As a result, it looks like the agent might
+ delete one of its sockets after delete-directories had decided to
+ delete the socket, but before it made the attempt, causing an
+ exception.
+
+* To fix the problem, explicitly ask gpg-connect-agent to kill the agent
+ before attempting to delete the gnupg home directory, and then delete
+ via "rm -rf" to ignore any vanishing files.
+---
+ test/automated/package-test.el | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/test/automated/package-test.el b/test/automated/package-test.el
+index 637a94bb330..05272736881 100644
+--- a/test/automated/package-test.el
++++ b/test/automated/package-test.el
+@@ -149,7 +149,14 @@ package-test-fake-contents-file
+ ,@body)))
+
+ (when (file-directory-p package-test-user-dir)
+- (delete-directory package-test-user-dir t))
++ (call-process "gpg-connect-agent" nil nil nil
++ "--homedir" (concat package-test-user-dir "/gnupg")
++ "--no-autostart"
++ "killagent" "/bye")
++ ;; Call "rm -rf" instead of delete-directory so that it won't
++ ;; choke if the gpg-agent sockets disappear during the
++ ;; recursive traversal.
++ (call-process "rm" nil nil nil "-r" package-test-user-dir))
+
+ (when (and (boundp 'package-test-archive-upload-base)
+ (file-directory-p package-test-archive-upload-base))
--- /dev/null
+From 47583d9d9a27fe9fa4fe96a932501497dc27af56 Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Sat, 22 Apr 2017 12:02:00 -0500
+Subject: Don't provide openssl s_client as an option for ssl connections
+
+openssl s_client is no longer a default for ssl connections
+
+"s_client is a debug tool, it does not set up a secure connection, it
+ignores all errors and just continues. It also doesn't do checks it
+should be doing. This is all documented behaviour." -- Kurt Roeckx
+
+Bug-Debian: https://bugs.debian.org/766397
+---
+ lisp/net/tls.el | 15 +++++----------
+ 1 file changed, 5 insertions(+), 10 deletions(-)
+
+diff --git a/lisp/net/tls.el b/lisp/net/tls.el
+index 2273d1345d5..91a3f0b5739 100644
+--- a/lisp/net/tls.el
++++ b/lisp/net/tls.el
+@@ -78,8 +78,7 @@ tls-end-of-info
+
+ (defcustom tls-program
+ '("gnutls-cli --x509cafile %t -p %p %h"
+- "gnutls-cli --x509cafile %t -p %p %h --protocols ssl3"
+- "openssl s_client -connect %h:%p -no_ssl2 -ign_eof")
++ "gnutls-cli --x509cafile %t -p %p %h --protocols ssl3")
+ "List of strings containing commands to start TLS stream to a host.
+ Each entry in the list is tried until a connection is successful.
+ %h is replaced with the server hostname, %p with the port to
+@@ -94,20 +93,17 @@ tls-program
+ '(choice
+ (const :tag "Default list of commands"
+ ("gnutls-cli --x509cafile %t -p %p %h"
+- "gnutls-cli --x509cafile %t -p %p %h --protocols ssl3"
+- "openssl s_client -CAfile %t -connect %h:%p -no_ssl2 -ign_eof"))
++ "gnutls-cli --x509cafile %t -p %p %h --protocols ssl3"))
+ (list :tag "Choose commands"
+ :value
+ ("gnutls-cli --x509cafile %t -p %p %h"
+- "gnutls-cli --x509cafile %t -p %p %h --protocols ssl3"
+- "openssl s_client -connect %h:%p -no_ssl2 -ign_eof")
++ "gnutls-cli --x509cafile %t -p %p %h --protocols ssl3")
+ (set :inline t
+ ;; FIXME: add brief `:tag "..."' descriptions.
+ ;; (repeat :inline t :tag "Other" (string))
+ ;; No trust check:
+ (const "gnutls-cli --insecure -p %p %h")
+- (const "gnutls-cli --insecure -p %p %h --protocols ssl3")
+- (const "openssl s_client -connect %h:%p -no_ssl2 -ign_eof"))
++ (const "gnutls-cli --insecure -p %p %h --protocols ssl3"))
+ (repeat :inline t :tag "Other" (string)))
+ (list :tag "List of commands"
+ (repeat :tag "Command" (string))))
+@@ -138,8 +134,7 @@ tls-checktrust
+
+ \(setq tls-program
+ \\='(\"gnutls-cli --x509cafile /etc/ssl/certs/ca-certificates.crt -p %p %h\"
+- \"gnutls-cli --x509cafile /etc/ssl/certs/ca-certificates.crt -p %p %h --protocols ssl3\"
+- \"openssl s_client -connect %h:%p -CAfile /etc/ssl/certs/ca-certificates.crt -no_ssl2 -ign_eof\"))"
++ \"gnutls-cli --x509cafile /etc/ssl/certs/ca-certificates.crt -p %p %h --protocols ssl3\"))"
+ :type '(choice (const :tag "Always" t)
+ (const :tag "Never" nil)
+ (const :tag "Ask" ask))
--- /dev/null
+From e0103758d20a59363b6a356e8d50d28cf25616b1 Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@linux-m68k.org>
+Date: Tue, 25 Jul 2017 01:12:50 +0200
+Subject: A memory alignment problem causing m68k failures has been fixed
+
+This patch has been backported from upstream to fix m68k build
+failures:
+
+ Properly align global lispsym
+
+ * lib-src/make-docfile.c (close_emacs_globals): Wrap struct
+ Lisp_Symbols inside struct.
+ * src/alloc.c (sweep_symbols): Update use of lispsym.
+ * src/lisp.h (builtin_lisp_symbol): Likewise.
+
+Origin: backport, commit: 7a4d9f6304cffa39642507609605bcbfa40d4675
+Bug-Debian: http://bugs.debian.org/868868
+Forwarded: not-needed
+---
+ lib-src/make-docfile.c | 4 +++-
+ src/alloc.c | 2 +-
+ src/lisp.h | 2 +-
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
+index 29061b76b26..bd268553248 100644
+--- a/lib-src/make-docfile.c
++++ b/lib-src/make-docfile.c
+@@ -667,7 +667,9 @@ close_emacs_globals (ptrdiff_t num_symbols)
+ "#ifndef DEFINE_SYMBOLS\n"
+ "extern\n"
+ "#endif\n"
+- "struct Lisp_Symbol alignas (GCALIGNMENT) lispsym[%td];\n"),
++ "struct {\n"
++ " struct Lisp_Symbol alignas (GCALIGNMENT) s;\n"
++ "} lispsym[%td];\n"),
+ num_symbols);
+ }
+
+diff --git a/src/alloc.c b/src/alloc.c
+index 68bee7728c0..9a96a425071 100644
+--- a/src/alloc.c
++++ b/src/alloc.c
+@@ -6823,7 +6823,7 @@ sweep_symbols (void)
+ symbol_free_list = NULL;
+
+ for (int i = 0; i < ARRAYELTS (lispsym); i++)
+- lispsym[i].gcmarkbit = 0;
++ lispsym[i].s.gcmarkbit = 0;
+
+ for (sblk = symbol_block; sblk; sblk = *sprev)
+ {
+diff --git a/src/lisp.h b/src/lisp.h
+index 5aee80cea11..08c40dc3795 100644
+--- a/src/lisp.h
++++ b/src/lisp.h
+@@ -1110,7 +1110,7 @@ make_lisp_symbol (struct Lisp_Symbol *sym)
+ INLINE Lisp_Object
+ builtin_lisp_symbol (int index)
+ {
+- return make_lisp_symbol (lispsym + index);
++ return make_lisp_symbol (&lispsym[index].s);
+ }
+
+ #define XSETINT(a, b) ((a) = make_number (b))
--- /dev/null
+From dfaa56fe12feedba0be460235a2309a93188509f Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Sat, 29 Jul 2017 11:50:27 -0500
+Subject: Don't downcase real xref in elisp-mode-tests
+
+The elisp-mode-tests should no longer fail on case sensitive
+filesystems when the build path contains uppercase characters.
+
+Previously the code was downcasing the path for both comparison and
+lookups.
+---
+ test/automated/elisp-mode-tests.el | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/test/automated/elisp-mode-tests.el b/test/automated/elisp-mode-tests.el
+index 605f9ca08df..805d9566e32 100644
+--- a/test/automated/elisp-mode-tests.el
++++ b/test/automated/elisp-mode-tests.el
+@@ -179,11 +179,15 @@ xref-elisp-test-descr-to-target
+ (defun xref-elisp-test-run (xrefs expected-xrefs)
+ (should (= (length xrefs) (length expected-xrefs)))
+ (while xrefs
+- (let* ((xref (pop xrefs))
++ (let* ((real-xref (pop xrefs))
++ (xref (clone real-xref))
+ (expected (pop expected-xrefs))
+ (expected-xref (or (when (consp expected) (car expected)) expected))
+ (expected-source (when (consp expected) (cdr expected))))
+
++ (setf (oref xref location)
++ (copy-xref-elisp-location (oref xref location)))
++
+ ;; Downcase the filenames for case-insensitive file systems.
+ (setf (xref-elisp-location-file (oref xref location))
+ (downcase (xref-elisp-location-file (oref xref location))))
+@@ -193,7 +197,7 @@ xref-elisp-test-run
+
+ (should (equal xref expected-xref))
+
+- (xref--goto-location (xref-item-location xref))
++ (xref--goto-location (xref-item-location real-xref))
+ (back-to-indentation)
+ (should (looking-at (or expected-source
+ (xref-elisp-test-descr-to-target expected)))))
--- /dev/null
+From 8900499027b692994a3b411954850c3672b9d2f6 Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Sun, 30 Jul 2017 21:43:10 -0500
+Subject: Disable eieio-test-method-order-list-6
+
+The eieio-test-method-order-list-6 test has been disabled
+
+Its behavior is currently unpredictable.
+
+Bug: https://debbugs.gnu.org/27878
+Bug: https://debbugs.gnu.org/cgi/24503#21
+---
+ test/automated/eieio-test-methodinvoke.el | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/test/automated/eieio-test-methodinvoke.el b/test/automated/eieio-test-methodinvoke.el
+index 09edea461d1..ab3a4444ee0 100644
+--- a/test/automated/eieio-test-methodinvoke.el
++++ b/test/automated/eieio-test-methodinvoke.el
+@@ -189,16 +189,16 @@ make-instance
+ (cl-call-next-method)
+ )
+
+-(ert-deftest eieio-test-method-order-list-6 ()
+- (let ((eieio-test-method-order-list nil)
+- (ans '(
+- (:STATIC C)
+- (:STATIC C-base1)
+- (:STATIC C-base2)
+- )))
+- (C nil)
+- (setq eieio-test-method-order-list (nreverse eieio-test-method-order-list))
+- (eieio-test-match ans)))
++;; (ert-deftest eieio-test-method-order-list-6 ()
++;; (let ((eieio-test-method-order-list nil)
++;; (ans '(
++;; (:STATIC C)
++;; (:STATIC C-base1)
++;; (:STATIC C-base2)
++;; )))
++;; (C nil)
++;; (setq eieio-test-method-order-list (nreverse eieio-test-method-order-list))
++;; (eieio-test-match ans)))
+
+ ;;; Diamond Test
+ ;;
--- /dev/null
+0001-Prefer-usr-share-info-emacs-MAJORVERSION.patch
+0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
+0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
+0004-Adjust-documentation-references-for-Debian.patch
+0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch
+0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch
+0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch
+0008-Don-t-provide-openssl-s_client-as-an-option-for-ssl-.patch
+0009-A-memory-alignment-problem-causing-m68k-failures-has.patch
+0010-Don-t-downcase-real-xref-in-elisp-mode-tests.patch
+0011-Disable-eieio-test-method-order-list-6.patch
--- /dev/null
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# This file is licensed under the terms of the Gnu Public License.
+# With the one additional provision that Ian Jackson's name may not be
+# removed from the file.
+
+# Copyright 1994,1995 Ian Jackson
+# Copyright 2004-2005 Jérôme Marant <jerome@debian.org>
+# Copyright 1998-2015 Rob Browning <rlb@defaultvalue.org>
+
+# Originally copied from the GNU Hello Debian rules file (1.3).
+# Modified for emacs by Mark Eichin <eichin@kitten.gen.ma.us>.
+# Debhelper support added via one of Joey Hess' example files.
+# See the debian/changelog for further historical information.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+SHELL := /bin/bash
+quilt := QUILT_PATCHES=debian/patches QUILT_PATCHES_PREFIX=y quilt
+pf := set -o pipefail
+
+# This package uses debian/source/format 3.0 (quilt).
+
+# For now we assume that emacs' versioning scheme is always
+# MAJOR.MINORtinyrev where MAJOR and MINOR are integers and tinyrev is
+# an optional lowercase letter (or letters). We also assume that
+# upstream uses a numbering scheme that sorts in a "Debian friendly"
+# way. So far that's always been true. If it becomes false, some of
+# the values below will have to be set manually.
+
+# (You might imagine that a VPATH build would allow us to avoid having
+# to copy the entire source tree for each of the three builds, but it
+# turns out that the emacs build process doesn't entirely respect the
+# VPATH and modifies all kinds of files in the srcdir (e.g. *.elc,
+# *.map, etc.).
+
+# The official upstream version defined by AC_INIT in configure.in.
+upstream_ver := $(shell debian/upstream-version)
+ifeq (,$(upstream_ver))
+ $(error 'Unable to find upstream version number.')
+endif
+
+# This must be the version that's actually used at runtime for things
+# like load-path. It may not be the same as the upstream version
+# (i.e. when you have upstream 20.5a, the functional version may still
+# be 20.5), so sometimes we may have to do this by hand.
+runtime_ver := $(shell $(pf); echo $(upstream_ver) | perl -pe 's/[a-z]+$$//o')
+major_ver := $(shell $(pf); echo $(runtime_ver) | perl -pe 's/\..*$$//o')
+minor_ver := $(shell $(pf); echo $(runtime_ver) | perl -pe 's/^[^.]*\.//o')
+
+# The name of the Debian source package
+src_name := $(shell $(pf); dpkg-parsechangelog | egrep '^Source:')
+src_name := $(shell $(pf); echo $(src_name) | perl -pe 's/Source:\s+//o')
+
+# The version from the changelog (i.e. 20.5-1)
+debian_ver := $(shell $(pf); dpkg-parsechangelog | egrep '^Version:')
+debian_ver := $(shell $(pf); echo $(debian_ver) | perl -pe 's/Version:\s+//o')
+
+# The Debian revision (i.e. the 1 from 20.5-1)
+# Always everything after the last '-'
+debian_rev := $(shell $(pf); echo $(debian_ver) | perl -pe 's/.*-//o')
+
+# Might be 21.3, or it might be 21.3+1 if we've had to have more than
+# one re-release of the upstream source (rare, but it happens), or if
+# we have to split the package for DFSG purposes. Always everything
+# before the last '-'
+debsrc_ver := $(shell $(pf); echo $(debian_ver) | perl -pe 's/-[^-]+$$//o')
+
+# The flavor (i.e. emacs21) currently matches the source package name.
+flavor := $(src_name)
+
+info_subdir := emacs-$(major_ver)
+
+######################################################################
+# Customizable variables
+
+bin_priority := 28
+
+# This might also be something like 2006-09-09 for snapshots.
+menu_ver := $(major_ver)
+
+######################################################################
+
+# Should these be exported like this (as autotools-dev recommends for
+# the two vars below) or not?
+export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+export DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+
+# As recommended by /usr/share/doc/autotools-dev/README.Debian.gz.
+# Handle cross-compiling and don't make ./configure guess.
+export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+# FOR AUTOCONF 2.52 AND NEWER ONLY
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ confflags += --build $(DEB_HOST_GNU_TYPE)
+else
+ confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+deb_host_multiarch := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+# Without this, the build dies in marker.c when trying to create c-by.el
+ifeq ($(DEB_HOST_ARCH),arm64)
+ export DEB_CFLAGS_MAINT_APPEND := -O0
+endif
+
+CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
+CFLAGS += -Wall
+LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
+CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
+
+joblimit := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ifeq (,$(joblimit))
+ joblimit := 1
+endif
+
+target := $(DEB_HOST_GNU_TYPE)
+movemail_bin := usr/lib/emacs/$(runtime_ver)/$(target)/movemail
+
+# Info files that are going to show up in the main dir.
+main_dir_info_files := efaq.info
+
+# Files that the build stage depends on (may also be listed in other vars).
+persistent_autogen_build_files := debian/control debian/copyright
+nonpersistent_autogen_build_files :=
+
+# These files must always exist, i.e. can't ever be cleaned.
+persistent_autogen_install_files :=
+
+nonpersistent_autogen_install_files := \
+ debian/$(flavor)-bin-common.lintian-overrides \
+ debian/$(flavor)-bin-common.postinst \
+ debian/$(flavor)-bin-common.prerm \
+ debian/$(flavor)-common.README.Debian \
+ debian/$(flavor)-common.docs \
+ debian/$(flavor)-common.lintian-overrides \
+ debian/$(flavor)-common.postinst \
+ debian/$(flavor)-common.prerm \
+ debian/$(flavor)-term.desktop \
+ debian/$(flavor)-nox.README.Debian \
+ debian/$(flavor)-nox.lintian-overrides \
+ debian/$(flavor)-nox.postinst \
+ debian/$(flavor)-nox.prerm \
+ debian/$(flavor)-lucid.README.Debian \
+ debian/$(flavor)-lucid.desktop \
+ debian/$(flavor)-lucid.lintian-overrides \
+ debian/$(flavor)-lucid.postinst \
+ debian/$(flavor)-lucid.prerm \
+ debian/$(flavor).README.Debian \
+ debian/$(flavor).desktop \
+ debian/$(flavor).lintian-overrides \
+ debian/$(flavor).postinst \
+ debian/$(flavor).prerm
+
+autogen_build_files := \
+ $(nonpersistent_autogen_build_files) $(persistent_autogen_build_files)
+
+autogen_install_files := \
+ $(nonpersistent_autogen_install_files) $(persistent_autogen_install_files)
+
+persistent_autogen_files := \
+ $(persistent_autogen_build_files) $(persistent_autogen_install_files)
+
+nonpersistent_autogen_files := \
+ $(nonpersistent_autogen_build_files) $(nonpersistent_autogen_install_files)
+
+
+# Build directories
+pkgdir_common := $(CURDIR)/debian/$(flavor)-common
+pkgdir_bin_common := $(CURDIR)/debian/$(flavor)-bin-common
+pkgdir_x := $(CURDIR)/debian/$(flavor)
+pkgdir_nox := $(CURDIR)/debian/$(flavor)-nox
+pkgdir_lucid := $(CURDIR)/debian/$(flavor)-lucid
+pkgdir_el := $(CURDIR)/debian/$(flavor)-el
+
+install_dir_x := $(CURDIR)/debian/install-x
+install_dir_nox := $(CURDIR)/debian/install-nox
+install_dir_lucid := $(CURDIR)/debian/install-lucid
+
+local_lpath := /etc/$(flavor):/etc/emacs
+local_lpath := $(local_lpath):/usr/local/share/emacs/$(runtime_ver)/site-lisp
+local_lpath := $(local_lpath):/usr/local/share/emacs/site-lisp
+local_lpath := $(local_lpath):/usr/share/emacs/$(runtime_ver)/site-lisp
+local_lpath := $(local_lpath):/usr/share/emacs/site-lisp
+
+# Installation local_lpath
+local_lpath_install \
+ := $(pkgdir_common)/$(subst :,:$(pkgdir_common)/,$(local_lpath))
+
+define testdir
+ dh_testdir debian/emacsVER.postinst
+endef
+
+# If we ever need to do the stripping outside of dh_strip, just add an
+# INSTALL_STRIP="-s" to the make vars below.
+
+define emacs_inst
+ $(MAKE) -C debian/$(1) install \
+ DESTDIR=$(2) \
+ infodir=/usr/share/info/emacs-$(major_ver) \
+ localstatedir=/var
+endef
+
+# If we ever need it, we can create a copy that doesn't assume ./debian/
+define deb_sub
+ perl -p \
+ -e "s|\@PKG_NAME\@|$(pkg_name)|go;" \
+ -e "s|\@MAJOR_VERSION\@|$(major_ver)|go;" \
+ -e "s|\@MINOR_VERSION\@|$(minor_ver)|go;" \
+ -e "s|\@FULL_VERSION\@|$(runtime_ver)|go;" \
+ -e "s|\@PACKAGE_VERSION\@|$(debian_ver)|go;" \
+ -e "s|\@DEBIAN_REV\@|$(deb_rev)|go;" \
+ -e "s|\@UPSTREAM_VERSION\@|$(upstream_ver)|go;" \
+ -e "s|\@DEBSRC_VERSION\@|$(debsrc_ver)|go;" \
+ -e "s|\@DEB_FLAVOR\@|$(flavor)|go;" \
+ -e "s|\@MENU_VERSION\@|$(menu_ver)|go;" \
+ -e "s|\@INFO_FILES\@|$(main_dir_info_files)|go;" \
+ -e "s|\@INFO_SUBDIR\@|$(info_subdir)|go;" \
+ -e "s|\@X_SUPPORT\@|$(xsupport)|go;" \
+ -e "s|\@BIN_PRIORITY\@|$(bin_priority)|go;" \
+ -e "s|\@MOVEMAIL_BIN\@|$(movemail_bin)|go;" \
+ < $(1) > $(2)
+endef
+
+%:
+ dh $@ --parallel
+
+check-vars:
+ @echo "src_name: $(src_name)"
+ @echo "upstream_ver: $(upstream_ver)"
+ @echo "debian_ver: $(debian_ver)"
+ @echo "debsrc_ver: $(debsrc_ver)"
+ @echo "debian_rev: $(debian_rev)"
+ @echo "runtime_ver: $(runtime_ver)"
+ @echo "major_ver: $(major_ver)"
+ @echo "minor_ver: $(minor_ver)"
+ @echo "movemail_bin: $(movemail_bin)"
+
+debian-sync: $(persistent_autogen_files)
+ # so dh pattern rule doesn't try to handle this target
+ true
+
+debian/$(flavor).%: xsupport := "x"
+debian/$(flavor).%: pkg_name := $(flavor)
+
+debian/$(flavor)-nox.%: xsupport := "nox"
+debian/$(flavor)-nox.%: pkg_name := $(flavor)-nox
+
+debian/$(flavor)-lucid.%: xsupport := "lucid"
+debian/$(flavor)-lucid.%: pkg_name := $(flavor)-lucid
+
+debian/$(flavor)-common.%: pkg_name := $(flavor)-common
+debian/$(flavor)-bin-common.%: pkg_name := $(flavor)-bin-common
+
+debian/%: debian/%.in debian/changelog debian/rules
+ $(call deb_sub,$<,$@)
+
+debian/$(flavor)-bin-common.%: debian/emacsVER-bin-common.% debian/changelog
+ $(call deb_sub,$<,$@)
+
+debian/$(flavor)-common.%: debian/emacsVER-common.% debian/changelog
+ $(call deb_sub,$<,$@)
+
+debian/$(flavor)-el.%: debian/emacsVER-el.% debian/changelog
+ $(call deb_sub,$<,$@)
+
+debian/$(flavor).%: debian/emacsVER.% debian/changelog
+ $(call deb_sub,$<,$@)
+
+debian/$(flavor)-nox.%: debian/emacsVER.% debian/changelog
+ $(call deb_sub,$<,$@)
+
+debian/$(flavor)-lucid.%: debian/emacsVER.% debian/changelog
+ $(call deb_sub,$<,$@)
+
+debian/$(flavor)-term.desktop: debian/emacsVER-term.desktop debian/changelog
+ $(call deb_sub,$<,$@)
+
+debian/$(flavor)-common.README.Debian: \
+ debian/emacsVER-common.README debian/patches/*.patch debian/patches/series \
+ debian/rules debian/patch-to-news
+ cd debian && \
+ csplit -s -f emacsVER-common.README. \
+ emacsVER-common.README '/@@PATCH_LIST_HERE@@/'
+ cp debian/emacsVER-common.README.00 debian/emacsVER-common.README.tmp
+ for p in $$($(quilt) series); do \
+ debian/patch-to-news "$$p" >> debian/emacsVER-common.README.tmp \
+ && echo >> debian/emacsVER-common.README.tmp; \
+ done
+ tail -n +2 \
+ < debian/emacsVER-common.README.01 \
+ >> debian/emacsVER-common.README.tmp
+ mv debian/emacsVER-common.README.tmp $@
+
+# common configure flags
+confflags += --prefix=/usr
+confflags += --sharedstatedir=/var/lib
+confflags += --libexecdir=/usr/lib
+confflags += --localstatedir=/var/lib
+confflags += --infodir=/usr/share/info
+confflags += --mandir=/usr/share/man
+confflags += --with-pop=yes
+confflags += --enable-locallisppath=$(local_lpath)
+confflags += --with-sound=alsa
+confflags += --without-gconf
+
+# x configure flags
+confflags_x := $(confflags)
+confflags_x += --with-x=yes
+confflags_x += --with-x-toolkit=gtk3
+# For those who prefer the old-style non-toolkit scrollbars, just
+# change the assignment below to --without-toolkit-scroll-bars. The
+# resulting emacsXY package will have the old scrollbars.
+confflags_x += --with-toolkit-scroll-bars
+
+# nox configure flags
+confflags_nox := $(confflags)
+confflags_nox += --with-x=no
+confflags_nox += --without-gsettings
+
+# lucid configure flags
+confflags_lucid := $(confflags)
+confflags_lucid += --with-x=yes
+confflags_lucid += --with-x-toolkit=lucid
+confflags_lucid += --with-toolkit-scroll-bars
+confflags_lucid += --without-gsettings
+
+define cfg_tree
+ cd $(1) && \
+ CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
+ REL_ALLOC=no \
+ $(CURDIR)/debian/build-src/configure $(confflags) $(2)
+endef
+
+define build_cmd
+ $(MAKE) -C $(1) -j $(joblimit)
+ # If we don't use bootstrap, we need to explicitly build info.
+ $(MAKE) -C $(1) -j $(joblimit) info
+ # Make sure we chose liblockfile.
+ ldd $(1)/lib-src/movemail | grep liblockfile
+endef
+
+# Don't mess with the source tree (we build in debian/build-*)
+override_dh_update_autotools_config:
+override_dh_autoreconf:
+override_dh_auto_configure:
+
+debian/stamp-configured: $(autogen_build_files)
+ # If the deps for this target change, start over
+ rm -rf debian/build-src debian/build-x debian/build-lucid debian/build-nox
+ mkdir debian/build-src
+ cp -a $$(ls -A | egrep -v '^(\.git|\.pc|debian)$$') debian/build-src
+ cp -a /usr/share/misc/config.guess /usr/share/misc/config.sub \
+ debian/build-src
+ cd debian/build-src && ./autogen.sh
+ mkdir debian/build-lucid debian/build-nox debian/build-x
+ # Create one VPATH build per-flavor
+ $(call cfg_tree,debian/build-x,$(confflags_x))
+ $(call cfg_tree,debian/build-nox,$(confflags_nox))
+ $(call cfg_tree,debian/build-lucid,$(confflags_lucid))
+ touch $@
+
+override_dh_auto_build: debian/stamp-configured
+ # The first build will bootstrap build-src, which will speed
+ # the remaining builds.
+ $(call build_cmd,debian/build-x)
+ $(call build_cmd,debian/build-nox)
+ $(call build_cmd,debian/build-lucid)
+
+override_dh_auto_test:
+ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ $(MAKE) -C debian/build-lucid check
+ $(MAKE) -C debian/build-nox check
+ $(MAKE) -C debian/build-x check
+ endif
+
+define install_common_binpkg_bits
+ # args: (1) srcdir (2) pkgdir (3) pkgname (4) bin-suffix
+
+ install -d $(2)/usr/bin/
+ test -f $(1)/usr/bin/emacs-*
+ cp -a $(1)/usr/bin/emacs-* $(2)/usr/bin/$(flavor)-$(4)
+ dh_link -p$(3) usr/bin/$(flavor)-$(4) usr/bin/$(flavor)
+
+ install -d $(2)/usr/share/emacs/$(runtime_ver)/etc
+ cp -a $(1)/usr/share/emacs/$(runtime_ver)/etc/DOC \
+ $(2)/usr/share/emacs/$(runtime_ver)/etc/
+
+ install -d $(2)/usr/share/man/man1
+ dh_link -p$(3) \
+ usr/share/man/man1/emacs.$(flavor).1.gz \
+ usr/share/man/man1/$(flavor).1.gz
+ dh_link -p$(3) \
+ usr/share/man/man1/emacs.$(flavor).1.gz \
+ usr/share/man/man1/$(flavor)-$(4).1.gz
+endef
+
+override_dh_auto_install: $(autogen_install_files)
+ rm -rf \
+ $(install_dir_x) $(install_dir_nox) $(install_dir_lucid) \
+ $(pkgdir_common)/* \
+ $(pkgdir_bin_common)/* \
+ $(pkgdir_x)/* \
+ $(pkgdir_nox)/* \
+ $(pkgdir_lucid)/* \
+ $(pkgdir_el)/*
+
+ $(call emacs_inst,build-x,$(install_dir_x))
+
+ ##################################################
+ # emacsXY-common
+ ifneq (,$(findstring $(flavor)-common, $(shell dh_listpackages)))
+ install -d $(pkgdir_common)
+ cp -a $(install_dir_x)/* $(pkgdir_common)
+
+ rm -r $(pkgdir_common)/usr/bin
+ rm -r $(pkgdir_common)/usr/lib
+
+ cd $(pkgdir_common)/usr/share/appdata \
+ && mv emacs.appdata.xml $(flavor).appdata.xml
+
+ cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc \
+ && test -f DOC
+ cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc \
+ && rm DOC
+
+ # lisp path directories
+ install -d $(pkgdir_common)/etc/$(flavor)/site-start.d
+ install -d $(pkgdir_common)/usr/share/$(flavor)
+
+ # The version-specific site-lisp dir, say emacs/21.1/site-lisp, needs
+ # to be in share/FLAVOR so that as we upgrade from 21.1 to 21.2,
+ # etc., add-on package bits don't get left behind.
+ mv $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/site-lisp \
+ $(pkgdir_common)/usr/share/$(flavor)
+ dh_link -p$(flavor)-common usr/share/$(flavor)/site-lisp \
+ usr/share/emacs/$(runtime_ver)/site-lisp
+
+ # This is a duplicate of the file in FLAVOR/site-lisp
+ rm $(pkgdir_common)/usr/share/emacs/site-lisp/subdirs.el
+
+ cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/images/icons \
+ && convert hicolor/16x16/apps/emacs.{png,xpm}
+ cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/images/icons \
+ && convert hicolor/32x32/apps/emacs.{png,xpm}
+
+ # Remove emacs23 icon versions
+ cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/images/icons \
+ && rm hicolor/*/apps/emacs23.*
+ cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/images/icons \
+ && rm hicolor/*/mimetypes/emacs-document23.svg
+ cd $(pkgdir_common)/usr/share/icons/hicolor/scalable/mimetypes \
+ && rm emacs-document23.svg
+
+ # Fixup image files in unversioned directories (version
+ # unversioned images) and prepare for update-alternatives.
+ cd $(pkgdir_common)/usr/share/icons/hicolor \
+ && mv scalable/apps/emacs.svg scalable/apps/${flavor}.svg \
+ && mv 16x16/apps/emacs.png 16x16/apps/${flavor}.png \
+ && mv 24x24/apps/emacs.png 24x24/apps/${flavor}.png \
+ && mv 32x32/apps/emacs.png 32x32/apps/${flavor}.png \
+ && mv 48x48/apps/emacs.png 48x48/apps/${flavor}.png \
+ && mv 128x128/apps/emacs.png 128x128/apps/${flavor}.png
+
+ cd $(pkgdir_common)/usr/share/icons/hicolor/scalable/mimetypes \
+ && mv emacs-document.svg ${flavor}-document.svg
+
+ # Remove redundant emacs.desktop file.
+ rm $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/emacs.desktop
+ rm $(pkgdir_common)/usr/share/applications/emacs.desktop
+
+ gunzip $(pkgdir_common)/usr/share/man/man1/*.gz
+ perl -pi -e "s|man1/etags\\.1|man1/etags\\.$(flavor)\\.1|" \
+ $(pkgdir_common)/usr/share/man/man1/ctags.1
+
+ cd $(pkgdir_common)/usr/share/man/man1/ && \
+ for f in *.1; do mv $$f $$(basename $${f} .1).$(flavor).1; done
+
+ # At least etc/COPYING is needed by M-x describe-copying.
+ rm $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/COPYING
+ rm $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/lisp/COPYING
+ dh_link -p$(flavor)-common /usr/share/common-licenses/GPL-3 \
+ usr/share/emacs/$(runtime_ver)/etc/COPYING
+ dh_link -p$(flavor)-common /usr/share/common-licenses/GPL-3 \
+ usr/share/emacs/$(runtime_ver)/lisp/COPYING
+
+ $(pf); cd $(pkgdir_common) && \
+ find -name "*.elc" | perl -pe 's/\.elc$$/\.el/o' | xargs rm -f
+
+ $(pf); cd $(pkgdir_common) && \
+ find -name "*.elc" | perl -pe 's/\.elc$$/\.el\.gz/o' | xargs rm -f
+
+ # Remove extraneous info dir files. These may not exist if dpkg
+ # is 1.5.4 or newer.
+ rm -f $(pkgdir_common)/usr/share/info/emacs-$(major_ver)/dir
+ rm -f $(pkgdir_common)/usr/share/info/emacs-$(major_ver)/dir.old
+
+ # Remove the shared game score directory as a simple way to
+ # avoid a conflict with other flavors of Emacs. Since
+ # Debian's update-game-score binary isn't setuid, that
+ # directory is never used.
+ rm $(pkgdir_common)/var/games/emacs/tetris-scores
+ rm $(pkgdir_common)/var/games/emacs/snake-scores
+ rmdir $(pkgdir_common)/var/games/emacs/
+ rmdir $(pkgdir_common)/var/games/
+ rmdir $(pkgdir_common)/var/
+
+ endif
+
+ ##################################################
+ # emacsXY-bin-common
+ ifneq (,$(findstring $(flavor)-bin-common, $(shell dh_listpackages)))
+ # Move common binaries to emacs-bin-common.
+ install -d $(pkgdir_bin_common)/usr
+ cp -a $(install_dir_x)/usr/bin $(pkgdir_bin_common)/usr
+ cp -a $(install_dir_x)/usr/lib $(pkgdir_bin_common)/usr
+
+ # Make sure there's just one.
+ test -f $(pkgdir_bin_common)/usr/bin/emacs-*
+ rm $(pkgdir_bin_common)/usr/bin/{emacs,emacs-*}
+
+ # Set up movemail.
+ chown root.mail $(pkgdir_bin_common)/$(movemail_bin)
+ chmod g+s $(pkgdir_bin_common)/$(movemail_bin)
+
+ # Set up alternatives.
+ alternatives=`ls $(pkgdir_bin_common)/usr/bin | xargs` && \
+ set -x && \
+ for f in debian/$(flavor)-bin-common.*; \
+ do \
+ perl -pwi -e "s|\@ALTERNATIVES\@|$${alternatives}|go" $$f ; \
+ done
+
+ for f in `ls $(pkgdir_bin_common)/usr/bin`; \
+ do \
+ mv $(pkgdir_bin_common)/usr/bin/$$f \
+ $(pkgdir_bin_common)/usr/bin/$$f.$(flavor) ; \
+ done
+ endif
+
+ ##################################################
+ # emacsXY
+ ifneq (,$(findstring $(flavor), $(shell dh_listpackages)))
+ $(call install_common_binpkg_bits,\
+ $(install_dir_x),$(pkgdir_x),$(flavor),x)
+
+ # install desktop entries
+ install -d $(pkgdir_x)/usr/share/applications
+ install -m 0644 \
+ debian/$(flavor).desktop \
+ debian/$(flavor)-term.desktop \
+ $(pkgdir_x)/usr/share/applications/
+ endif
+
+ ##################################################
+ # emacsXY-nox
+ ifneq (,$(findstring $(flavor)-nox, $(shell dh_listpackages)))
+ $(call emacs_inst,build-nox,$(install_dir_nox))
+ $(call install_common_binpkg_bits,\
+ $(install_dir_nox),$(pkgdir_nox),$(flavor)-nox,nox)
+ # install desktop entry
+ install -d $(pkgdir_x)/usr/share/applications
+ install -m 0644 \
+ debian/$(flavor)-term.desktop $(pkgdir_x)/usr/share/applications/
+ rm -rf $(install_dir_nox)
+ endif
+
+ ##################################################
+ # emacsXY-lucid
+ ifneq (,$(findstring $(flavor)-lucid, $(shell dh_listpackages)))
+ $(call emacs_inst,build-lucid,$(install_dir_lucid))
+ $(call install_common_binpkg_bits,\
+ $(install_dir_lucid),$(pkgdir_lucid),$(flavor)-lucid,lucid)
+
+ # install desktop entries
+ install -d $(pkgdir_lucid)/usr/share/applications
+ install -m 0644 \
+ debian/$(flavor)-lucid.desktop \
+ debian/$(flavor)-term.desktop \
+ $(pkgdir_lucid)/usr/share/applications/
+ rm -rf $(install_dir_lucid)
+ endif
+
+ ##################################################
+ # emacsXY-el
+ ifneq (,$(findstring $(flavor)-el, $(shell dh_listpackages)))
+ install -d $(pkgdir_el)
+ $(pf); \
+ (cd $(install_dir_x) && find -name "*.el" -o -name "*.el.gz" -print0 \
+ | tar cpf - --null --files-from -) \
+ | (cd $(pkgdir_el) && tar xpf -)
+ endif
+
+ ##################################################
+ # final cleanup
+ rm -rf $(install_dir_x)
+ rm -rf $(install_dir_nox)
+ rm -rf $(install_dir_lucid)
+
+.PHONY: override_dh_strip
+override_dh_strip:
+ dh_strip -p$(flavor) --dbg-package=$(flavor)-dbg
+ dh_strip -p$(flavor)-lucid --dbg-package=$(flavor)-lucid-dbg
+ dh_strip -p$(flavor)-nox --dbg-package=$(flavor)-nox-dbg
+ dh_strip
+
+# This won't be necessary once strip-nondeterminism is fixed.
+.PHONY: override_dh_strip_nondeterminism
+override_dh_strip_nondeterminism:
+ if grep "$(flavor)-el" <(dh_listpackages); then \
+ cp -a debian/$(flavor)-el/usr/share/emacs/$(runtime_ver)/lisp/version.el.gz \
+ debian/elgz-canary; \
+ fi
+ cd debian && \
+ find $$(cd .. && dh_listpackages) \
+ -name "*.el.gz" -printf "%T@ %p\0" > elgz-info
+ dh_strip_nondeterminism
+ set -eo pipefail; \
+ cd debian; \
+ while read -r -d $$'\0' line; do \
+ ts="$${line%% *}"; \
+ path="$${line#* }"; \
+ touch --date=@"$$ts" "$$path"; \
+ done < elgz-info
+ if grep -q "$(flavor)-el" <(dh_listpackages); then \
+ set -e; \
+ test ! debian/elgz-canary -nt \
+ debian/$(flavor)-el/usr/share/emacs/$(runtime_ver)/lisp/version.el.gz; \
+ test ! debian/elgz-canary -ot \
+ debian/$(flavor)-el/usr/share/emacs/$(runtime_ver)/lisp/version.el.gz; \
+ fi
+
+override_dh_testdir:
+ $(testdir)
+
+override_dh_fixperms:
+ dh_fixperms -X$(movemail_bin)
+
+override_dh_auto_clean: $(persistent_autogen_files)
+ true
+
+override_dh_clean: $(persistent_autogen_files)
+ dh_clean
+ rm -rf \
+ debian/stamp-* \
+ debian/build-lucid \
+ debian/build-nox \
+ debian/build-src \
+ debian/build-x \
+ debian/elgz-canary \
+ debian/elgz-info \
+ debian/emacsVER-common.README.00 \
+ debian/emacsVER-common.README.01 \
+ debian/install-lucid \
+ debian/install-nox \
+ debian/install-x
+ rm -f $(nonpersistent_autogen_files)
--- /dev/null
+3.0 (quilt)
--- /dev/null
+#!/usr/bin/perl -w
+
+use strict;
+use English;
+
+open(my $config_file, '<', 'configure.ac')
+ or die "cannot open configure.ac: $!";
+
+my $version = '';
+my $found_init = 0;
+while (<$config_file>)
+{
+ if(/^AC_INIT\(GNU Emacs,\s*(\d+\.\d+(\.\d+)?)\s*\,.*/o)
+ {
+ $found_init and die 'found duplicate AC_INIT() in configure.ac';
+ $version = $1;
+ $found_init = 1;
+ }
+}
+
+$found_init or die 'no AC_INIT() found in configure.ac';
+print "$version\n";
projects / emacs25.git / commitdiff