From f065cd1c649ba5e4e286c529c19e4eb54640352c Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 24 Mar 2024 16:30:50 -0500 Subject: [PATCH 1/1] Import emacs_29.3+1-1.debian.tar.xz [dgit import tarball emacs 1:29.3+1-1 emacs_29.3+1-1.debian.tar.xz] --- .git-dpm | 8 + 00debian.el | 14 + README.add-on-package-maintainers | 2 + autofiles-diff-header | 3 + changelog | 3128 +++++++++++++++++ control | 200 ++ copyright | 990 ++++++ copyright.in | 990 ++++++ emacs-bin-common.lintian-overrides | 3 + emacs-bin-common.postinst.in | 13 + emacs-bin-common.prerm.in | 13 + emacs-common.README.in | 20 + emacs-common.docs | 3 + emacs-common.postinst.in | 45 + emacs-common.prerm.in | 13 + emacs-term.desktop | 13 + emacs.desktop | 15 + emacsVAR.lintian-overrides | 7 + emacsVAR.postinst | 42 + emacsVAR.prerm | 18 + patch-to-news | 99 + .../0001-Prefer-usr-share-info-emacs.patch | 27 + ...-startup-and-set-debian-emacs-flavor.patch | 48 + ...t-appear-to-be-incompatible-with-the.patch | 256 ++ ...-documentation-references-for-Debian.patch | 29 + ...t-of-version-to-indicate-Debian-modi.patch | 26 + ...ld-src-macuvs.h-via-IVD_Sequences.tx.patch | 24 + ...t-in-package-test.el-to-avoid-a-race.patch | 40 + ...-fauilt-bzr-autoloads-as-unstable-fo.patch | 74 + ...DUMP_RELOC_ALIGNMENT_BITS-1-for-m68k.patch | 47 + ...10-Mark-test-undo-region-as-unstable.patch | 48 + ...process-tests-multiple-threads-waiti.patch | 46 + .../0012-Add-inhibit-native-compilation.patch | 146 + ...inhibit-automatic-native-compilation.patch | 99 + ...-recognizes-git-test-for-Debian-buil.patch | 22 + ...-comp-async-jobs-number-default-to-1.patch | 22 + patches/series | 15 + rules | 659 ++++ source/format | 1 + source/lintian-overrides | 1 + upstream-version | 22 + 41 files changed, 7291 insertions(+) create mode 100644 .git-dpm create mode 100644 00debian.el create mode 100644 README.add-on-package-maintainers create mode 100644 autofiles-diff-header create mode 100644 changelog create mode 100644 control create mode 100644 copyright create mode 100644 copyright.in create mode 100644 emacs-bin-common.lintian-overrides create mode 100644 emacs-bin-common.postinst.in create mode 100644 emacs-bin-common.prerm.in create mode 100644 emacs-common.README.in create mode 100644 emacs-common.docs create mode 100644 emacs-common.postinst.in create mode 100644 emacs-common.prerm.in create mode 100644 emacs-term.desktop create mode 100644 emacs.desktop create mode 100644 emacsVAR.lintian-overrides create mode 100644 emacsVAR.postinst create mode 100644 emacsVAR.prerm create mode 100755 patch-to-news create mode 100644 patches/0001-Prefer-usr-share-info-emacs.patch create mode 100644 patches/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch create mode 100644 patches/0003-Remove-files-that-appear-to-be-incompatible-with-the.patch create mode 100644 patches/0004-Adjust-documentation-references-for-Debian.patch create mode 100644 patches/0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch create mode 100644 patches/0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch create mode 100644 patches/0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch create mode 100644 patches/0008-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch create mode 100644 patches/0009-pdumper-set-DUMP_RELOC_ALIGNMENT_BITS-1-for-m68k.patch create mode 100644 patches/0010-Mark-test-undo-region-as-unstable.patch create mode 100644 patches/0011-Mark-flaky-test-process-tests-multiple-threads-waiti.patch create mode 100644 patches/0012-Add-inhibit-native-compilation.patch create mode 100644 patches/0013-Rename-to-inhibit-automatic-native-compilation.patch create mode 100644 patches/0014-Patch-project-vc-recognizes-git-test-for-Debian-buil.patch create mode 100644 patches/0015-Change-native-comp-async-jobs-number-default-to-1.patch create mode 100644 patches/series create mode 100755 rules create mode 100644 source/format create mode 100644 source/lintian-overrides create mode 100755 upstream-version diff --git a/.git-dpm b/.git-dpm new file mode 100644 index 00000000000..8d90d3c0126 --- /dev/null +++ b/.git-dpm @@ -0,0 +1,8 @@ +# see git-dpm(1) from git-dpm package +ceeba43276b3867407905ad5296f66b7115abb31 +ceeba43276b3867407905ad5296f66b7115abb31 +d7948bf1afaf41355764ec21756f35dfd78a1813 +d7948bf1afaf41355764ec21756f35dfd78a1813 +emacs_29.3+1.orig.tar.xz +c5910d788335c197bd5fa6abbc6d5e6086df5487 +29289064 diff --git a/00debian.el b/00debian.el new file mode 100644 index 00000000000..0d2390846f1 --- /dev/null +++ b/00debian.el @@ -0,0 +1,14 @@ + +;; Set the default mail server and news server as specified by Debian +;; policy. + +(setq gnus-nntpserver-file "/etc/news/server") + +(setq mail-host-address (let ((name (expand-file-name "/etc/mailname"))) + (if (not (file-readable-p name)) + nil + (with-temp-buffer + (insert-file-contents-literally name) + (while (search-forward "\n" nil t) + (replace-match "" nil t)) + (buffer-string))))) diff --git a/README.add-on-package-maintainers b/README.add-on-package-maintainers new file mode 100644 index 00000000000..ee71a4503a3 --- /dev/null +++ b/README.add-on-package-maintainers @@ -0,0 +1,2 @@ +Please see /usr/share/doc/emacsen-common/debian-emacs-policy.gz for +information on how to properly structure your emacs add-on packages. diff --git a/autofiles-diff-header b/autofiles-diff-header new file mode 100644 index 00000000000..b4d6dae38b7 --- /dev/null +++ b/autofiles-diff-header @@ -0,0 +1,3 @@ +* The autoconf related files have been updated. + Patch: autofiles.dpatch + Author: N/A (automatically generated) diff --git a/changelog b/changelog new file mode 100644 index 00000000000..6ffab5c7af8 --- /dev/null +++ b/changelog @@ -0,0 +1,3128 @@ +emacs (1:29.3+1-1) unstable; urgency=high + + * Merge upstream version 29.3. Thanks to David Bremner for the + report. (Closes: 1067630) + + * Update debian/copyright for 29.3 + + -- Rob Browning Sun, 24 Mar 2024 16:30:50 -0500 + +emacs (1:29.2+1-2) unstable; urgency=medium + + * Fix Breaks/Replaces by prepending missing epoch (Closes: #1064851) + + -- Sean Whitton Tue, 27 Feb 2024 09:26:29 +0800 + +emacs (1:29.2+1-1) unstable; urgency=medium + + [ Rob Browning ] + * Give each Emacs flavor its own emacsclient. + Move emacsclient from emacs-bin-common to the emacsVER (i.e. + emacs-lucid, emacs-gtk, ...) packages so that each one will have the + binary that was built for that flavor. + + Explicitly list the variant and common bin alternatives instead of + globbing. Add the alternatives variables to deb_sub so we don't need + the separate perl -i substitutions. + + Stop splitting some of the debian/rules $(call ...) invocations across + two lines because it was introducing a space into the argument value + which would then break quoted expansions like "$(1)...". + + Thanks to Wang Yizhen & others for discussion. + Closes: #1050953. See also: #1043060. + + * Generate README.Debian from patch README-Debian psuedo-headers. + + Rework debian/patch-to-news to generate the README.Debian entry from a + README-Debian DEP-3-style psuedo-header, when present. The header's + syntax is similar to the debian/control Description format. Among + other things, this change makes the common case of cherry-picking + upstream patches easier, and less invasive, since in many cases, a + simple README-Debian header can be appended while adding the other + headers, instead of (as previously) reindenting the upstream commit, etc. + + * Adjust debian/patches for the new patch-to-news. + + * debian/emacs-common.README.in: drop vestigial ".elc removal" notice. + Long irrelevant since switching to base the packaging on the upstream + source repository. + + * debian/emacs-common.README.in: match NEWS mode/format vars. + + [ Sean Whitton ] + * Merge upstream version 29.2. + + * debian/control: Add Breaks/Replaces for emacsclient package move. + + -- Sean Whitton Mon, 26 Feb 2024 16:55:58 +0800 + +emacs (1:29.1+1-5) unstable; urgency=medium + + * Don't try to build with native compilation on riscv64 (Closes: #1050653). + Thanks to Aurelien Jarno and Bo YU. + + * Change native-comp-async-jobs-number default to 1 (Closes: #1050577). + + * d/rules: Re-encode in UTF-8. + + * d/copyright: Standardise continuation lines. + + * d/compat: Replace with debhelper-compat build-dep. + * d/control: Update build-dep libncurses5-dev -> libncurses-dev. + * d/control emacs-common: Comment out redundant Recommends of emacs-el. + * d/control emacs-common: Drop some very old Breaks emacsNN entries. + + * Fix binary-without-manpage Lintian overrides. + * Add two Lintian overrides. + + -- Sean Whitton Wed, 30 Aug 2023 08:53:05 +0100 + +emacs (1:29.1+1-4) unstable; urgency=medium + + * Take emacs-el from the pgtk build too to fix arch:all-only build. + + -- Sean Whitton Wed, 23 Aug 2023 14:33:41 +0100 + +emacs (1:29.1+1-3) unstable; urgency=medium + + * Take emacs-bin-common binaries from the pgtk build (Closes: #1043060). + Use the pgtk build to populate emacs-common too, for simplicity. + Thanks to Arto Jantunen for investigation and discussion. + + * d/rules: Set TERM to avoid a build failure (Closes: #1043006). + Thanks to Gianfranco Costamagna for the report and fix. + + * d/rules: Fix dh_listpackages test for emacs-pgtk. + + * override_dh_auto_install: Delete $(install_dir_pgtk) too. + + -- Sean Whitton Wed, 23 Aug 2023 10:15:43 +0100 + +emacs (1:29.1+1-2) unstable; urgency=medium + + * Source-only upload. + + -- Sean Whitton Tue, 01 Aug 2023 19:24:27 +0100 + +emacs (1:29.1+1-1) unstable; urgency=medium + + * Merge upstream version 29.1. + - d/rules: Update for new name of emacs.pdmp. + - debian/upstream-version: Update regexp to find Emacs 29.1's AC_INIT. + + * Add new emacs-pgtk binary package for the PGTK port. + + * d/control: Add build-deps on libsqlite3, libtree-sitter and libwebp. + + * Patch project-vc-recognizes-git test for Debian build. + + -- Sean Whitton Mon, 31 Jul 2023 09:28:10 +0100 + +emacs (1:28.2+1-16) unstable; urgency=medium + + * Switch to gcc-13 & restore versioned gcc build-dep (Closes: #1042185). + + -- Sean Whitton Sat, 29 Jul 2023 10:31:54 +0100 + +emacs (1:28.2+1-15) unstable; urgency=medium + + * emacs-common: add breaks/replaces emacs-bin-common (<< 1:28) since the + emacs.service file moved from emacs-bin-common to emacs-common. + Thanks to Helmut Grohne for reporting the problem and Andreas Beckmann + for providing and testing the fix. (Closes: 1034941) + + * emacs-common: add breaks elpa-cider (<< 0.19.0+dfsg-4~). Thanks to + Andreas Beckmann for reporting the problem and providing and testing + the fix. (Closes: 1035781) + + -- Rob Browning Sat, 13 May 2023 15:17:27 -0500 + +emacs (1:28.2+1-14) unstable; urgency=medium + + * Fix gnus nnml crash on some invalid headers. Add + 0026-Gnus-nnml-should-avoid-crashing-on-some-invalid-head.patch to + address the issue. (Closes: 1033397) + + * Fix Org Mode command injection vulnerability CVE-2023-28617. Add + 0027-Org-Mode-vulnerability-CVE-2023-28617-is-fixed-1-2.patch and + 0028-Org-Mode-vulnerability-CVE-2023-28617-is-fixed-2-2.patch to + address the issue. (Closes: 1033342) + + -- Rob Browning Sat, 01 Apr 2023 22:38:56 -0500 + +emacs (1:28.2+1-13) unstable; urgency=high + + * Cherry-pick upstream fixes for command injection vulnerabilities + (CVE-2023-27985, CVE-2023-27986) (Closes: #1032538). + + -- Sean Whitton Tue, 14 Mar 2023 13:30:28 -0700 + +emacs (1:28.2+1-12) unstable; urgency=medium + + * Fix memory leak in etags.c introduced by recent security fix. + Thanks to Adrian Bunk for identifying the issue. + + -- Sean Whitton Thu, 02 Mar 2023 12:21:19 -0700 + +emacs (1:28.2+1-11) unstable; urgency=high + + * Cherry-pick upstream fixes for command injection vulnerabilities + (CVE-2022-48337, CVE-2022-48338, CVE-2022-48339) (Closes: #1031730). + + -- Sean Whitton Wed, 22 Feb 2023 11:01:50 -0700 + +emacs (1:28.2+1-10) unstable; urgency=medium + + * Fix copyright tests for 2023 onwards. Thanks to Mattias Engdegård for + the fix, and Vincent Lefevre for reporting the bug and posting the + patch to the Debian BTS (Closes: #1028607). + + -- Sean Whitton Tue, 17 Jan 2023 17:32:40 -0700 + +emacs (1:28.2+1-9) unstable; urgency=medium + + * Backport inhibit-automatic-native-compilation from Emacs 29. + We intend to use the EMACS_INHIBIT_AUTOMATIC_NATIVE_COMPILATION + environment variable to address bugs like #1021842. + + -- Sean Whitton Sun, 18 Dec 2022 15:36:53 -0700 + +emacs (1:28.2+1-8) unstable; urgency=high + + * Fix ctags local command execution vulnerability (CVE-2022-45939) + (Closes: #1025009). + + -- Sean Whitton Thu, 01 Dec 2022 18:44:21 -0700 + +emacs (1:28.2+1-7) unstable; urgency=medium + + * Drop unused gcc-12 and libmagick++-6.q16-dev build-deps. + + * Add liblcms2-dev build-dep. + + * d/copyright: Fix format of Upstream-Contact field. + + * d/copyright: Fix the names of upstream's release tag and our tarball. + Introduce a new substitution variable, DEBORIG_VERSION. + + * Run 'wrap-and-sort -st' + Additionally apply the changes to d/copyright.in. + + -- Sean Whitton Sun, 27 Nov 2022 17:37:32 -0700 + +emacs (1:28.2+1-6) unstable; urgency=medium + + * Mark two flaky tests as unstable. + test-undo-region is failing on Debian arch:all autobuilders, and + process-tests/multiple-threads-waiting randomly fails locally and on + autobuilders. (Closes: #1024060) + + -- Sean Whitton Thu, 17 Nov 2022 13:13:12 -0700 + +emacs (1:28.2+1-5) unstable; urgency=medium + + * Fix large core dumps from background processes. + Add 0013-Fix-large-core-dumps-from-background-processes.patch to fix + the problem. (Closes: #1017711) + + -- Sean Whitton Sun, 13 Nov 2022 13:44:02 -0700 + +emacs (1:28.2+1-4) unstable; urgency=medium + + * Fix eln files not being generated by native-comp-async. + Add 0012-Fix-eln-files-not-being-generated-when-native-comp-a.patch to + fix the problem. Thanks to Youhei SASAKI and Tatsuya Kinoshita for + reporting the problem and indicating the upstream fix to backport + (Closes: #1023440). + + -- Sean Whitton Tue, 08 Nov 2022 12:32:50 -0700 + +emacs (1:28.2+1-3) unstable; urgency=medium + + * Avoid fork bomb caused by native compilation trampolines. + Add 0011-Avoid-fork-bomb-caused-by-native-compilation-trampol.patch to + fix the problem. + + -- Sean Whitton Thu, 27 Oct 2022 15:41:35 -0700 + +emacs (1:28.2+1-2) unstable; urgency=medium + + * Avoid fork bomb caused by native compilation. Add + 0010-Avoid-fork-bomb-caused-by-native-compilation.patch to fix the + problem. Thanks to Aymeric Agon-Rambosson for help backporting the + patch. + + -- Sean Whitton Tue, 25 Oct 2022 18:41:26 -0700 + +emacs (1:28.2+1-1) unstable; urgency=medium + + * Merge upstream version 28.2. + + * Add myself, Sean Whitton, to Uploaders field. + + -- Sean Whitton Thu, 13 Oct 2022 16:32:09 -0700 + +emacs (1:28.1+1-4) unstable; urgency=medium + + [ Rob Browning ] + * debian/rules: don't set debian CFLAGS to -O0 on arm64 anymore. It + looks like this may be fixed now. Let's see. + + * Disable debian mips64el native compilation given ABI incompatibility. + Currently ./configure fails on eller.debian.org (mipsel host with + mips64 sbuild chroot) with this in the config.log: Error: -march=mips1 + is not compatible with the selected ABI. + + * Disable debian s390x native compilation to avoid build crashes. + cf. https://debbugs.gnu.org/57789 + + * Fix pdumper alignment problem causing m68k build failures. Add + 0009-pdumper-set-DUMP_RELOC_ALIGNMENT_BITS-1-for-m68k.patch to address + the issue. Thanks to John Paul Adrian Glaubitz for the + patch. (Closes: 1019130) + + * Ignore lintian shared-library-lacks-prerequisites for eln files. + + * Don't crash when the ~/.emacs.d/eln-cache isn't writable. Add + 0010-Emacs-should-no-longer-crash-when-the-eln-cache-isn-.patch to fix + the problem. Thanks to David Bremner for helping pursue the issue. + + [ Nicholas D Steeves ] + * Don't enable Debian systemd unit by default. + + -- Rob Browning Mon, 26 Sep 2022 20:27:06 -0500 + +emacs (1:28.1+1-3) unstable; urgency=medium + + * Have emacs-common depend on emacs-el until the crash is resolved. + This should mitigate a whole raft of bugs, some of which have been + merged into #1017698. + + * debian/copyright: fix DEP-5 format errors. Have one upstream-contact + with multiple values (DEP-5), and separate paragraphs in comments with + " ." lines. + + -- Rob Browning Wed, 07 Sep 2022 16:08:01 -0500 + +emacs (1:28.1+1-2) unstable; urgency=medium + + * Switch from gcc 11 to 12. + + -- Rob Browning Sat, 20 Aug 2022 17:02:41 -0500 + +emacs (1:28.1+1-1) unstable; urgency=medium + + * Merge upstream version 28.1. (Closes: #1009169) + + * Update debian/copyright for 28.1. + + * Drop 0008-Don-t-downcase-real-xref-in-elisp-mode-tests.patch. This + appears to have been addressed upstream, and now the patch just breaks + the tests. + + * debian/rules: configure --with-libsystemd not --enable-libsystemd. + The latter doesn't appear to be a supported option. + + * debian/control: recommend fonts-noto-color-emoji. See "** Improved + support for Emoji" in the 28.1 NEWS. + + * debian/rules: update copyrights; rely on dpkg pkg-info.mk for src_name + and debian_ver; rely on dpkg architecture.mk for DEB_HOST_* + DEB_BUILD_*.; move libexecdir /usr/lib to /usr/libexec. + + * debian/emacs.desktop: add upstream "StartupNotify=true". + + * debian/compat: upgrade from 10 to 13. + + * Enable native compilation for debian. Thanks to Aymeric + Agon-Rambosson for noting that the native-lisp tree is flavor + specific. + + * debian/control: add ca-certificates build dependency for tests. The + process-async-https-with-delay test depends on it. + + * debian/changelog: add 1:27.1+1-3.1 NMU. + + -- Rob Browning Fri, 15 Jul 2022 17:26:23 -0500 + +emacs (1:27.1+1-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * d/p/0014-Skip-tests-that-require-Internet-when-there-s-no-Int.patch: + Skip tests that require internet connection, fixing a FTBFS. + (Closes: #982969) + + -- Sergio Durigan Junior Sat, 20 Mar 2021 17:41:44 -0400 + +emacs (1:27.1+1-3) unstable; urgency=medium + + * Strip parent path from package descriptions for reprodcibility. Add + 0012-Strip-parent-path-from-package-descriptions-for-repr.patch to + incorporate the changes. Thanks to Chris Lamb for reporting the + problem and tracking down the cause. (Closes: 972861) + + * Apply upstream patch to restore schemas.xml to fix nXML mode. Add + 0013-Recover-the-contents-of-the-schemas.xml-file.patch to incorporate + the changes. Thanks to Yasuhiro KIMURA for reporting the problem and + the fix. (Closes: 973633) + + -- Rob Browning Sat, 07 Nov 2020 16:16:23 -0600 + +emacs (1:27.1+1-2) unstable; urgency=medium + + * Upload to unstable. + + -- Rob Browning Sat, 24 Oct 2020 11:31:42 -0500 + +emacs (1:27.1+1-1) experimental; urgency=medium + + * Merge upstream version 27.1. + + * Update debian/control for 27.1. + + * Update debian/copyright for 27.1. + + * Update debian/control build-deps for 27.1. + + * Fix emacs-module-tests to work with VPATH builds. Add + 0011-emacs-module-tests-fix-VPATH-builds.patch to address the issue. + + * debian/rules: put new pdmp files in flavor-specific packages. + + -- Rob Browning Sun, 23 Aug 2020 16:09:09 -0500 + +emacs (1:26.3+1-2) unstable; urgency=medium + + * Fix intermittent test failures in process-tests. Add + 0012-The-Emacs-process-tests-should-no-longer-fail-interm.patch to + address the issue. Thanks to Ivo De Decker for reporting the problem, + J. Smith for tracking down the upstream bug, and Nick Gasson for + locating the upstream patch. (Closes: 944616) + + -- Rob Browning Sat, 16 May 2020 19:25:51 -0500 + +emacs (1:26.3+1-1) unstable; urgency=medium + + * Merge upstream version 26.3. (Closes: 939737) + + * Update debian/copyright for 26.3. + + * Update debian/control for 26.3. + + * Don't override the upstream EPLA packaging key anymore. Emacs 26.3 + has the correct version. + + -- Rob Browning Mon, 09 Sep 2019 20:17:48 -0500 + +emacs (1:26.1+1-4) unstable; urgency=high + + * Update the EPLA packaging key (previous key expires 2019-09-23) via + the upstream commit f16785d361097df9fddfcc0b60ae6f0d92e7e911. Add the + old and new keyrings to debian/ and debian/source/include-binaries + since debian/patches/ can't handle git binary diffs. Thanks to Stefan + Monnier for reporting the problem and providing the patch. + + -- Rob Browning Sun, 08 Sep 2019 15:02:23 -0500 + +emacs (1:26.1+1-3.3) unstable; urgency=medium + + * Non-maintainer upload. + + * Drop transitional versioned emacsXX* packages. + + * Cherry-pick 408bf21a8c and 95b77b0451 to fix crashes with color fonts, + thanks to Vincent Lefevre. (Closes: #929567) + + -- Andreas Beckmann Fri, 12 Jul 2019 20:42:27 +0200 + +emacs (1:26.1+1-3.2) unstable; urgency=medium + + * Non-maintainer upload. + + * Add more transitional packages for ancient versioned packages + emacs21{,-nox}, emacs22{,-gtk,-nox}. (Closes: #916758) + + * Drop -dbg packages in favor of autogenerated -dbgsym packages. + + -- Andreas Beckmann Sun, 03 Feb 2019 15:42:30 +0100 + +emacs (1:26.1+1-3.1) unstable; urgency=medium + + * Non-maintainer upload. + + * Really handle the emacs-{gtk,lucid,nox} doc dir transition manually. + This cannot be handled by 'dpkg-maintscript-helper dir_to_symlink' because + of the arch:all to arch:any switch at the same time (bug #813455). + Do not forcibly remove the old docdir in the preinst to avoid bad effects + on other packages. Instead, in the postinst, replace the now empty + directory with the intended symlink. (Closes: #911616) + + * emacs-common: Add Breaks against all (versioned) emacs binary packages + predating the unversioning in 1:25. + + * emacs-common: Add Breaks against known incompatible packages: + - edb (Closes: #875430) + - egg (Closes: #910925) + + * Add Vcs-* URLs. (Closes: #690771) + + * Cherry-pick 34b4da37 to fix a test failure. (Closes: #918646) + + * Clean-up debian/control. + + * Use https:// URLs and update FSF address. + + * Update Lintian overrides. + + -- Andreas Beckmann Mon, 28 Jan 2019 14:18:17 +0100 + +emacs (1:26.1+1-3) unstable; urgency=medium + + * Recommend mailutils instead of depending on it. + (Closes: 917245, 916986) + + -- Rob Browning Wed, 26 Dec 2018 13:54:16 -0600 + +emacs (1:26.1+1-2) unstable; urgency=medium + + * Update emacs metapackage to depend on >= 1:26.1. + + * Enable support for systemd socket activation. Thanks to Ansgar + Burchardt for the report. (Closes: 916760) + + -- Rob Browning Thu, 20 Dec 2018 10:49:20 -0600 + +emacs (1:26.1+1-1) experimental; urgency=medium + + * Merge upstream version 26.1. (Closes: #907997) + + * Update debian/copyright version for 26.1. + + * Use more secure mailutils instead of internal movemail. See the + 26.1 NEWS for more information. + + * Add debian/copyright entries for 26.1. + + * Fix epg-tests with upstream patch for newer GnuPG. Add + 0009-An-epg-test-failure-with-recent-GnuPG-versions-has-b.patch to + fix the problem. + + * Mark the vc-bzr-test-faulty-bzr-autoloads as unstable for now. + Add 0010-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch to + disable the test for now. See the patch header for a description + of the error. + + * tramp-test42-remote-load-path: regexp-quote directory. Add + 0011-tramp-test42-remote-load-path-regexp-quote-directory.patch to + fix the problem. Otherwise the test may fail for some paths like + those seen in an sbuild chroot, + e.g. build/emacs-i87jK3/emacs-26.1+1/... + + * ibuffer-filter-inclusion-3: regexp-quote directory. Add + 0012-ibuffer-filter-inclusion-3-regexp-quote-directory.patch to + fix the problem. Otherwise the test may fail for some paths like + those seen in an sbuild chroot, + e.g. build/emacs-i87jK3/emacs-26.1+1/... + + * Mark echo-server-with-dns test as :unstable for now. It fails + inside a Debian sbuild chroot. + + -- Rob Browning Mon, 17 Dec 2018 16:41:12 -0600 + +emacs (1:25.2+1-11) unstable; urgency=medium + + * Add (>= 1:25) restriction to emacs metapackage dependencies. + Without this it was possible to end up with two empty metapackages + installed instead of the expected metapackage and actual package. + Thanks to Shin Yoshida for reporting the problem and Sven Joachim + for noting the solution. (Closes: 906534) + + * Don't unexpectedly modify the byte order mark. Add + 0014-Emacs-should-no-longer-unexpectedly-alter-the-byte-o.patch to + fix the problem. Thanks to Vincent Lefevre for reporting the + problem and Eli Zaretskii for the patch. (Closes: 883434) + + -- Rob Browning Sun, 26 Aug 2018 11:49:09 -0500 + +emacs (1:25.2+1-10) unstable; urgency=medium + + * Handle the emacs-{gtk,lucid,nox} doc dir transition manually. + Before the unversioning, these packages were in a different source + package (emacs-defaults) and were arch all. Since + dpkg-maintscript-helper can't hande "all to any" transitions + (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=813455), clean + up manually in the preinsts. Thanks to Sven Joachim for reporting + the problem and indentifying the underlying cause. + (Closes: 905555) + + -- Rob Browning Sun, 12 Aug 2018 11:55:27 -0500 + +emacs (1:25.2+1-9) unstable; urgency=medium + + * Disable the eieio-test-37-obsolete-name-in-constructor test. Its + behavior is unpredictable, and it was causing some buildd builds + to fail (cf. https://debbugs.gnu.org/24503). Add + 0013-Disable-eieio-test-37-obsolete-name-in-constructor.patch to + fix the problem, and thanks to Aaron M. Ucko for reporting it, and + J. Smith for tracking down the upstream issue. (Closes: 879020) + + * Ensure /usr/share/doc/emacs-{gtk,lucid,nox} symlink is + established. Use dir_to_symlink to make sure the new symlink to + emacs-common is correctly established if we're upgrading from the + emacs-defaults packages that had a real directory. Thanks to + Andreas Beckmann for reporting the problem. (Closes: 903779) + + * Have emacs-{gtk,lucid,nox} replace all the related emacs25 + packages. Add "emacs-gtk (<< 1:25), emacs-lucid (<< 1:25), + emacs-nox (<< 1:25)" to the "Replaces:" for emacs-gtk, + emacs-lucid, and emacs-nox to avoid conflicts over + /usr/share/emacs/25.2/etc/DOC while unpacking. Thanks to Axel + Beckert for reporting the problem and Adrian Bunk and Sven Joachim + for help with the solution. (Closes: 904957) + + -- Rob Browning Sat, 04 Aug 2018 12:29:53 -0500 + +emacs (1:25.2+1-8) unstable; urgency=medium + + * Move unversioned emacs packages from experimental to unstable. + + -- Rob Browning Sun, 29 Jul 2018 10:46:26 -0500 + +emacs (1:25.2+1-7) experimental; urgency=medium + + * Unversion the emacs packages. Remove the major version from all + of the packages. The flexibility provided no longer appears worth + the complexity given the more frequent upstream releases, and + backward-compatability across them. + + * Update debian/patches for emacs25 to emacs migration. + + * Rename emacsXY to emacsXY-gtk. + + * Fix dbg package self-dependencies. + + * Stop versioning packages; change emacs25 to emacs. + + * Move mail-host-address and gnus-nntpserver-file to new + 00debian.el. + + * Move emacs binary metapackage to this package. Add epoch so that + new versions of the metapackage will be higher than the last + standalone version (47.0). + + * Handle local emacs/site-lisp here instead of in emacsen-common. + + * Depend on emacsen-common (>= 3.0.0) This will complete the + transfer of the emacs metapackage namespace to the emacs source + package as a new concrete emacs flavor. + + * Add emacs23, emacs24, and emacs25 transitional packages. + + * debian/control: change priority extra to optional as per policy. + + * Have binary flavor packages depend on emacs-common for doc + symlink. + + -- Rob Browning Sun, 27 May 2018 10:57:34 -0500 + +emacs25 (25.2+1-6) unstable; urgency=high + + * Block remote code execution via enriched text. Add + 0012-A-remote-execution-exploit-via-enriched-text-has-bee.patch to + fix the problem. Thanks to David Bremner for the alert and + Salvatore Bonaccorso for reporting the problem to Debian. + (Closes: 875447) + + -- Rob Browning Mon, 11 Sep 2017 21:51:49 -0500 + +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 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 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 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 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 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 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 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 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 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 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 for help locating the set + of patches, and Esa Peuha for reporting the + problem. (Closes: 808347) + + -- Rob Browning 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 for reporting the + problem. (Closes: 805904) + + -- Rob Browning 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 + for reporting the problem. (Closes: 803060) + + -- Rob Browning 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 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 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 + for reporting the problem, and Ben Finney + 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 + for reporting the problem and tracking down the + fix. (Closes: 795909) + + -- Rob Browning 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 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 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 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 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 for + tracking down the problem and providing the fix. + + -- Rob Browning 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 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 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 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 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 for + reporting the problem. (Closes: 747624) + + -- Rob Browning 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 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 for the report, and + to him and Justin B Rye 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 + for the report. (Closes: 725099) + + * Change the build dependency from libtiff4-dev to libtiff-dev. + Thanks to Jay Berkenbilt for the report. + (Closes: 735999) + + -- Rob Browning 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 for the report, and Samuel + Bronson for the patch. (Closes: 684788) + + * debian/rules: clean src/stamp-h.in. + Thanks to Samuel Bronson for the patch. + + * Explicitly create $(pkgdir_el) in debian/rules (fix FTBS). + Thanks to Lucas Nussbaum for the report, + Matt Kraai for the patch, and Dmitrijs Ledkovs + for the 24.3+1-1.1 NMU. (Closes: 707488) + + * Specify --without-gsettings for emacsFLAVOR-nox and emacsFLAVOR-lucid. + Thanks to Yuri D'Elia 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 for the report. + (Closes: 712974) + + -- Rob Browning 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 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 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 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 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 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 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 for the report. + (Closes: #679679) + + -- Rob Browning 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 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 and Sven + Arvidsson for the initial reports, and Karel Klíč + for the patch. (Closes: #666691) + + -- Rob Browning 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 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 for the report. (Closes: #635938) + + * Update debian/* for Emacs 23.4. + + * Depend on libpng-dev rather than libpng12-dev. Thanks to Nobuhiro + Iwamatsu 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 for the report. + (Closes: #655592) + + -- Rob Browning 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 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 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 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 + for the report. (Closes: #632142) + + * Change negated build-dep [!hurd-i386...] to [linux-any]. Thanks + to Robert Millan for the report. + (Closes: #634336) + + -- Rob Browning 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 for the report + and the patch. (Closes: #646609) + + -- Rob Browning 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 for the report and the patch, + and and Philipp Kern for the 23.3+1-1.1 NMU, which + included it. (Closes: #629567) + + -- Rob Browning 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 for the + report, Sven Joachim for the patch, and Philipp + Kern 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 for the report and Philipp + Kern 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 for the report and the patch, and + thanks to Philipp Kern for the 23.3+1-1.1 NMU + which included the patch. (Closes: #629567) + + -- Rob Browning 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 for the report + and Matthias Klose 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 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 + for the report and the patch. + (closes: #611591) + + * Remove debian/dfsg-splitter since the split is now being handled + directly in git. + + -- Rob Browning 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 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 + for the report and the fix. + (closes: #594510) + + -- Rob Browning 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 + for the report, and thanks to Mehdi Dogguy + for the 23.2+1-5.1 NMU. (closes: #600826) + + -- Rob Browning 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 and Sven Joachim + 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 for the report and Sven + Joachim 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 + 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 for the report + and Sven Joachim for tracking down the + patch. (closes: #588808) + + -- Rob Browning 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 + for the report. (closes: #592992) + + -- Rob Browning 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 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 for the + report and thanks to Stéphane Glondu for the + 23.2+1-2.1 NMU. (closes: #582439) + + * Remove deprecated Encoding field from emacsVER.desktop. Thanks to + Stéphane Glondu 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 + for the 23.2+1-2.1 NMU. + + * Add a Homepage field to debian/control.in. Thanks to Stéphane + Glondu 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 + for the 23.2+1-2.1 NMU. + + * Change quilt Build-Depends from (>= 0.42-1) to (>= 0.42). Thanks + to Stéphane Glondu 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 + , and thanks to Stéphane Glondu + for the 23.2+1-2.1 NMU. + + * Add ${misc:Depends} to debian/control for debhelper. Thanks to + Stéphane Glondu for the 23.2+1-2.1 NMU. + + * Fix startup hang on GNU/kFreeBSD (fix-kfreebsd-startup.diff). + Thanks to antoine beaupre for the report + and Petr Salinger for the patch. + (closes: #559392) + + -- Rob Browning 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 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 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 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 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 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 for + the report and Sven Joachim for tracking down + the patch. (closes: #560573) + + * Apply an upstream patch to include ZWJs and ZWNJs for all Indic + scripts. Thanks to Praveen A for the + report. (closes: #559292) + + * Fix update-alternatives call for emacs manpage. Thanks to + Jörg-Volker Peetz and Sven Joachim + for the report. (closes: #552565) + + -- Rob Browning 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 for the report. + (closes: 550541) + + -- Rob Browning 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 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 for the report and the + fix. (closes: 545379) + + * Add a bit to the emacsVER-lucid description. Thanks to Drew + Parsons 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 + for the suggestion. (closes: #545405) + + -- Rob Browning 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 . (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 + and others for the report. + (closes: #539800) + + * Don't build-depend on libgmp-dev on hurd or kfreebsd. Thanks to + Cyril Brulebois . (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 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 for the report and Sven Joachim + for the fix. (closes: #540234) + + -- Rob Browning 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 . (See emacs21 bugs #532600, #532599, + #532597, and #532602.) + + * Add libpm-dev and libdbus-1-dev build dependencies. Thanks to + Sven Joachim 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 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 Sat, 18 Jul 2009 18:41:25 -0700 + +emacs22 (22.3+1-1) unstable; urgency=low + + * New upstream release. (closes: #512134) + + -- Rob Browning 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 + 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 for proposing the + fix. (closes: #429059) + + -- Rob Browning 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 and Michael Berg . + (closes: #499568) + + * Invoke xmlstarlet from flymake as xmlstarlet rather than xml. Thanks + to Jussi Judin . (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 and Michael Berg + . (closes: #476108) + + -- Rob Browning 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 and Morten + Welinder . (closes: #480885) + + * Don't remove /usr/local/share/emacs/site-lisp in emacs22-common. + Leave that up to emacsen-common. Thanks to Sven Joachim + . (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 . + (closes: #488427) + + * Don't look for GNU to find etc/. Look for NEWS instead. Thanks to + "Bernhard Michler" for the report and Sven Joachim + 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 . (closes: #476223) + + -- Rob Browning 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 . + (closes: #448391, #477215) + + * Fix an insecurity in vcdiff's temporary file handling + (CVE-2008-1694). Thanks to Moritz Muehlenhoff and + Steve Grubb. (closes: #476611) + + -- Rob Browning 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 + . (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 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 + . (closes: #472419) + + -- Rob Browning 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 , 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 + (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 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 + . (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 . (closes: #457539) + + -- Rob Browning 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 . (closes: #433816) [rlb] + + * Fix control file for binary NMUs. Thanks to Lior Kaplan + . (closes: #432957) [rlb] + + * Fix problem with --no-bitmap-icon with upstream patch. Thanks to Sven + Joachim . (closes: #433969) [rlb] + + * Add build dependency versions of quilt that include support for + "header". Thanks to Max Dmitrichenko + . (closes: #432695) [rlb] + + * Incorporate upstream fixes to Emacs manpage. Thanks to Sven Joachim + . (closes: #432732) [rlb] + + * Symlink etc/COPYING and lisp/COPYING to + /usr/share/common-licenses/GPL-2. Thanks to Milan Zamazal + for the report. (closes: #436810) [rlb] + + -- Rob Browning 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 + 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 Fri, 06 Jul 2007 20:20:15 -0700 + +emacs22 (22.0.99+1-1) experimental; urgency=low + + * Update to 22.0.99. + + -- Rob Browning 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 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 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 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 . + (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 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 and + Henrik Holmboe . + (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 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 + (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 . + (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 . + (closes: #389063) [Jérôme Marant] + - debian/patches/misc-unseparated.diff: updated. + + -- Rob Browning 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 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 (updated by + Thiemo Seufer ) to fix segfaults on mips + and mipsel. Thanks for the hard work! (Closes: #381452) + + -- Marc 'HE' Brockschmidt 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 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 + . (closes: #367177) [rlb] + - debian/rules + + -- Rob Browning 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 . + (closes: #365597) [rlb] + - debian/control.in + + * Apply an upstream patch to fix an mmap related Hurd build problem. + Thanks to Michael Banck . (closes: #347554) [rlb] + - debian/patches/series + - debian/patches/hurd-mmap.diff + + -- Rob Browning 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 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 (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 + (closes: #273123) [Jérôme Marant] + - debian/patches/whitespace-readonly-infloop.dpatch: new file. + - debian/00list: updated. + + -- Rob Browning 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 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 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 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 . + - debian/patches/movemail-pop-fmt-vulnerability.dpatch + + -- Rob Browning 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 + (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 . + (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 . + (closes: #274427) [Jérôme Marant] + - debian/patches/remote-files-permissions.dpatch: new file. + - debian/patches/00list: updated. + + -- Rob Browning 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 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 . (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 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 + [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 [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 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 . + (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 . + (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 . (closes: #208206) [Jérôme Marant] + - Updated patch fixing browse-url's invocation of Mozilla. + Thanks to Jeff Sheinberg , + Martin Pool and KATO Kazuyoshi . + (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 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 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 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 . + (closes: #198736) + + -- Rob Browning 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 Wed, 13 Aug 2003 08:53:35 -0500 + +emacs21 (21.3-1) unstable; urgency=low + + * new upstream version. + + -- Rob Browning 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 . (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 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 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 Sat, 12 Oct 2002 15:09:37 -0500 + +emacs21 (21.2-3) unstable; urgency=low + + * Update emacs21-nox package description. + + -- Rob Browning 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 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 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 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 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 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 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 Tue, 13 Nov 2001 09:51:31 -0600 + +emacs21 (21.1-4) unstable; urgency=low + + * Really fix alternatives problem this time. + + -- Rob Browning 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 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 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 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 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 + . (closes: #101926) + + -- Rob Browning Tue, 10 Jul 2001 12:48:22 -0500 + +emacs20 (20.7-8) unstable; urgency=low + + * Added ia64 patches from Bdale Garbee 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 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 . (closes: #51348) + + -- Rob Browning 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 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 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 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 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 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 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 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 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 . Without this, + emacs20 will *not* build on either frozen or unstable x86 machines. + + -- Rob Browning 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 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 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 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 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 . + (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 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 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 Sat, 30 Oct 1999 13:24:39 -0500 + +emacs20 (20.3-11) unstable; urgency=low + + * Fix liblockfile version skew. (closes: #43803 #45123) + + -- Rob Browning 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 Tue, 6 Jul 1999 23:21:44 -0500 + +emacs20 (20.3-9) unstable; urgency=low + + * Added HURD patch from Marcus Brinkmann . + (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 Fri, 11 Jun 1999 00:43:51 -0500 + +emacs20 (20.3-8) unstable; urgency=low + + * Added patch to emacs.c from Wolfram Gloger + to fix exit segfaults. + (closes: #37745) + * Fixed suidregister inconsistency between postinst and postrm + (closes #36845) + + -- Rob Browning 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 + request). (closes: #30413). + * Undo broken (and unneeded) "fix" for suidregister call in postrm. + + -- Rob Browning 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 + (closes: #31279). + * Fix call to suidunregister (I didn't realize that it can't take + multiple file arguments) (closes: #21243 #26886). + + -- Rob Browning 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 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 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 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 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 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 + * update-elc now made executable (closes: #25899). Thanks to + Junio Hamano + * Fix problem with package including dirs in /usr/local/share + (closes: #23431). + + -- Rob Browning 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 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 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 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 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 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 Mon, 2 Mar 1998 12:02:33 -0600 + +emacs20 (20.2-2) unstable; urgency=low + + * fixed bad menu line (closes: #18362). + + -- Rob Browning 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 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 Tue, 16 Dec 1997 01:20:27 -0600 + +Local Variables: +coding: utf-8 +End: diff --git a/control b/control new file mode 100644 index 00000000000..e168717089f --- /dev/null +++ b/control @@ -0,0 +1,200 @@ +Source: emacs +Section: editors +Priority: optional +Maintainer: Rob Browning +Uploaders: Sean Whitton +Build-Depends: + autoconf, + automake, + bsd-mailx | mailx, + ca-certificates, + dbus-x11, + gcc-13, + debhelper-compat (= 13), + dpkg-dev (>> 1.10.0), + git, + gnupg-agent, + imagemagick, + libacl1-dev, + libasound2-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], + libcairo-dev, + libdbus-1-dev, + libgccjit-13-dev, + libgif-dev, + libgmp-dev, + libgnutls28-dev, + libgpm-dev [linux-any], + libgtk-3-dev, + libharfbuzz-dev, + libjansson-dev, + libjpeg-dev, + liblcms2-dev, + liblockfile-dev, + libm17n-dev, + libncurses-dev, + liboss4-salsa-dev [hurd-i386 kfreebsd-i386 kfreebsd-amd64], + libotf-dev, + libpng-dev, + librsvg2-dev, + libselinux1-dev [linux-any], + libsqlite3-dev, + libsystemd-dev, + libtiff-dev, + libtree-sitter-dev, + libwebp-dev, + libxaw7-dev, + libxml2-dev, + procps, + quilt (>= 0.42), + sharutils, + texinfo, + xaw3dg-dev, + zlib1g-dev, +Homepage: https://www.gnu.org/software/emacs/ +Standards-Version: 3.7.2 +Vcs-Browser: https://salsa.debian.org/rlb/deb-emacs +Vcs-Git: https://salsa.debian.org/rlb/deb-emacs.git + +Package: emacs +Architecture: all +Depends: + emacs-gtk (>= 1:27.1) | emacs-pgtk (>= 1:27.1) | emacs-lucid (>= 1:27.1) | emacs-nox (>= 1:27.1), + ${misc:Depends}, +Description: GNU Emacs editor (metapackage) + GNU Emacs is the extensible self-documenting text editor. + This is a metapackage that will always depend on the latest + recommended Emacs variant (currently emacs-gtk). + +Package: emacs-lucid +Architecture: any +Depends: + emacs-bin-common (= ${binary:Version}), + emacs-common (= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Provides: editor, emacs, emacsen, info-browser, mail-reader, news-reader +Recommends: fonts-noto-color-emoji +Suggests: emacs-common-non-dfsg +Conflicts: emacs-gtk, emacs-pgtk, emacs-nox +Replaces: emacs-gtk, emacs-pgtk, emacs-nox, emacs-bin-common (<< 1:29.2) +Breaks: emacs-bin-common (<< 1:29.2) +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 emacs-gtk 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: emacs-nox +Architecture: any +Depends: + emacs-bin-common (= ${binary:Version}), + emacs-common (= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Provides: editor, emacs, emacsen, info-browser, mail-reader, news-reader +Suggests: emacs-common-non-dfsg +Conflicts: emacs-gtk, emacs-pgtk, emacs-lucid +Replaces: emacs-gtk, emacs-pgtk, emacs-lucid, emacs-bin-common (<< 1:29.2) +Breaks: emacs-bin-common (<< 1:29.2) +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: emacs-gtk +Architecture: any +Depends: + emacs-bin-common (= ${binary:Version}), + emacs-common (= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Provides: editor, emacs, emacsen, info-browser, mail-reader, news-reader +Recommends: fonts-noto-color-emoji +Suggests: emacs-common-non-dfsg +Conflicts: emacs-pgtk, emacs-lucid, emacs-nox +Replaces: emacs-pgtk, emacs-lucid, emacs-nox, emacs-bin-common (<< 1:29.2) +Breaks: emacs-bin-common (<< 1:29.2) +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+ for X11 and Wayland (instead of the Lucid toolkit + provided by the emacs-lucid package). + . + If you are using Wayland, you may wish to install emacs-pgtk instead. + +Package: emacs-pgtk +Architecture: any +Depends: + emacs-bin-common (= ${binary:Version}), + emacs-common (= ${source:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +Provides: editor, emacs, emacsen, info-browser, mail-reader, news-reader +Recommends: fonts-noto-color-emoji +Suggests: emacs-common-non-dfsg +Conflicts: emacs-gtk, emacs-lucid, emacs-nox +Replaces: emacs-gtk, emacs-lucid, emacs-nox, emacs-bin-common (<< 1:29.2) +Breaks: emacs-bin-common (<< 1:29.2) +Description: GNU Emacs editor (with GTK+ Wayland 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+ for Wayland. + . + If you are using exclusively X11, install emacs-gtk instead. The + PGTK port works less well than the standard GTK+ build in a number of + respects. + +Package: emacs-bin-common +Architecture: any +Depends: emacs-common (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} +Breaks: + emacs-gtk (<< 1:29.2), + emacs-pgtk (<< 1:29.2), + emacs-lucid (<< 1:29.2), + emacs-nox (<< 1:29.2), +Recommends: mailutils +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 emacs-gtk, emacs-pgtk, emacs-lucid, and emacs-nox. + +Package: emacs-common +Architecture: all +Depends: emacs-el, emacsen-common (>= 3.0.0), install-info, ${misc:Depends} +#Recommends: emacs-el +Suggests: emacs-common-non-dfsg, ncurses-term +Conflicts: + cedet, + eieio, + emacs-el (<< ${source:Version}), + gnus-bonus-el, + speedbar, +Breaks: + apel (<< 10.8+0.20120427-4), + edb (<< 1.32), + egg (<< 4.2.0-2), + elpa-cider (<< 0.19.0+dfsg-4~), + emacs (<< 1:25), + emacs-bin-common (<< 1:28), + emacs-gtk (<< 1:25), + emacs-lucid (<< 1:25), + emacs-nox (<< 1:25), +Replaces: + emacs-bin-common (<< 1:28) +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 emacs-gtk, emacs-pgtk, emacs-lucid, and emacs-nox. + +Package: emacs-el +Architecture: all +Depends: emacs-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. diff --git a/copyright b/copyright new file mode 100644 index 00000000000..4953d7af2ab --- /dev/null +++ b/copyright @@ -0,0 +1,990 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Emacs +Upstream-Contact: + bug-gnu-emacs@gnu.org + emacs-devel@gnu.org +Source: https://savannah.gnu.org/projects/emacs +Comment: + This package was debianized by Rob Browning + 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-29.3 tag. That tag was used to create the + Debian upstream archive (emacs_29.3+1.orig.tar.xz) + after making adjustments to comply with the DFSG (see below). + . + Please see /usr/share/doc/emacs-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: + admin/unidata/BidiBrackets.txt + admin/unidata/BidiMirroring.txt + admin/unidata/NormalizationTest.txt + admin/unidata/SpecialCasing.txt + admin/unidata/UnicodeData.txt + admin/unidata/emoji-data.txt + admin/unidata/emoji-sequences.txt + admin/unidata/emoji-zwj-sequences.txt + test/manual/BidiCharacterTest.txt +License: + admin/unidata/copyright.html + +Files: build-aux/install-sh +License: + This originates from X11R5 (mit/util/scripts/install.sh), which was + later released in X11R6 (xc/config/util/install.sh) with the + following copyright and license. + . + Copyright (C) 1994 X Consortium + . + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to + deal in the Software without restriction, including without limitation the + rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- + TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + . + Except as contained in this notice, the name of the X Consortium shall not + be used in advertising or otherwise to promote the sale, use or other deal- + ings in this Software without prior written authorization from the X Consor- + tium. + . + FSF changes to this file are in the public domain. + +Files: debian/rules +License: GPL plus Ian + This file is licensed under the terms of the GNU General 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 + lib/af_alg.h + lib/attribute.h + lib/dynarray.h + lib/eloop-threshold.h + lib/filename.h + lib/free.c + lib/getrandom.c + lib/idx.h + lib/malloc.c + lib/malloc/dynarray-skeleton.c + lib/malloc/dynarray.h + lib/malloc/dynarray_at_failure.c + lib/malloc/dynarray_emplace_enlarge.c + lib/malloc/dynarray_finalize.c + lib/malloc/dynarray_resize.c + lib/malloc/dynarray_resize_clear.c + lib/malloc/scratch_buffer.h + lib/malloc/scratch_buffer_dupfree.c + lib/malloc/scratch_buffer_grow.c + lib/malloc/scratch_buffer_grow_preserve.c + lib/malloc/scratch_buffer_set_array_size.c + lib/md5-stream.c + lib/nproc.c + lib/nproc.h + lib/rawmemchr.c + lib/rawmemchr.valgrind + lib/realloc.c + lib/scratch_buffer.h + lib/sigdescr_np.c + lib/sys_random.in.h +License: LGPL-2+ + +Files: lib/futimens.c +License: LGPL-3+ + +Files: lib/mini-gmp-gnulib.c +License: GPL-2+ or LGPL-3+ + +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/org/csl/chicago-author-date.csl + etc/org/csl/locales-en-US.xml +License: Creative Commons Attribution-ShareAlike 3.0 License + +Files: etc/publicsuffix.txt +License: MPL-2.0 + +Files: + etc/schema/od-manifest-schema-v1.2-os.rnc + etc/schema/od-schema-v1.2-os.rnc +License: + Open Document Format for Office Applications (OpenDocument) Version 1.2 + OASIS Standard, 29 September 2011 + Manifest Relax-NG Schema + Source: http://docs.oasis-open.org/office/v1.2/os/ + Copyright (c) OASIS Open 2002-2011, 2013. All Rights Reserved. + . + All capitalized terms in the following text have the meanings assigned to them + in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The + full Policy may be found at the OASIS website. + . + This document and translations of it may be copied and furnished to others, and + derivative works that comment on or otherwise explain it or assist in its + implementation may be prepared, copied, published, and distributed, in whole or + in part, without restriction of any kind, provided that the above copyright + notice and this section are included on all such copies and derivative works. + However, this document itself may not be modified in any way, including by + removing the copyright notice or references to OASIS, except as needed for the + purpose of developing any document or deliverable produced by an OASIS + Technical Committee (in which case the rules applicable to copyrights, as set + forth in the OASIS IPR Policy, must be followed) or as required to translate it + into languages other than English. + . + The limited permissions granted above are perpetual and will not be revoked by + OASIS or its successors or assigns. + . + This document and the information contained herein is provided on an "AS IS" + basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT + LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT + INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR + FITNESS FOR A PARTICULAR PURPOSE. + +Files: etc/schema/OpenDocument-schema-v1.3+libreoffice.rnc +License: + Open Document Format for Office Applications (OpenDocument) Version 1.3 + OASIS Standard, In progress + Relax-NG Schema + Source: https://tools.oasis-open.org/version-control/svn/office/ + Copyright (c) OASIS Open 2002-2015. All Rights Reserved. + . + All capitalized terms in the following text have the meanings assigned to them + in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The + full Policy may be found at the OASIS website. + . + This document and translations of it may be copied and furnished to others, and + derivative works that comment on or otherwise explain it or assist in its + implementation may be prepared, copied, published, and distributed, in whole or + in part, without restriction of any kind, provided that the above copyright + notice and this section are included on all such copies and derivative works. + However, this document itself may not be modified in any way, including by + removing the copyright notice or references to OASIS, except as needed for the + purpose of developing any document or deliverable produced by an OASIS + Technical Committee (in which case the rules applicable to copyrights, as set + forth in the OASIS IPR Policy, must be followed) or as required to translate it + into languages other than English. + . + The limited permissions granted above are perpetual and will not be revoked by + OASIS or its successors or assigns. + . + This document and the information contained herein is provided on an "AS IS" + basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT + LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT + INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR + FITNESS FOR A PARTICULAR PURPOSE. + +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 . + . + 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., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301, 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. + +File: test/data/epg/dummy-pinentry +License: + 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 file is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY, to the extent permitted by law; without even the + implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. + +File: test/manual/etags/merc-src/accumulator.m +License: GPL-2 +Comment: + Near the top of the file is this: + % This file may only be copied under the terms of the GNU General + % Public License - see the file COPYING in the Mercury distribution. + And the file appears to correspond with mercury git version-22_01_1 + d19847ec2739a547fa2618228d254e77669f68ab after emacs deleted a few + lines in git commit 6af9f1f3efc98f3ad736db9e2cf6dfb63bf7e3ff. + Finally, the COPYING file in the mercury version-22_01_1 tree + contains the GPL-2. + +File: test/src/regex-resources/BOOST.tests +License: + Boost Software License - Version 1.0 - August 17th, 2003 + . + Permission is hereby granted, free of charge, to any person or organization + obtaining a copy of the software and accompanying documentation covered by + this license (the "Software") to use, reproduce, display, distribute, + execute, and transmit the Software, and to prepare derivative works of the + Software, and to permit third-parties to whom the Software is furnished to + do so, all subject to the following: + . + The copyright notices in the Software and this entire statement, including + the above license grant, this restriction and the following disclaimer, + must be included in all copies of the Software, in whole or in part, and + all derivative works of the Software, unless such copies or derivative + works are solely in the form of machine-executable object code generated by + a source language processor. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT + SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + +File: test/src/regex-resources/PCRE.tests +License: + PCRE LICENCE + ------------ + . + PCRE is a library of functions to support regular expressions whose syntax + and semantics are as close as possible to those of the Perl 5 language. + . + Written by: Philip Hazel + . + University of Cambridge Computing Service, + Cambridge, England. Phone: +44 1223 334714. + . + Copyright (c) 1997-2003 University of Cambridge + . + Permission is granted to anyone to use this software for any purpose on any + computer system, and to redistribute it freely, subject to the following + restrictions: + . + 1. This software 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. + . + 2. The origin of this software must not be misrepresented, either by + explicit claim or by omission. In practice, this means that if you use + PCRE in software that you distribute to others, commercially or + otherwise, you must put a sentence like this + . + Regular expression support is provided by the PCRE library package, + which is open source software, written by Philip Hazel, and copyright + by the University of Cambridge, England. + . + somewhere reasonably visible in your documentation and in any relevant + files or online help data or similar. A reference to the ftp site for + the source, that is, to + . + ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ + . + should also be given in the documentation. However, this condition is not + intended to apply to whole chains of software. If package A includes PCRE, + it must acknowledge it, but if package B is software that includes package + A, the condition is not imposed on package B (unless it uses PCRE + independently). + . + 3. Altered versions must be plainly marked as such, and must not be + misrepresented as being the original software. + . + 4. If PCRE is embedded in any software that is released under the GNU + General Purpose Licence (GPL), or Lesser General Purpose Licence (LGPL), + then the terms of that licence shall supersede any condition above with + which it is incompatible. + . + The documentation for PCRE, supplied in the "doc" directory, is distributed + under the same terms as the software itself. + +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. diff --git a/copyright.in b/copyright.in new file mode 100644 index 00000000000..409af418362 --- /dev/null +++ b/copyright.in @@ -0,0 +1,990 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Emacs +Upstream-Contact: + bug-gnu-emacs@gnu.org + emacs-devel@gnu.org +Source: https://savannah.gnu.org/projects/emacs +Comment: + This package was debianized by Rob Browning + 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 (emacs_@DEBORIG_VERSION@.orig.tar.xz) + after making adjustments to comply with the DFSG (see below). + . + Please see /usr/share/doc/emacs-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: + admin/unidata/BidiBrackets.txt + admin/unidata/BidiMirroring.txt + admin/unidata/NormalizationTest.txt + admin/unidata/SpecialCasing.txt + admin/unidata/UnicodeData.txt + admin/unidata/emoji-data.txt + admin/unidata/emoji-sequences.txt + admin/unidata/emoji-zwj-sequences.txt + test/manual/BidiCharacterTest.txt +License: + admin/unidata/copyright.html + +Files: build-aux/install-sh +License: + This originates from X11R5 (mit/util/scripts/install.sh), which was + later released in X11R6 (xc/config/util/install.sh) with the + following copyright and license. + . + Copyright (C) 1994 X Consortium + . + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to + deal in the Software without restriction, including without limitation the + rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- + TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + . + Except as contained in this notice, the name of the X Consortium shall not + be used in advertising or otherwise to promote the sale, use or other deal- + ings in this Software without prior written authorization from the X Consor- + tium. + . + FSF changes to this file are in the public domain. + +Files: debian/rules +License: GPL plus Ian + This file is licensed under the terms of the GNU General 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 + lib/af_alg.h + lib/attribute.h + lib/dynarray.h + lib/eloop-threshold.h + lib/filename.h + lib/free.c + lib/getrandom.c + lib/idx.h + lib/malloc.c + lib/malloc/dynarray-skeleton.c + lib/malloc/dynarray.h + lib/malloc/dynarray_at_failure.c + lib/malloc/dynarray_emplace_enlarge.c + lib/malloc/dynarray_finalize.c + lib/malloc/dynarray_resize.c + lib/malloc/dynarray_resize_clear.c + lib/malloc/scratch_buffer.h + lib/malloc/scratch_buffer_dupfree.c + lib/malloc/scratch_buffer_grow.c + lib/malloc/scratch_buffer_grow_preserve.c + lib/malloc/scratch_buffer_set_array_size.c + lib/md5-stream.c + lib/nproc.c + lib/nproc.h + lib/rawmemchr.c + lib/rawmemchr.valgrind + lib/realloc.c + lib/scratch_buffer.h + lib/sigdescr_np.c + lib/sys_random.in.h +License: LGPL-2+ + +Files: lib/futimens.c +License: LGPL-3+ + +Files: lib/mini-gmp-gnulib.c +License: GPL-2+ or LGPL-3+ + +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/org/csl/chicago-author-date.csl + etc/org/csl/locales-en-US.xml +License: Creative Commons Attribution-ShareAlike 3.0 License + +Files: etc/publicsuffix.txt +License: MPL-2.0 + +Files: + etc/schema/od-manifest-schema-v1.2-os.rnc + etc/schema/od-schema-v1.2-os.rnc +License: + Open Document Format for Office Applications (OpenDocument) Version 1.2 + OASIS Standard, 29 September 2011 + Manifest Relax-NG Schema + Source: http://docs.oasis-open.org/office/v1.2/os/ + Copyright (c) OASIS Open 2002-2011, 2013. All Rights Reserved. + . + All capitalized terms in the following text have the meanings assigned to them + in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The + full Policy may be found at the OASIS website. + . + This document and translations of it may be copied and furnished to others, and + derivative works that comment on or otherwise explain it or assist in its + implementation may be prepared, copied, published, and distributed, in whole or + in part, without restriction of any kind, provided that the above copyright + notice and this section are included on all such copies and derivative works. + However, this document itself may not be modified in any way, including by + removing the copyright notice or references to OASIS, except as needed for the + purpose of developing any document or deliverable produced by an OASIS + Technical Committee (in which case the rules applicable to copyrights, as set + forth in the OASIS IPR Policy, must be followed) or as required to translate it + into languages other than English. + . + The limited permissions granted above are perpetual and will not be revoked by + OASIS or its successors or assigns. + . + This document and the information contained herein is provided on an "AS IS" + basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT + LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT + INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR + FITNESS FOR A PARTICULAR PURPOSE. + +Files: etc/schema/OpenDocument-schema-v1.3+libreoffice.rnc +License: + Open Document Format for Office Applications (OpenDocument) Version 1.3 + OASIS Standard, In progress + Relax-NG Schema + Source: https://tools.oasis-open.org/version-control/svn/office/ + Copyright (c) OASIS Open 2002-2015. All Rights Reserved. + . + All capitalized terms in the following text have the meanings assigned to them + in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The + full Policy may be found at the OASIS website. + . + This document and translations of it may be copied and furnished to others, and + derivative works that comment on or otherwise explain it or assist in its + implementation may be prepared, copied, published, and distributed, in whole or + in part, without restriction of any kind, provided that the above copyright + notice and this section are included on all such copies and derivative works. + However, this document itself may not be modified in any way, including by + removing the copyright notice or references to OASIS, except as needed for the + purpose of developing any document or deliverable produced by an OASIS + Technical Committee (in which case the rules applicable to copyrights, as set + forth in the OASIS IPR Policy, must be followed) or as required to translate it + into languages other than English. + . + The limited permissions granted above are perpetual and will not be revoked by + OASIS or its successors or assigns. + . + This document and the information contained herein is provided on an "AS IS" + basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT + LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT + INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR + FITNESS FOR A PARTICULAR PURPOSE. + +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 . + . + 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., 51 Franklin St, Fifth Floor, Boston, MA + 02110-1301, 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. + +File: test/data/epg/dummy-pinentry +License: + 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 file is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY, to the extent permitted by law; without even the + implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. + +File: test/manual/etags/merc-src/accumulator.m +License: GPL-2 +Comment: + Near the top of the file is this: + % This file may only be copied under the terms of the GNU General + % Public License - see the file COPYING in the Mercury distribution. + And the file appears to correspond with mercury git version-22_01_1 + d19847ec2739a547fa2618228d254e77669f68ab after emacs deleted a few + lines in git commit 6af9f1f3efc98f3ad736db9e2cf6dfb63bf7e3ff. + Finally, the COPYING file in the mercury version-22_01_1 tree + contains the GPL-2. + +File: test/src/regex-resources/BOOST.tests +License: + Boost Software License - Version 1.0 - August 17th, 2003 + . + Permission is hereby granted, free of charge, to any person or organization + obtaining a copy of the software and accompanying documentation covered by + this license (the "Software") to use, reproduce, display, distribute, + execute, and transmit the Software, and to prepare derivative works of the + Software, and to permit third-parties to whom the Software is furnished to + do so, all subject to the following: + . + The copyright notices in the Software and this entire statement, including + the above license grant, this restriction and the following disclaimer, + must be included in all copies of the Software, in whole or in part, and + all derivative works of the Software, unless such copies or derivative + works are solely in the form of machine-executable object code generated by + a source language processor. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT + SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + +File: test/src/regex-resources/PCRE.tests +License: + PCRE LICENCE + ------------ + . + PCRE is a library of functions to support regular expressions whose syntax + and semantics are as close as possible to those of the Perl 5 language. + . + Written by: Philip Hazel + . + University of Cambridge Computing Service, + Cambridge, England. Phone: +44 1223 334714. + . + Copyright (c) 1997-2003 University of Cambridge + . + Permission is granted to anyone to use this software for any purpose on any + computer system, and to redistribute it freely, subject to the following + restrictions: + . + 1. This software 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. + . + 2. The origin of this software must not be misrepresented, either by + explicit claim or by omission. In practice, this means that if you use + PCRE in software that you distribute to others, commercially or + otherwise, you must put a sentence like this + . + Regular expression support is provided by the PCRE library package, + which is open source software, written by Philip Hazel, and copyright + by the University of Cambridge, England. + . + somewhere reasonably visible in your documentation and in any relevant + files or online help data or similar. A reference to the ftp site for + the source, that is, to + . + ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ + . + should also be given in the documentation. However, this condition is not + intended to apply to whole chains of software. If package A includes PCRE, + it must acknowledge it, but if package B is software that includes package + A, the condition is not imposed on package B (unless it uses PCRE + independently). + . + 3. Altered versions must be plainly marked as such, and must not be + misrepresented as being the original software. + . + 4. If PCRE is embedded in any software that is released under the GNU + General Purpose Licence (GPL), or Lesser General Purpose Licence (LGPL), + then the terms of that licence shall supersede any condition above with + which it is incompatible. + . + The documentation for PCRE, supplied in the "doc" directory, is distributed + under the same terms as the software itself. + +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. diff --git a/emacs-bin-common.lintian-overrides b/emacs-bin-common.lintian-overrides new file mode 100644 index 00000000000..4be23de639c --- /dev/null +++ b/emacs-bin-common.lintian-overrides @@ -0,0 +1,3 @@ +binary-without-manpage [usr/bin/ctags.emacs] +binary-without-manpage [usr/bin/ebrowse.emacs] +binary-without-manpage [usr/bin/etags.emacs] diff --git a/emacs-bin-common.postinst.in b/emacs-bin-common.postinst.in new file mode 100644 index 00000000000..1127f718e34 --- /dev/null +++ b/emacs-bin-common.postinst.in @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +for alt in @DEB_COMMON_ALTERNATIVES@ +do + update-alternatives \ + --install "/usr/bin/$alt" "$alt" "/usr/bin/$alt.emacs" "@BIN_PRIORITY@" \ + --slave "/usr/share/man/man1/$alt.1.gz" "$alt.1.gz" \ + "/usr/share/man/man1/$alt.emacs.1.gz" +done + +#DEBHELPER# diff --git a/emacs-bin-common.prerm.in b/emacs-bin-common.prerm.in new file mode 100644 index 00000000000..9e23e6ed4f7 --- /dev/null +++ b/emacs-bin-common.prerm.in @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +if [ "$1" != upgrade ] +then + for alt in @DEB_COMMON_ALTERNATIVES@ + do + update-alternatives --remove "$alt" "/usr/bin/$alt.emacs" + done +fi + +#DEBHELPER# diff --git a/emacs-common.README.in b/emacs-common.README.in new file mode 100644 index 00000000000..3f8c2c5360f --- /dev/null +++ b/emacs-common.README.in @@ -0,0 +1,20 @@ +This file details the Debian specific changes to Emacs. + +Some of the patches referred to below may follow DEP-3 format +(https://dep-team.pages.debian.net/deps/dep3/). + +* 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: +coding: utf-8 +mode: outline +mode: emacs-news +paragraph-separate: "[ ^L]" +end: diff --git a/emacs-common.docs b/emacs-common.docs new file mode 100644 index 00000000000..8b0bc5916cc --- /dev/null +++ b/emacs-common.docs @@ -0,0 +1,3 @@ +BUGS +README +debian/README.add-on-package-maintainers diff --git a/emacs-common.postinst.in b/emacs-common.postinst.in new file mode 100644 index 00000000000..5cd3f7d29fa --- /dev/null +++ b/emacs-common.postinst.in @@ -0,0 +1,45 @@ +#!/bin/sh + +set -e + +FULL=@FULL_VERSION@ + +# Create the site-lisp dir 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# diff --git a/emacs-common.prerm.in b/emacs-common.prerm.in new file mode 100644 index 00000000000..9df86af6a02 --- /dev/null +++ b/emacs-common.prerm.in @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +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# diff --git a/emacs-term.desktop b/emacs-term.desktop new file mode 100644 index 00000000000..95589919846 --- /dev/null +++ b/emacs-term.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Version=1.0 +Name=Emacs (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/emacs +Exec=/usr/bin/emacs -nw %F +Icon=emacs +Type=Application +Terminal=true +Categories=Utility;Development;TextEditor; +Keywords=Text;Editor; diff --git a/emacs.desktop b/emacs.desktop new file mode 100644 index 00000000000..ba8685b19da --- /dev/null +++ b/emacs.desktop @@ -0,0 +1,15 @@ +[Desktop Entry] +Version=1.0 +Name=Emacs (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/emacs +Exec=/usr/bin/emacs %F +Icon=emacs +Type=Application +Terminal=false +Categories=Utility;Development;TextEditor; +StartupNotify=true +StartupWMClass=Emacs +Keywords=Text;Editor; diff --git a/emacsVAR.lintian-overrides b/emacsVAR.lintian-overrides new file mode 100644 index 00000000000..9c5c6ab92d1 --- /dev/null +++ b/emacsVAR.lintian-overrides @@ -0,0 +1,7 @@ +binary-without-manpage [usr/bin/emacsclient.emacs] + +# dpkg-maintscript-helper does not work due to arch:all to arch:any switch +maintainer-script-may-use-dir_to_symlink_helper + +executable-not-elf-or-script [*.pdmp] +shared-library-lacks-prerequisites [*.eln] diff --git a/emacsVAR.postinst b/emacsVAR.postinst new file mode 100644 index 00000000000..8d581423b92 --- /dev/null +++ b/emacsVAR.postinst @@ -0,0 +1,42 @@ +#!/bin/sh + +set -e + +# Manual dir_to_symlink conversion since dpkg-maintscript-helper does not +# handle this in combination with arch:all to arch:any switches (#813455). +# Keep this code for buster and bullseye to ease backports. +if [ "$1" = "configure" ] && dpkg --compare-versions "$2" lt-nl "1:26.1+1-3.1~" +then + test -n '@PKG_NAME@' + if [ -d /usr/share/doc/@PKG_NAME@ ] && [ ! -h /usr/share/doc/@PKG_NAME@ ] + then + # This will intentionally fail if the directory is not empty. + rmdir /usr/share/doc/@PKG_NAME@ + ln -sv emacs-common /usr/share/doc/@PKG_NAME@ + fi +fi + +update-alternatives \ + --install /usr/bin/emacs emacs \ + /usr/bin/emacs-@X_SUPPORT@ @BIN_PRIORITY@ \ + --slave /usr/share/man/man1/emacs.1.gz emacs.1.gz \ + /usr/share/man/man1/emacs.emacs.1.gz \ + +update-alternatives \ + --install /usr/bin/editor editor \ + /usr/bin/emacs 0 \ + --slave /usr/share/man/man1/editor.1.gz editor.1.gz \ + /usr/share/man/man1/emacs.emacs.1.gz + +for alt in @DEB_VAR_ALTERNATIVES@ +do + update-alternatives \ + --install "/usr/bin/$alt" "$alt" "/usr/bin/$alt.emacs" @BIN_PRIORITY@ \ + --slave "/usr/share/man/man1/$alt.1.gz" "$alt.1.gz" \ + "/usr/share/man/man1/$alt.emacs.1.gz" +done + +# emacsen-common registration. +/usr/lib/emacsen-common/emacs-install emacs + +#DEBHELPER# diff --git a/emacsVAR.prerm b/emacsVAR.prerm new file mode 100644 index 00000000000..76452fb05a0 --- /dev/null +++ b/emacsVAR.prerm @@ -0,0 +1,18 @@ +#!/bin/sh + +set -e + +if [ "$1" != upgrade ] +then + update-alternatives --verbose --remove editor /usr/bin/emacs + update-alternatives --verbose --remove emacs /usr/bin/emacs-@X_SUPPORT@ + for alt in @DEB_VAR_ALTERNATIVES@ + do + update-alternatives --remove "$alt" "/usr/bin/$alt.emacs" + done +fi + +# emacsen-common registration. +/usr/lib/emacsen-common/emacs-remove emacs + +#DEBHELPER# diff --git a/patch-to-news b/patch-to-news new file mode 100755 index 00000000000..bb5ffde497d --- /dev/null +++ b/patch-to-news @@ -0,0 +1,99 @@ +#!/usr/bin/perl -w + +use English; +use File::Basename; +use strict; + +## Given a patch file paths on the command line, +## e.g. debian/patches/*.patch (or quilt series), generate blank-line +## separate entries formated for README.Debian. If a patch file +## doesn't contain a "README-Debian:" pseudo-header, then just include +## the entire commit message. If it does include the header, then +## parse it roughly like a debian/control "Description:" field. In +## particular, any blank line ends the header, continuation lines must +## start with a single space, and blank lines can be included in the +## content via lines contining just a space and a full stop ".". +## Currently, there is also no reformatting, so all lines are +## "verbatim", not just lines starting with a double space. + +sub get_patch_readme +{ + my ($patch) = @_; + open(PATCH, '<', $patch) or die "Unable to open $patch: $!"; + my @header = ; + close PATCH; + chomp @header; + + my @result; + my $in_header = 0; + foreach my $line (@header) { + last if $line eq '---'; + if ($line =~ m/^README-Debian:\s*(.*)/gio) { + push @result, $1; + $in_header = 1; + } elsif ($line =~ m/^\S*$/o) { + $in_header = 0; + } elsif ($in_header) { + if ($line eq ' .') { + push @result, ''; + } elsif (substr($line, 0, 2) eq ' .') { + die "Invalid ' .' prefix in line: '$line'"; + } elsif ($line =~ m/^ (.*)/o) { + push @result, $1; + } else { + $in_header = 0; + } + } + } + + if (!scalar(@result)) { + # No README-Debian, include the whole message + my $i = 0; + my $subject; + foreach my $line (@header) { + if ($line =~ m/^Subject:\s*(.*)/io) { + $subject = $1; + } + $i++; + last if $line eq ''; + } + die 'No subject in patch' unless $subject; + push @result, $subject; + while ($i < scalar(@header)) { + last if $header[$i] eq '---'; + push @result, $header[$i]; + $i++; + } + } + + # Remove trailing blank lines + while ($result[-1] eq '') { pop @result; } + return \@result; +} + +sub render_patch_readme +{ + my ($patch) = @_; + my $news = get_patch_readme($patch); + my $base = basename($patch); + print "* @$news[0]\n"; + my $news_len = scalar(@$news); + foreach my $line (@$news[1..$news_len - 1]) { + print "$line\n"; + } + print "\n" if scalar(@$news) > 1; + print "Patch: $base\n"; +} + +my @patches = @ARGV; +my $patch_count = @patches; + +if ($patch_count) +{ + render_patch_readme($patches[0]); + foreach my $patch (@patches[1..$patch_count - 1]) + { + print "\n"; + render_patch_readme($patch); + } +} diff --git a/patches/0001-Prefer-usr-share-info-emacs.patch b/patches/0001-Prefer-usr-share-info-emacs.patch new file mode 100644 index 00000000000..92dab7d1e9c --- /dev/null +++ b/patches/0001-Prefer-usr-share-info-emacs.patch @@ -0,0 +1,27 @@ +From 02033fdef3d159c175ceaa4226b17f57ddab9b51 Mon Sep 17 00:00:00 2001 +From: Rob Browning +Date: Sun, 7 Apr 2013 15:03:05 -0500 +Subject: Prefer /usr/share/info/emacs/ + +Emacs prefers /usr/share/info/emacs to /usr/share/info. + +The value of Info-default-directory-list has been augmented via +lisp/info.el to include /usr/share/info/emacs 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 1c6df9a6ee5..8ba7410e9d1 100644 +--- a/lisp/info.el ++++ b/lisp/info.el +@@ -661,7 +661,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 flavor info directory in front ++ (cons "/usr/share/info/emacs" dirs) + ;; Include the info directory near where Emacs executable was installed. + (let* ((instdir (file-name-directory invocation-directory)) + (dir1 (expand-file-name "../info/" instdir)) diff --git a/patches/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch b/patches/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch new file mode 100644 index 00000000000..15612fb08be --- /dev/null +++ b/patches/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch @@ -0,0 +1,48 @@ +From a037962a552af57e850fa0a6fd7ba1c8840a1a98 Mon Sep 17 00:00:00 2001 +From: Rob Browning +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 'emacs. + +Author: Rob Browning +--- + lisp/startup.el | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/lisp/startup.el b/lisp/startup.el +index eb1e027d2cb..ccfcfee8f0e 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 'emacs ++ "A symbol representing the particular debian flavor of emacs running. ++Something like 'emacs, 'xemacs21, 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 +@@ -1472,7 +1476,14 @@ command-line + ;; Sites should not disable the startup screen. + ;; Only individuals should disable the startup screen. + (let ((inhibit-startup-screen inhibit-startup-screen)) +- (load site-run-file t t))) ++ (progn ++ ;; This form has been added by Debian to load all the ++ ;; debian package snippets (dh-elpa, etc.). It's in here ++ ;; because we want -q to kill it too. ++ (if (load "debian-startup" t t nil) ++ (debian-startup debian-emacs-flavor)) ++ ;; This is the normal upstream behavior ++ (load site-run-file t t)))) + + ;; Load that user's init file, or the default one, or none. + (startup--load-user-init-file diff --git a/patches/0003-Remove-files-that-appear-to-be-incompatible-with-the.patch b/patches/0003-Remove-files-that-appear-to-be-incompatible-with-the.patch new file mode 100644 index 00000000000..470916c54c4 --- /dev/null +++ b/patches/0003-Remove-files-that-appear-to-be-incompatible-with-the.patch @@ -0,0 +1,256 @@ +From 9fb5f845245e42133d081098a9ed030a558a21a2 Mon Sep 17 00:00:00 2001 +From: Rob Browning +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 +Added-by: Rob Browning +Status: new +--- + Makefile.in | 44 +++++++++++++++++--------------------------- + configure.ac | 15 ++++++--------- + doc/misc/Makefile.in | 44 +++++--------------------------------------- + lisp/help.el | 8 ++++++++ + 4 files changed, 36 insertions(+), 75 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 996f7b8d8c7..c3786164718 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -174,7 +174,9 @@ man1dir= + # 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= + + # Directory for local state files for all programs. + localstatedir=@localstatedir@ +@@ -989,8 +991,7 @@ $(1)_$(2): + ### 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 test ++mostlyclean_dirs = src oldXMenu lwlib lib lib-src nt doc/misc test + + $(foreach dir,$(mostlyclean_dirs),$(eval $(call submake_template,$(dir),mostlyclean))) + +@@ -1111,11 +1112,11 @@ test/%: + 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): +@@ -1146,9 +1147,6 @@ info-dir: + texi_misc = $(shell MAKEFLAGS= ${MAKE} --no-print-directory -s -C doc/misc echo-sources) + + srcdir_doc_info_dir_inputs = \ +- ${srcdir}/doc/emacs/emacs.texi \ +- ${srcdir}/doc/lispintro/emacs-lisp-intro.texi \ +- ${srcdir}/doc/lispref/elisp.texi \ + $(addprefix ${srcdir}/doc/misc/,${texi_misc}) + info_dir_inputs = \ + ../build-aux/dir_top \ +@@ -1170,14 +1168,10 @@ ${srcdir}/info/dir: + AWK='${AWK}' ../build-aux/make-info-dir ${info_dir_inputs} \ + ) >$@.tmp && mv $@.tmp $@ + +-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. +@@ -1195,14 +1189,10 @@ 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/configure.ac b/configure.ac +index 473ae06833c..eb1fbf08be5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -6800,7 +6800,7 @@ AC_DEFUN + AC_CONFIG_FILES([$srcdir/doc/man/emacs.1]) + + m4_define([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]) ++ [lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/misc/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile nt/Makefile]) + SUBDIR_MAKEFILES="subdir_makefiles" + AC_CONFIG_FILES(subdir_makefiles) + +@@ -6866,14 +6866,11 @@ m4_define + 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 2841916dc89..0abfd543a3f 100644 +--- a/doc/misc/Makefile.in ++++ b/doc/misc/Makefile.in +@@ -63,18 +63,14 @@ 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 = auth autotype bovine calc ccmode cl dbus dired-x \ +- ebrowse ede ediff edt efaq eglot eieio emacs-gnutls \ +- emacs-mime epa erc ert eshell eudc eww flymake forms gnus \ +- htmlfontify idlwave ido info.info mairix-el message mh-e \ +- modus-themes newsticker nxml-mode octave-mode org pcl-cvs pgg \ +- rcirc reftex remember sasl sc semantic ses sieve smtpmail \ +- speedbar srecode todo-mode tramp transient url use-package \ +- vhdl-mode vip viper vtable widget wisent woman ++INFO_COMMON = efaq transient + + ## Info files to install on current platform. + INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_W32) +@@ -161,9 +157,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)))) + + +@@ -186,21 +179,11 @@ info.info: + ## Extra dependencies. + + ## FIXME Updating this list manually is unreliable. +-need_emacsver = calc cl dired-x efaq efaq-w32 erc forms ido \ +- newsticker reftex remember use-package 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. +@@ -216,23 +199,6 @@ efaq%.pdf: + 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: ${srcdir}/trampver.texi +- + + abs_top_builddir = @abs_top_builddir@ + +diff --git a/lisp/help.el b/lisp/help.el +index 24e4b9890a7..2922cbd2618 100644 +--- a/lisp/help.el ++++ b/lisp/help.el +@@ -511,6 +511,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) diff --git a/patches/0004-Adjust-documentation-references-for-Debian.patch b/patches/0004-Adjust-documentation-references-for-Debian.patch new file mode 100644 index 00000000000..672c17e7681 --- /dev/null +++ b/patches/0004-Adjust-documentation-references-for-Debian.patch @@ -0,0 +1,29 @@ +From 41bba59001c8d79bf1433e0e5ef7099a99802e8f Mon Sep 17 00:00:00 2001 +From: Rob Browning +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 3f94b0d4634..bb1be6f7e6d 100644 +--- a/etc/NEWS ++++ b/etc/NEWS +@@ -15,6 +15,11 @@ 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'. + ++ ++* Debian specific changes to Emacs ++ ++Please see /usr/share/doc/emacs-common/README.Debian.gz. ++ + + * Changes in Emacs 29.3 + Emacs 29.3 is an emergency bugfix release intended to fix several diff --git a/patches/0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch b/patches/0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch new file mode 100644 index 00000000000..1b24cf3aff7 --- /dev/null +++ b/patches/0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch @@ -0,0 +1,26 @@ +From a2ab35d401e5d5edb671bc17b4a05052ddd1c513 Mon Sep 17 00:00:00 2001 +From: Rob Browning +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 +Added-by: Rob Browning +--- + lisp/version.el | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lisp/version.el b/lisp/version.el +index 73968b1cd92..a3a18b90a45 100644 +--- a/lisp/version.el ++++ b/lisp/version.el +@@ -67,7 +67,7 @@ emacs-version + to the system configuration; look at `system-configuration' instead." + (interactive "P") + (let ((version-string +- (format "GNU Emacs %s (build %s, %s%s%s%s)%s" ++ (format "GNU Emacs %s (build %s, %s%s%s%s)%s, modified by Debian" + emacs-version + emacs-build-number + system-configuration diff --git a/patches/0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch b/patches/0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch new file mode 100644 index 00000000000..5f49df79ca4 --- /dev/null +++ b/patches/0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch @@ -0,0 +1,24 @@ +From 4ebce2c22906c28d31641494d3acf019e9334c3d Mon Sep 17 00:00:00 2001 +From: Rob Browning +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 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in +index 6768d610ee0..162ee36bafc 100644 +--- a/admin/unidata/Makefile.in ++++ b/admin/unidata/Makefile.in +@@ -43,7 +43,7 @@ unifiles = + + .PHONY: all + +-all: ${top_srcdir}/src/macuvs.h ${unifiles} ${unidir}/charscript.el \ ++all: ${unifiles} ${unidir}/charscript.el \ + ${unidir}/charprop.el ${unidir}/emoji-zwj.el ${unidir}/emoji-labels.el \ + ${unidir}/uni-scripts.el ${unidir}/uni-confusable.el \ + ${unidir}/idna-mapping.el diff --git a/patches/0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch b/patches/0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch new file mode 100644 index 00000000000..fc5569820b7 --- /dev/null +++ b/patches/0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch @@ -0,0 +1,40 @@ +From a309766b2c430303542d35bc840c96af04690dbe Mon Sep 17 00:00:00 2001 +From: Rob Browning +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/lisp/emacs-lisp/package-tests.el | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/test/lisp/emacs-lisp/package-tests.el b/test/lisp/emacs-lisp/package-tests.el +index 5176c6abcd8..ee481822705 100644 +--- a/test/lisp/emacs-lisp/package-tests.el ++++ b/test/lisp/emacs-lisp/package-tests.el +@@ -160,6 +160,14 @@ with-package-test + (delete-file + (expand-file-name f package-test-archive-upload-base)))) + (delete-directory package-test-archive-upload-base)) ++ (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)) diff --git a/patches/0008-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch b/patches/0008-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch new file mode 100644 index 00000000000..add605e9c4a --- /dev/null +++ b/patches/0008-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch @@ -0,0 +1,74 @@ +From 5c957f045631b1a4b166519ee1b4d6be2040e2bc Mon Sep 17 00:00:00 2001 +From: Rob Browning +Date: Sun, 16 Dec 2018 17:13:36 -0600 +Subject: Mark vc-bzr-test-fauilt-bzr-autoloads as unstable for now + +Currently the test fails like this: + + Running 3 tests (2018-12-17 12:17:43-0600) + passed 1/3 vc-bzr-test-bug9726 + Mark set + Press C-c C-c when you are done editing. + Enter a change comment. Type C-c C-c when done + passed 2/3 vc-bzr-test-bug9781 + Falling back on "slow" status detection ((file-missing "Opening input file" "No such file or directory" "/tmp/vc-bzr-testVlgmsb/bzr/.bzr/checkout/dirstate")) + Error: (error "Running bzr status --no-classify loaddefs.el...FAILED (status 3)") + Warnings in `bzr' output: bzr: ERROR: invalid header line: '' + + Error: (error "Running bzr status --no-classify loaddefs.el...FAILED (status 3)") + Warnings in `bzr' output: bzr: ERROR: invalid header line: '' + + Test vc-bzr-test-faulty-bzr-autoloads backtrace: + logand(nil 128) + vc-mode-line("/tmp/vc-bzr-testVlgmsb/bzr/loaddefs.el" Bzr) + vc-refresh-state() + run-hooks(find-file-hook) + after-find-file(t t) + find-file-noselect-1(# "/tmp/vc-bzr-testVlgmsb/b + find-file-noselect("/tmp/vc-bzr-testVlgmsb/bzr/loaddefs.el") + autoload-find-generated-file() + update-directory-autoloads("/tmp/vc-bzr-testVlgmsb/bzr/") + (progn (update-directory-autoloads default-directory) t) + (setq value-35 (progn (update-directory-autoloads default-directory) + (unwind-protect (setq value-35 (progn (update-directory-autoloads de + (if (unwind-protect (setq value-35 (progn (update-directory-autoload + (let (form-description-36) (if (unwind-protect (setq value-35 (progn + (let ((value-35 (gensym "ert-form-evaluation-aborted-"))) (let (form + (progn (call-process vc-bzr-program nil nil nil "init") (let ((temp- + (unwind-protect (progn (call-process vc-bzr-program nil nil nil "ini + (let* ((homedir (make-temp-file "vc-bzr-test" t)) (bzrdir (expand-fi + (lambda nil (let* ((fn-30 (function executable-find)) (args-31 (cond + ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test + ert-run-test(#s(ert-test :name vc-bzr-test-faulty-bzr-autoloads :doc + ert-run-or-rerun-test(#s(ert--stats :selector (not (or (tag :expensi + ert-run-tests((not (or (tag :expensive-test) (tag :unstable))) #f(co + ert-run-tests-batch((not (or (tag :expensive-test) (tag :unstable))) + ert-run-tests-batch-and-exit((not (or (tag :expensive-test) (tag :un + eval((ert-run-tests-batch-and-exit '(not (or (tag :expensive-test) ( + command-line-1(("-L" ":/home/locke/tmp/main-26.1/debian/build-src/te + command-line() + normal-top-level() + Test vc-bzr-test-faulty-bzr-autoloads condition: + (wrong-type-argument number-or-marker-p nil) + FAILED 3/3 vc-bzr-test-faulty-bzr-autoloads + + Ran 3 tests, 2 results as expected, 1 unexpected (2018-12-17 12:17:46-0600) + + 1 unexpected results: + FAILED vc-bzr-test-faulty-bzr-autoloads +--- + test/lisp/vc/vc-bzr-tests.el | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/test/lisp/vc/vc-bzr-tests.el b/test/lisp/vc/vc-bzr-tests.el +index 8ed63d11a8f..085ef20e9c8 100644 +--- a/test/lisp/vc/vc-bzr-tests.el ++++ b/test/lisp/vc/vc-bzr-tests.el +@@ -119,6 +119,7 @@ vc-bzr-test-bug9781 + ;; https://lists.gnu.org/r/help-gnu-emacs/2012-04/msg00145.html + (ert-deftest vc-bzr-test-faulty-bzr-autoloads () + "Test we can generate autoloads in a bzr directory when bzr is faulty." ++ :tags '(:unstable) + (skip-unless (executable-find vc-bzr-program)) + (ert-with-temp-directory homedir + (let* ((bzrdir (expand-file-name "bzr" homedir)) diff --git a/patches/0009-pdumper-set-DUMP_RELOC_ALIGNMENT_BITS-1-for-m68k.patch b/patches/0009-pdumper-set-DUMP_RELOC_ALIGNMENT_BITS-1-for-m68k.patch new file mode 100644 index 00000000000..965a33ccd66 --- /dev/null +++ b/patches/0009-pdumper-set-DUMP_RELOC_ALIGNMENT_BITS-1-for-m68k.patch @@ -0,0 +1,47 @@ +From 598acd7135f99a44898ff5461cd7c04f3f4881b7 Mon Sep 17 00:00:00 2001 +From: John Paul Adrian Glaubitz +Date: Sat, 24 Sep 2022 13:37:18 -0500 +Subject: pdumper: set DUMP_RELOC_ALIGNMENT_BITS=1 for m68k + +Before the change builds would fail like this: + + (...) + Loading /<>/emacs-27.1+1/debian/build-src/lisp/vc/vc-hooks.el (source)... + Loading /<>/emacs-27.1+1/debian/build-src/lisp/vc/ediff-hook.el (source)... + Loading /<>/emacs-27.1+1/debian/build-src/lisp/uniquify.el (source)... + Loading /<>/emacs-27.1+1/debian/build-src/lisp/electric.el (source)... + Loading /<>/emacs-27.1+1/debian/build-src/lisp/emacs-lisp/eldoc.el (source)... + Loading /<>/emacs-27.1+1/debian/build-src/lisp/cus-start.el (source)... + Loading /<>/emacs-27.1+1/debian/build-src/lisp/tooltip.el (source)... + Finding pointers to doc strings... + Finding pointers to doc strings...done + Dumping under the name bootstrap-emacs.pdmp + dumping fingerprint: 7b5c59c589dc151eb1e4269bd83fbe809616b5cb9bb5c80014d5b560b391dfb6 + dump relocation out of range + +[rlb@defaultvalue.org: create commit message] + +Origin: debian +Bug: https://bugs.gnu.org/44531 +Bug-Debian: http://bugs.debian.org/1019130 +Forwarded: not-needed +--- + src/pdumper.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/pdumper.c b/src/pdumper.c +index 1b5ead5fb4a..72853c134b2 100644 +--- a/src/pdumper.c ++++ b/src/pdumper.c +@@ -264,7 +264,11 @@ emacs_reloc_set_type (struct emacs_reloc *reloc, + enum + { + DUMP_RELOC_TYPE_BITS = 5, ++#ifdef __mc68000__ ++ DUMP_RELOC_ALIGNMENT_BITS = 1, ++#else + DUMP_RELOC_ALIGNMENT_BITS = 2, ++#endif + + /* Minimum alignment required by dump file format. */ + DUMP_RELOCATION_ALIGNMENT = 1 << DUMP_RELOC_ALIGNMENT_BITS, diff --git a/patches/0010-Mark-test-undo-region-as-unstable.patch b/patches/0010-Mark-test-undo-region-as-unstable.patch new file mode 100644 index 00000000000..06abf033fc4 --- /dev/null +++ b/patches/0010-Mark-test-undo-region-as-unstable.patch @@ -0,0 +1,48 @@ +From e71458852d74ddb956f74effc7ed9fd5234b9a89 Mon Sep 17 00:00:00 2001 +From: Sean Whitton +Date: Tue, 15 Nov 2022 15:54:41 -0700 +Subject: Mark test-undo-region as unstable + +It is repeatedly failing on Debian's arch:all autobuilders, though +seemingly nowhere else: + + passed 40/44 simple-transpose-subr (0.000396 sec) + Test test-undo-region backtrace: + signal(ert-test-failed (((should (= (length (delq nil (undo-make-sel + ert-fail(((should (= (length (delq nil (undo-make-selective-list 1 9 + #f(compiled-function () #)() + ert--run-test-internal(#s(ert--test-execution-info :test #s(ert-test + ert-run-test(#s(ert-test :name test-undo-region :documentation nil : + ert-run-or-rerun-test(#s(ert--stats :selector ... :tests ... :test-m + ert-run-tests((not (or (tag :expensive-test) (tag :unstable))) #f(co + ert-run-tests-batch((not (or (tag :expensive-test) (tag :unstable))) + ert-run-tests-batch-and-exit((not (or (tag :expensive-test) (tag :un + command-line-1(("-L" ":/<>/debian/build + command-line() + normal-top-level() + Test test-undo-region condition: + (ert-test-failed + ((should + (= + (length ...) + 2)) + :form + (= 3 2) + :value nil)) + FAILED 41/44 test-undo-region (0.000185 sec) +--- + test/lisp/simple-tests.el | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/test/lisp/simple-tests.el b/test/lisp/simple-tests.el +index a58fa9d41f8..b84c6d4a5e0 100644 +--- a/test/lisp/simple-tests.el ++++ b/test/lisp/simple-tests.el +@@ -980,6 +980,7 @@ simple-tests-shell-command-dont-erase-buffer + (should (= (point) (alist-get shell-command-dont-erase-buffer expected-point))))))) + + (ert-deftest test-undo-region () ++ :tags '(:unstable) + (with-temp-buffer + (insert "This is a test\n") + (goto-char (point-min)) diff --git a/patches/0011-Mark-flaky-test-process-tests-multiple-threads-waiti.patch b/patches/0011-Mark-flaky-test-process-tests-multiple-threads-waiti.patch new file mode 100644 index 00000000000..9fe8825b1f8 --- /dev/null +++ b/patches/0011-Mark-flaky-test-process-tests-multiple-threads-waiti.patch @@ -0,0 +1,46 @@ +From 5084fba86b690516174ad817daa9613951024f68 Mon Sep 17 00:00:00 2001 +From: Sean Whitton +Date: Tue, 15 Nov 2022 16:26:59 -0700 +Subject: Mark flaky test process-tests/multiple-threads-waiting as unstable + +It times out: + + passed 22/28 process-tests/fd-setsize-no-crash/make-serial-process (0.021449 sec) + make[5]: *** [Makefile:182: src/process-tests.log] Error 134 + GEN src/regex-emacs-tests.log + GEN src/search-tests.log + GEN src/syntax-tests.log + GEN src/textprop-tests.log + GEN src/thread-tests.log + GEN src/timefns-tests.log + GEN src/undo-tests.log + GEN src/xdisp-tests.log + GEN src/xfaces-tests.log + GEN src/xml-tests.log + make[5]: Leaving directory '/<>/debian/build-gtk/test' + make[4]: [Makefile:335: check-doit] Error 2 (ignored) + + SUMMARY OF TEST RESULTS + ----------------------- + Files examined: 375 + Ran 5408 tests, 28 failed to run, 5273 results as expected, 0 unexpected, 135 skipped + 1 files did not finish: + src/process-tests.log + make[4]: *** [Makefile:336: check-doit] Error 2 +--- + test/src/process-tests.el | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/src/process-tests.el b/test/src/process-tests.el +index 15d46cbae15..744a3e371fe 100644 +--- a/test/src/process-tests.el ++++ b/test/src/process-tests.el +@@ -895,7 +895,7 @@ process-tests/sentinel-with-multiple-processes + (list (list process "finished\n")))))))))) + + (ert-deftest process-tests/multiple-threads-waiting () +- :tags (if (getenv "EMACS_EMBA_CI") '(:unstable)) ++ :tags '(:unstable) + (skip-unless (fboundp 'make-thread)) + (with-timeout (60 (ert-fail "Test timed out")) + (process-tests--with-processes processes diff --git a/patches/0012-Add-inhibit-native-compilation.patch b/patches/0012-Add-inhibit-native-compilation.patch new file mode 100644 index 00000000000..5b79eb032b5 --- /dev/null +++ b/patches/0012-Add-inhibit-native-compilation.patch @@ -0,0 +1,146 @@ +From 1ae8ac91a0ca3d41b78e37ddc07f1b48e9a63e85 Mon Sep 17 00:00:00 2001 +From: Lars Ingebrigtsen +Date: Mon, 3 Oct 2022 15:26:04 +0200 +Subject: Add 'inhibit-native-compilation' + +The following upstream patch has been backported: + + Add new variable 'inhibit-native-compilation' + + * lisp/startup.el (normal-top-level): Set + inhibit-native-compilation from environment variable. + + * lisp/emacs-lisp/comp.el (comp-trampoline-compile): Don't write + trampolines to disk. + + * lisp/progmodes/elisp-mode.el + (emacs-lisp-native-compile-and-load): Adjust. + + * src/comp.c (syms_of_comp): New variable + inhibit-native-compilation. + (maybe_defer_native_compilation): Use it. + +Origin: upstream, commit: 5fec9182dbeffa88cef6651d8c798ef9665d6681 +Forwarded: not-needed +--- + lisp/emacs-lisp/comp.el | 47 ++++++++++++++++++++++------------------- + lisp/startup.el | 7 ++++-- + src/comp.c | 8 +++++++ + 3 files changed, 38 insertions(+), 24 deletions(-) + +diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el +index 6b65a375ea0..5d688a12d8b 100644 +--- a/lisp/emacs-lisp/comp.el ++++ b/lisp/emacs-lisp/comp.el +@@ -3809,28 +3809,31 @@ comp-trampoline-search + + (defun comp--trampoline-abs-filename (subr-name) + "Return the absolute filename for a trampoline for SUBR-NAME." +- (cl-loop +- with dirs = (if (stringp native-comp-enable-subr-trampolines) +- (list (expand-file-name native-comp-enable-subr-trampolines +- invocation-directory)) +- (if native-compile-target-directory +- (list (expand-file-name comp-native-version-dir +- native-compile-target-directory)) +- (comp-eln-load-path-eff))) +- with rel-filename = (comp-trampoline-filename subr-name) +- for dir in dirs +- for abs-filename = (expand-file-name rel-filename dir) +- unless (file-exists-p dir) +- do (ignore-errors +- (make-directory dir t) +- (cl-return abs-filename)) +- when (file-writable-p abs-filename) +- do (cl-return abs-filename) +- ;; Default to some temporary directory if no better option was +- ;; found. +- finally (cl-return +- (make-temp-file (file-name-sans-extension rel-filename) nil ".eln" +- nil)))) ++ ;; If we've disabled nativecomp, don't write the trampolines to ++ ;; the eln cache (but create them). ++ (and (not inhibit-native-compilation) ++ (cl-loop ++ with dirs = (if (stringp native-comp-enable-subr-trampolines) ++ (list (expand-file-name native-comp-enable-subr-trampolines ++ invocation-directory)) ++ (if native-compile-target-directory ++ (list (expand-file-name comp-native-version-dir ++ native-compile-target-directory)) ++ (comp-eln-load-path-eff))) ++ with rel-filename = (comp-trampoline-filename subr-name) ++ for dir in dirs ++ for abs-filename = (expand-file-name rel-filename dir) ++ unless (file-exists-p dir) ++ do (ignore-errors ++ (make-directory dir t) ++ (cl-return abs-filename)) ++ when (file-writable-p abs-filename) ++ do (cl-return abs-filename) ++ ;; Default to some temporary directory if no better option was ++ ;; found. ++ finally (cl-return ++ (make-temp-file (file-name-sans-extension rel-filename) nil ".eln" ++ nil))))) + + (defun comp-trampoline-compile (subr-name) + "Synthesize compile and return a trampoline for SUBR-NAME." +diff --git a/lisp/startup.el b/lisp/startup.el +index ccfcfee8f0e..45e41a7c951 100644 +--- a/lisp/startup.el ++++ b/lisp/startup.el +@@ -546,7 +546,7 @@ startup--honor-delayed-native-compilations + (setq comp--compilable t)) + + (defvar native-comp-eln-load-path) +-(defvar native-comp-jit-compilation) ++(defvar inhibit-native-compilation) + (defvar native-comp-enable-subr-trampolines) + + (defvar startup--original-eln-load-path nil +@@ -583,6 +583,9 @@ normal-top-level + It sets `command-line-processed', processes the command-line, + reads the initialization files, etc. + It is the default value of the variable `top-level'." ++ ;; Allow disabling automatic .elc->.eln processing. ++ (setq inhibit-native-compilation (getenv "EMACS_INHIBIT_NATIVE_COMPILATION")) ++ + (if command-line-processed + (message internal--top-level-message) + (setq command-line-processed t) +@@ -601,7 +604,7 @@ normal-top-level + ;; in this session. This is necessary if libgccjit is not + ;; available on MS-Windows, but Emacs was built with + ;; native-compilation support. +- (setq native-comp-jit-compilation nil ++ (setq inhibit-native-compilation t + native-comp-enable-subr-trampolines nil)) + + ;; Form `native-comp-eln-load-path'. +diff --git a/src/comp.c b/src/comp.c +index 8428cf9020e..46b81cb1aae 100644 +--- a/src/comp.c ++++ b/src/comp.c +@@ -5179,6 +5179,7 @@ maybe_defer_native_compilation (Lisp_Object function_name, + return; + + if (!native_comp_jit_compilation ++ || !NILP (Vinhibit_native_compilation) + || noninteractive + || !NILP (Vpurify_flag) + || !COMPILEDP (definition) +@@ -5681,6 +5682,13 @@ syms_of_comp (void) + doc: /* Non-nil when comp.el can be native compiled. + For internal use. */); + /* Compiler control customizes. */ ++ DEFVAR_LISP ("inhibit-native-compilation", Vinhibit_native_compilation, ++ doc: /* If non-nil, inhibit automatic native compilation of loaded .elc files. ++ ++After compilation, each function definition is updated to the native ++compiled one. */); ++ Vinhibit_native_compilation = Qnil; ++ + DEFVAR_BOOL ("native-comp-jit-compilation", native_comp_jit_compilation, + doc: /* If non-nil, compile loaded .elc files asynchronously. + diff --git a/patches/0013-Rename-to-inhibit-automatic-native-compilation.patch b/patches/0013-Rename-to-inhibit-automatic-native-compilation.patch new file mode 100644 index 00000000000..d08d2c52eee --- /dev/null +++ b/patches/0013-Rename-to-inhibit-automatic-native-compilation.patch @@ -0,0 +1,99 @@ +From 020148f5a9e63947571859e7b7e20470b7066897 Mon Sep 17 00:00:00 2001 +From: Lars Ingebrigtsen +Date: Mon, 3 Oct 2022 19:49:53 +0200 +Subject: Rename to 'inhibit-automatic-native-compilation' + +The following upstream patch has been backported: + + Rename to inhibit-automatic-native-compilation + + * src/comp.c (maybe_defer_native_compilation): + (syms_of_comp): + * lisp/startup.el (inhibit-native-compilation): + (normal-top-level): + * lisp/progmodes/elisp-mode.el (emacs-lisp-native-compile-and-load): + * lisp/emacs-lisp/comp.el (comp-trampoline-compile): Rename + inhibit-native-compilation to inhibit-automatic-native-compilation. + +Origin: upstream, commit f97993ee667f9be7589825f3a4fbc095d6944ec6 +Forwarded: not-needed +--- + lisp/emacs-lisp/comp.el | 2 +- + lisp/startup.el | 7 ++++--- + src/comp.c | 7 ++++--- + 3 files changed, 9 insertions(+), 7 deletions(-) + +diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el +index 5d688a12d8b..55095986024 100644 +--- a/lisp/emacs-lisp/comp.el ++++ b/lisp/emacs-lisp/comp.el +@@ -3811,7 +3811,7 @@ comp--trampoline-abs-filename + "Return the absolute filename for a trampoline for SUBR-NAME." + ;; If we've disabled nativecomp, don't write the trampolines to + ;; the eln cache (but create them). +- (and (not inhibit-native-compilation) ++ (and (not inhibit-automatic-native-compilation) + (cl-loop + with dirs = (if (stringp native-comp-enable-subr-trampolines) + (list (expand-file-name native-comp-enable-subr-trampolines +diff --git a/lisp/startup.el b/lisp/startup.el +index 45e41a7c951..5f14b585390 100644 +--- a/lisp/startup.el ++++ b/lisp/startup.el +@@ -546,7 +546,7 @@ startup--honor-delayed-native-compilations + (setq comp--compilable t)) + + (defvar native-comp-eln-load-path) +-(defvar inhibit-native-compilation) ++(defvar inhibit-automatic-native-compilation) + (defvar native-comp-enable-subr-trampolines) + + (defvar startup--original-eln-load-path nil +@@ -584,7 +584,8 @@ normal-top-level + reads the initialization files, etc. + It is the default value of the variable `top-level'." + ;; Allow disabling automatic .elc->.eln processing. +- (setq inhibit-native-compilation (getenv "EMACS_INHIBIT_NATIVE_COMPILATION")) ++ (setq inhibit-automatic-native-compilation ++ (getenv "EMACS_INHIBIT_AUTOMATIC_NATIVE_COMPILATION")) + + (if command-line-processed + (message internal--top-level-message) +@@ -604,7 +605,7 @@ normal-top-level + ;; in this session. This is necessary if libgccjit is not + ;; available on MS-Windows, but Emacs was built with + ;; native-compilation support. +- (setq inhibit-native-compilation t ++ (setq inhibit-automatic-native-compilation t + native-comp-enable-subr-trampolines nil)) + + ;; Form `native-comp-eln-load-path'. +diff --git a/src/comp.c b/src/comp.c +index 46b81cb1aae..41078f41d52 100644 +--- a/src/comp.c ++++ b/src/comp.c +@@ -5179,7 +5179,7 @@ maybe_defer_native_compilation (Lisp_Object function_name, + return; + + if (!native_comp_jit_compilation +- || !NILP (Vinhibit_native_compilation) ++ || !NILP (Vinhibit_automatic_native_compilation) + || noninteractive + || !NILP (Vpurify_flag) + || !COMPILEDP (definition) +@@ -5682,12 +5682,13 @@ syms_of_comp (void) + doc: /* Non-nil when comp.el can be native compiled. + For internal use. */); + /* Compiler control customizes. */ +- DEFVAR_LISP ("inhibit-native-compilation", Vinhibit_native_compilation, ++ DEFVAR_LISP ("inhibit-automatic-native-compilation", ++ Vinhibit_automatic_native_compilation, + doc: /* If non-nil, inhibit automatic native compilation of loaded .elc files. + + After compilation, each function definition is updated to the native + compiled one. */); +- Vinhibit_native_compilation = Qnil; ++ Vinhibit_automatic_native_compilation = Qnil; + + DEFVAR_BOOL ("native-comp-jit-compilation", native_comp_jit_compilation, + doc: /* If non-nil, compile loaded .elc files asynchronously. diff --git a/patches/0014-Patch-project-vc-recognizes-git-test-for-Debian-buil.patch b/patches/0014-Patch-project-vc-recognizes-git-test-for-Debian-buil.patch new file mode 100644 index 00000000000..aa9889fe48c --- /dev/null +++ b/patches/0014-Patch-project-vc-recognizes-git-test-for-Debian-buil.patch @@ -0,0 +1,22 @@ +From df4419a4ff06c860565fc6a79ab3b5c4996a94f8 Mon Sep 17 00:00:00 2001 +From: Sean Whitton +Date: Mon, 31 Jul 2023 09:26:48 +0100 +Subject: Patch project-vc-recognizes-git test for Debian build + +--- + test/lisp/progmodes/project-tests.el | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/lisp/progmodes/project-tests.el b/test/lisp/progmodes/project-tests.el +index 1111344387b..652567a7b59 100644 +--- a/test/lisp/progmodes/project-tests.el ++++ b/test/lisp/progmodes/project-tests.el +@@ -124,7 +124,7 @@ project-vc-recognizes-git + (project (project-current nil dir))) + (should-not (null project)) + (should (string-match-p +- "\\`test/lisp/progmodes/project-tests\\.elc?" ++ "\\`debian/build-[a-z]+/test/lisp/progmodes/project-tests\\.elc?" + (file-relative-name + project-tests--this-file + (project-root project)))))) diff --git a/patches/0015-Change-native-comp-async-jobs-number-default-to-1.patch b/patches/0015-Change-native-comp-async-jobs-number-default-to-1.patch new file mode 100644 index 00000000000..17e2a586a6f --- /dev/null +++ b/patches/0015-Change-native-comp-async-jobs-number-default-to-1.patch @@ -0,0 +1,22 @@ +From ceeba43276b3867407905ad5296f66b7115abb31 Mon Sep 17 00:00:00 2001 +From: Sean Whitton +Date: Tue, 29 Aug 2023 09:08:55 +0100 +Subject: Change native-comp-async-jobs-number default to 1 + +--- + lisp/emacs-lisp/comp.el | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el +index 55095986024..b7b04c76878 100644 +--- a/lisp/emacs-lisp/comp.el ++++ b/lisp/emacs-lisp/comp.el +@@ -117,7 +117,7 @@ native-comp-never-optimize-functions + :type '(repeat symbol) + :version "28.1") + +-(defcustom native-comp-async-jobs-number 0 ++(defcustom native-comp-async-jobs-number 1 + "Default number of subprocesses used for async native compilation. + Value of zero means to use half the number of the CPU's execution units, + or one if there's just one execution unit." diff --git a/patches/series b/patches/series new file mode 100644 index 00000000000..a2a44548a71 --- /dev/null +++ b/patches/series @@ -0,0 +1,15 @@ +0001-Prefer-usr-share-info-emacs.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-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch +0009-pdumper-set-DUMP_RELOC_ALIGNMENT_BITS-1-for-m68k.patch +0010-Mark-test-undo-region-as-unstable.patch +0011-Mark-flaky-test-process-tests-multiple-threads-waiti.patch +0012-Add-inhibit-native-compilation.patch +0013-Rename-to-inhibit-automatic-native-compilation.patch +0014-Patch-project-vc-recognizes-git-test-for-Debian-buil.patch +0015-Change-native-comp-async-jobs-number-default-to-1.patch diff --git a/rules b/rules new file mode 100755 index 00000000000..38965316f3d --- /dev/null +++ b/rules @@ -0,0 +1,659 @@ +#!/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 2019 Andreas Beckmann +# Copyright 1994,1995 Ian Jackson +# Copyright 2004-2005 Jérôme Marant +# Copyright 1998-2020, 2022-2023 Rob Browning + +# Originally copied from the GNU Hello Debian rules file (1.3). +# Modified for emacs by Mark Eichin . +# Debhelper support added via one of Joey Hess' example files. +# See the debian/changelog for further historical information. + +include /usr/share/dpkg/architecture.mk +include /usr/share/dpkg/pkg-info.mk + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +SHELL := /bin/bash +TERM := linux +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') + +# From /usr/share/dpkg/pkg-info.mk +src_name := $(DEB_SOURCE) +debian_ver := $(DEB_VERSION) + +# 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') + +# Everything before the last '-' minus epoch +deborig_ver := $(shell echo $(debsrc_ver) | sed 's/^[0-9]\+://') + +###################################################################### +# Customizable variables + +bin_priority := 28 + +# This might also be something like 2006-09-09 for snapshots. +menu_ver := $(major_ver) + +###################################################################### + +# 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) + +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 + +# Separate alternatives into variant (flavor) specific and common. +# For now, we only handle /usr/bin. +var_alternatives := emacsclient +common_alternatives := ctags ebrowse etags + +# 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/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/emacs-bin-common.postinst \ + debian/emacs-bin-common.prerm \ + debian/emacs-common.README.Debian \ + debian/emacs-common.postinst \ + debian/emacs-common.prerm \ + debian/emacs-nox.lintian-overrides \ + debian/emacs-nox.postinst \ + debian/emacs-nox.prerm \ + debian/emacs-lucid.lintian-overrides \ + debian/emacs-lucid.postinst \ + debian/emacs-lucid.prerm \ + debian/emacs-gtk.lintian-overrides \ + debian/emacs-gtk.postinst \ + debian/emacs-gtk.prerm \ + debian/emacs-pgtk.lintian-overrides \ + debian/emacs-pgtk.postinst \ + debian/emacs-pgtk.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/emacs-common +pkgdir_bin_common := $(CURDIR)/debian/emacs-bin-common +pkgdir_gtk := $(CURDIR)/debian/emacs-gtk +pkgdir_pgtk := $(CURDIR)/debian/emacs-pgtk +pkgdir_nox := $(CURDIR)/debian/emacs-nox +pkgdir_lucid := $(CURDIR)/debian/emacs-lucid +pkgdir_el := $(CURDIR)/debian/emacs-el + +install_dir_gtk := $(CURDIR)/debian/install-gtk +install_dir_pgtk := $(CURDIR)/debian/install-pgtk +install_dir_nox := $(CURDIR)/debian/install-nox +install_dir_lucid := $(CURDIR)/debian/install-lucid + +libexec_dir_emacs := usr/libexec/emacs/$(runtime_ver)/$(DEB_HOST_GNU_TYPE) + +local_lpath := /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)) + +# 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 \ + 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|\@DEBORIG_VERSION\@|$(deborig_ver)|go;" \ + -e "s|\@MENU_VERSION\@|$(menu_ver)|go;" \ + -e "s|\@X_SUPPORT\@|$(xsupport)|go;" \ + -e "s|\@BIN_PRIORITY\@|$(bin_priority)|go;" \ + -e "s|\@DEB_VAR_ALTERNATIVES\@|$(var_alternatives)|go;" \ + -e "s|\@DEB_COMMON_ALTERNATIVES\@|$(common_alternatives)|go;" \ + < $(1) > $(2) +endef + +%: + dh $@ + +check-vars: + @echo "src_name: $(src_name)" + @echo "upstream_ver: $(upstream_ver)" + @echo "debian_ver: $(debian_ver)" + @echo "debsrc_ver: $(debsrc_ver)" + @echo "deborig_ver: $(deborig_ver)" + @echo "debian_rev: $(debian_rev)" + @echo "runtime_ver: $(runtime_ver)" + @echo "major_ver: $(major_ver)" + @echo "minor_ver: $(minor_ver)" + +.PHONY: check-autogen +check-autogen: $(persistent_autogen_files) $(nonpersistent_autogen_files) + +debian-sync: $(persistent_autogen_files) + # so dh pattern rule doesn't try to handle this target + true + +debian/emacs-gtk.%: xsupport := "gtk" +debian/emacs-gtk.%: pkg_name := emacs-gtk + +debian/emacs-pgtk.%: xsupport := "pgtk" +debian/emacs-pgtk.%: pkg_name := emacs-pgtk + +debian/emacs-nox.%: xsupport := "nox" +debian/emacs-nox.%: pkg_name := emacs-nox + +debian/emacs-lucid.%: xsupport := "lucid" +debian/emacs-lucid.%: pkg_name := emacs-lucid + +debian/emacs-common.%: pkg_name := emacs-common +debian/emacs-bin-common.%: pkg_name := emacs-bin-common + +debian/%: debian/%.in debian/changelog debian/rules + $(call deb_sub,$<,$@) + +debian/emacs-nox.%: debian/emacsVAR.% debian/changelog debian/rules + $(call deb_sub,$<,$@) + +debian/emacs-gtk.%: debian/emacsVAR.% debian/changelog debian/rules + $(call deb_sub,$<,$@) + +debian/emacs-pgtk.%: debian/emacsVAR.% debian/changelog debian/rules + $(call deb_sub,$<,$@) + +debian/emacs-lucid.%: debian/emacsVAR.% debian/changelog debian/rules + $(call deb_sub,$<,$@) + +debian/emacs-common.README.Debian: \ + debian/emacs-common.README.in debian/patches/*.patch debian/patches/series \ + debian/rules debian/patch-to-news + cd debian && \ + csplit -s -f emacs-common.README. \ + emacs-common.README.in '/@@PATCH_LIST_HERE@@/' + cp debian/emacs-common.README.00 debian/emacs-common.README.tmp + debian/patch-to-news $$($(quilt) series) \ + >> debian/emacs-common.README.tmp + tail -n +2 \ + < debian/emacs-common.README.01 \ + >> debian/emacs-common.README.tmp + mv debian/emacs-common.README.tmp $@ + +# Uncomment to experiment with NATIVE_FULL_AOT - tests don't appear to pass yet. +#export NATIVE_FULL_AOT ?= 1 + +# common configure flags +confflags += --prefix=/usr +confflags += --sharedstatedir=/var/lib +confflags += --libexecdir=/usr/libexec +confflags += --localstatedir=/var/lib +confflags += --infodir=/usr/share/info +confflags += --mandir=/usr/share/man +confflags += --with-libsystemd +confflags += --with-pop=yes +confflags += --enable-locallisppath=$(local_lpath) +confflags += --with-sound=alsa +confflags += --without-gconf +confflags += --with-mailutils +# At the moment, there's no mips64el libgccjitN-dev +ifeq (,$(filter $(DEB_HOST_ARCH),mips64el riscv64 s390x)) + deb_native_compilation_enabled := 1 + confflags += --with-native-compilation +endif + +# x configure flags +confflags_gtk := $(confflags) +confflags_gtk += --with-cairo +confflags_gtk += --with-x=yes +confflags_gtk += --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 emacs-gtk package will have the old scrollbars. +confflags_gtk += --with-toolkit-scroll-bars + +# pgtk configure flags +confflags_pgtk := $(confflags) +confflags_pgtk += --with-pgtk + +# 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)" \ + CC=gcc-13 \ + 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 +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-gtk debian/build-pgtk 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-gtk debian/build-pgtk + # Create one VPATH build per-config + $(call cfg_tree,debian/build-gtk,$(confflags_gtk)) + $(call cfg_tree,debian/build-pgtk,$(confflags_pgtk)) + $(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-gtk) + $(call build_cmd,debian/build-pgtk) + $(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-gtk check + $(MAKE) -C debian/build-pgtk check + endif + +ifdef deb_native_compilation_enabled + define maybe_install_native_lisp + install -d $(2)/usr/lib/emacs/$(runtime_ver) + cp -a $(1)/usr/lib/emacs/$(runtime_ver)/native-lisp \ + $(2)/usr/lib/emacs/$(runtime_ver) + endef +endif + +define install_common_binpkg_bits + # args: (1) srcdir (2) pkgdir (3) pkgname (4) bin-suffix + + install -d $(2)/usr/bin/ + cp -a $(1)/usr/bin/emacs-$(upstream_ver) $(2)/usr/bin/emacs-$(4) + set -x; for f in $(var_alternatives); do \ + cp -a "$(1)/usr/bin/$$f" "$(2)/usr/bin/$$f.emacs"; \ + done + + test -f $(1)/$(libexec_dir_emacs)/emacs-*.pdmp + install -d $(2)/$(libexec_dir_emacs) + cp -a $(1)/$(libexec_dir_emacs)/emacs-*.pdmp $(2)/$(libexec_dir_emacs)/ + + $(call maybe_install_native_lisp,$(1),$(2)) + + 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.1.gz \ + usr/share/man/man1/emacs-$(4).1.gz + + dh_link -p$(3) usr/share/doc/emacs-common usr/share/doc/$(3) + +endef + +override_dh_auto_install: $(autogen_install_files) + rm -rf \ + $(install_dir_gtk) $(install_dir_pgtk) \ + $(install_dir_nox) $(install_dir_lucid) \ + $(pkgdir_common)/* \ + $(pkgdir_bin_common)/* \ + $(pkgdir_gtk)/* \ + $(pkgdir_pgtk)/* \ + $(pkgdir_nox)/* \ + $(pkgdir_lucid)/* \ + $(pkgdir_el)/* + + $(call emacs_inst,build-pgtk,$(install_dir_pgtk)) + + ################################################## + # emacs-common + ifneq (,$(findstring emacs-common, $(shell dh_listpackages))) + install -d $(pkgdir_common) + cp -a $(install_dir_pgtk)/* $(pkgdir_common) + + rm -r $(pkgdir_common)/usr/bin + rm \ + $(pkgdir_common)/$(libexec_dir_emacs)/hexl \ + $(pkgdir_common)/$(libexec_dir_emacs)/emacs-*.pdmp \ + $(pkgdir_common)/$(libexec_dir_emacs)/rcs2log + cd $(pkgdir_common)/usr \ + && rmdir --parents libexec/emacs/$(runtime_ver)/$(DEB_HOST_GNU_TYPE) + + ifdef deb_native_compilation_enabled + rm -r $(pkgdir_common)/usr/lib/emacs/$(runtime_ver)/native-lisp + endif + + 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/emacs/site-start.d + install -d $(pkgdir_common)/usr/share/emacs/site-lisp + + install -m 0644 debian/00debian.el \ + $(pkgdir_common)/etc/emacs/site-start.d/ + + 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/emacs{22,23}.* + 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 + + # 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 + cd $(pkgdir_common)/usr/share/man/man1/ && \ + for f in *.1; do mv $$f $$(basename $${f} .1).emacs.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 -pemacs-common /usr/share/common-licenses/GPL-3 \ + usr/share/emacs/$(runtime_ver)/etc/COPYING + dh_link -pemacs-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/dir + rm -f $(pkgdir_common)/usr/share/info/emacs/dir.old + + install -d $(pkgdir_common)/usr/local/share/emacs/site-lisp + endif + + ################################################## + # emacs-bin-common + ifneq (,$(findstring emacs-bin-common, $(shell dh_listpackages))) + # Move common binaries to emacs-bin-common. For now, just + # take them from pgtk. + + ## usr/bin + install -d $(pkgdir_bin_common)/usr/bin + cp -a $(install_dir_pgtk)/usr/bin $(pkgdir_bin_common)/usr/bin/debtmp + + set -x; \ + cd $(pkgdir_bin_common)/usr/bin; \ + for f in $(common_alternatives); do mv "debtmp/$$f" "$$f.emacs"; done + + set -x; \ + cd $(pkgdir_bin_common)/usr/bin/debtmp; \ + for f in $(var_alternatives); do rm "$$f"; done + + # Now there should ony be emacs and emacs-VER + cd $(pkgdir_bin_common)/usr/bin/debtmp \ + && rm emacs emacs-$(upstream_ver) + + # Failure here should indicate something new upstream that + # needs to be in var_alternatives or common_alternatives. + + + + ls -A $(pkgdir_bin_common)/usr/bin/debtmp + + + + rmdir $(pkgdir_bin_common)/usr/bin/debtmp + + ## libexec + cp -a $(install_dir_pgtk)/usr/libexec $(pkgdir_bin_common)/usr + # pdmp files are flavor-specific + test -f $(pkgdir_bin_common)/$(libexec_dir_emacs)/emacs-*.pdmp + rm $(pkgdir_bin_common)/$(libexec_dir_emacs)/emacs-*.pdmp + + endif + + ################################################## + # emacs-gtk + ifneq (,$(findstring emacs-gtk, $(shell dh_listpackages))) + $(call emacs_inst,build-gtk,$(install_dir_gtk)) + $(call install_common_binpkg_bits,$(install_dir_gtk),$(pkgdir_gtk),emacs-gtk,gtk) + + # install desktop entries + install -d $(pkgdir_gtk)/usr/share/applications + install -m 0644 \ + debian/emacs.desktop \ + debian/emacs-term.desktop \ + $(pkgdir_gtk)/usr/share/applications/ + endif + + ################################################## + # emacs-pgtk + ifneq (,$(findstring emacs, $(shell dh_listpackages))) + $(call install_common_binpkg_bits,$(install_dir_pgtk),$(pkgdir_pgtk),emacs-pgtk,pgtk) + + # install desktop entries + install -d $(pkgdir_pgtk)/usr/share/applications + install -m 0644 \ + debian/emacs.desktop \ + debian/emacs-term.desktop \ + $(pkgdir_pgtk)/usr/share/applications/ + endif + + ################################################## + # emacs-nox + ifneq (,$(findstring emacs-nox, $(shell dh_listpackages))) + $(call emacs_inst,build-nox,$(install_dir_nox)) + $(call install_common_binpkg_bits,$(install_dir_nox),$(pkgdir_nox),emacs-nox,nox) + # install desktop entry + install -d $(pkgdir_gtk)/usr/share/applications + install -m 0644 \ + debian/emacs-term.desktop $(pkgdir_gtk)/usr/share/applications/ + rm -rf $(install_dir_nox) + endif + + ################################################## + # emacs-lucid + ifneq (,$(findstring emacs-lucid, $(shell dh_listpackages))) + $(call emacs_inst,build-lucid,$(install_dir_lucid)) + $(call install_common_binpkg_bits,$(install_dir_lucid),$(pkgdir_lucid),emacs-lucid,lucid) + + # install desktop entries + install -d $(pkgdir_lucid)/usr/share/applications + install -m 0644 \ + debian/emacs.desktop \ + debian/emacs-term.desktop \ + $(pkgdir_lucid)/usr/share/applications/ + rm -rf $(install_dir_lucid) + endif + + ################################################## + # emacs-el + ifneq (,$(findstring emacs-el, $(shell dh_listpackages))) + install -d $(pkgdir_el) + $(pf); \ + (cd $(install_dir_pgtk) && 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_gtk) + rm -rf $(install_dir_pgtk) + rm -rf $(install_dir_nox) + rm -rf $(install_dir_lucid) + +# Install the per-user systemd unit in a disabled state by default. +override_dh_installsystemduser: + dh_installsystemduser --no-enable + +# This won't be necessary once strip-nondeterminism is fixed. +.PHONY: override_dh_strip_nondeterminism +override_dh_strip_nondeterminism: + if grep "emacs-el" <(dh_listpackages); then \ + cp -a debian/emacs-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 "emacs-el" <(dh_listpackages); then \ + set -e; \ + test ! debian/elgz-canary -nt \ + debian/emacs-el/usr/share/emacs/$(runtime_ver)/lisp/version.el.gz; \ + test ! debian/elgz-canary -ot \ + debian/emacs-el/usr/share/emacs/$(runtime_ver)/lisp/version.el.gz; \ + fi + +override_dh_testdir: + dh_testdir debian/emacsVAR.postinst + +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-gtk \ + debian/build-pgtk \ + debian/elgz-canary \ + debian/elgz-info \ + debian/emacs-common.README.00 \ + debian/emacs-common.README.01 \ + debian/install-lucid \ + debian/install-nox \ + debian/install-gtk \ + debian/install-pgtk + rm -f $(nonpersistent_autogen_files) diff --git a/source/format b/source/format new file mode 100644 index 00000000000..163aaf8d82b --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/source/lintian-overrides b/source/lintian-overrides new file mode 100644 index 00000000000..678ed3a74f0 --- /dev/null +++ b/source/lintian-overrides @@ -0,0 +1 @@ +source-is-missing [test/lisp/net/shr-resources/nonbr.html] diff --git a/upstream-version b/upstream-version new file mode 100755 index 00000000000..04afc1afce6 --- /dev/null +++ b/upstream-version @@ -0,0 +1,22 @@ +#!/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"; -- 2.30.2