diff -pruN 1:30.2+1-2/debian/.gitignore 1:30.2+1-2ubuntu1/debian/.gitignore --- 1:30.2+1-2/debian/.gitignore 2025-11-20 18:22:13.000000000 +0000 +++ 1:30.2+1-2ubuntu1/debian/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,95 +0,0 @@ -*~ -.\#* -/*-stamp -/.debhelper/ -/build-gtk/ -/build-pgtk/ -/build-lucid/ -/build-nox/ -/build-src/ -/build-x/ -/elgz-canary -/elgz-info -/emacs -/emacs-bin-common -/emacs-bin-common.README.Debian -/emacs-bin-common.debhelper.log -/emacs-bin-common.lintian-overrides -/emacs-bin-common.postinst -/emacs-bin-common.postrm -/emacs-bin-common.prerm -/emacs-bin-common.substvars -/emacs-common -/emacs-common.README.00 -/emacs-common.README.01 -/emacs-common.README.Debian -/emacs-common.debhelper.log -/emacs-common.docs -/emacs-common.links -/emacs-common.lintian-overrides -/emacs-common.postinst -/emacs-common.postinst.debhelper -/emacs-common.postrm.debhelper -/emacs-common.prerm -/emacs-common.prerm.debhelper -/emacs-common.substvars -/emacs-el -/emacs-el.debhelper.log -/emacs-el.prerm -/emacs-el.substvars -/emacs-gtk -/emacs-gtk.README.Debian -/emacs-gtk.debhelper.log -/emacs-gtk.desktop -/emacs-gtk.links -/emacs-gtk.lintian-overrides -/emacs-gtk.menu -/emacs-gtk.postinst -/emacs-gtk.postinst.debhelper -/emacs-gtk.postrm -/emacs-gtk.postrm.debhelper -/emacs-gtk.prerm -/emacs-gtk.substvars -/emacs-pgtk -/emacs-pgtk.README.Debian -/emacs-pgtk.debhelper.log -/emacs-pgtk.desktop -/emacs-pgtk.links -/emacs-pgtk.lintian-overrides -/emacs-pgtk.menu -/emacs-pgtk.postinst -/emacs-pgtk.postinst.debhelper -/emacs-pgtk.postrm -/emacs-pgtk.postrm.debhelper -/emacs-pgtk.prerm -/emacs-pgtk.substvars -/emacs-lucid -/emacs-lucid.README.Debian -/emacs-lucid.debhelper.log -/emacs-lucid.desktop -/emacs-lucid.lintian-overrides -/emacs-lucid.menu -/emacs-lucid.postinst -/emacs-lucid.postinst.debhelper -/emacs-lucid.postrm.debhelper -/emacs-lucid.prerm -/emacs-lucid.substvars -/emacs-nox -/emacs-nox.README.Debian -/emacs-nox.debhelper.log -/emacs-nox.desktop -/emacs-nox.links -/emacs-nox.lintian-overrides -/emacs-nox.menu -/emacs-nox.postinst -/emacs-nox.postinst.debhelper -/emacs-nox.postrm -/emacs-nox.postrm.debhelper -/emacs-nox.prerm -/emacs-nox.substvars -/emacs.debhelper.log -/emacs.substvars -/files -/stamp-configured -/tmp-alt-list -\#*\# diff -pruN 1:30.2+1-2/debian/changelog 1:30.2+1-2ubuntu1/debian/changelog --- 1:30.2+1-2/debian/changelog 2025-11-20 18:22:13.000000000 +0000 +++ 1:30.2+1-2ubuntu1/debian/changelog 2025-11-22 20:53:34.000000000 +0000 @@ -1,3 +1,14 @@ +emacs (1:30.2+1-2ubuntu1) resolute; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/rules: Build Emacs with -O2 instead of -O3 on ppc64el in order + to prevent an FTBFS due to lcms-cri-cam02-ucs failing. + - Ignore test results, on riscv64 the package builds with tests disabled + making lot of sources not able to build there due to missing common + package + + -- Gianfranco Costamagna Sat, 22 Nov 2025 21:53:34 +0100 + emacs (1:30.2+1-2) unstable; urgency=medium [ Rob Browning ] @@ -11,6 +22,22 @@ emacs (1:30.2+1-2) unstable; urgency=med -- Sean Whitton Thu, 20 Nov 2025 18:22:13 +0000 +emacs (1:30.2+1-1ubuntu2) resolute; urgency=medium + + * Ignore test results, on riscv64 the package builds with tests disabled + making lot of sources not able to build there due to missing common + package + + -- Gianfranco Costamagna Wed, 19 Nov 2025 17:35:55 +0100 + +emacs (1:30.2+1-1ubuntu1) resolute; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/rules: Build Emacs with -O2 instead of -O3 on ppc64el in order + to prevent an FTBFS due to lcms-cri-cam02-ucs failing. + + -- Gianfranco Costamagna Tue, 11 Nov 2025 08:15:29 +0100 + emacs (1:30.2+1-1) unstable; urgency=medium * Merge upstream version 30.2 @@ -19,6 +46,14 @@ emacs (1:30.2+1-1) unstable; urgency=med -- Rob Browning Sun, 09 Nov 2025 16:49:07 -0600 +emacs (1:30.1+1-9ubuntu1) questing; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/rules: Build Emacs with -O2 instead of -O3 on ppc64el in order + to prevent an FTBFS due to lcms-cri-cam02-ucs failing. + + -- Gianfranco Costamagna Thu, 28 Aug 2025 09:19:50 +0200 + emacs (1:30.1+1-9) unstable; urgency=medium * Adjust shr-tests/zoom test to work with libxml2 2.14+ Add @@ -28,6 +63,16 @@ emacs (1:30.1+1-9) unstable; urgency=med -- Rob Browning Sun, 24 Aug 2025 20:04:56 -0500 +emacs (1:30.1+1-8ubuntu1) questing; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Test build, ignore test results. + - Disable shr/zoom-image test, fails with libxml2 2.14.x. See LP #2111576. + - d/rules: Build Emacs with -O2 instead of -O3 on ppc64el in order + to prevent an FTBFS due to lcms-cri-cam02-ucs failing. + + -- Gianfranco Costamagna Mon, 25 Aug 2025 11:50:59 +0200 + emacs (1:30.1+1-8) unstable; urgency=medium * Upload to unstable. @@ -44,6 +89,16 @@ emacs (1:30.1+1-7) experimental; urgency -- Sean Whitton Fri, 25 Jul 2025 09:37:19 +0100 +emacs (1:30.1+1-6ubuntu1) questing; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Test build, ignore test results. + - Disable shr/zoom-image test, fails with libxml2 2.14.x. See LP #2111576. + - d/rules: Build Emacs with -O2 instead of -O3 on ppc64el in order + to prevent an FTBFS due to lcms-cri-cam02-ucs failing. + + -- Gianfranco Costamagna Mon, 04 Aug 2025 11:18:35 +0200 + emacs (1:30.1+1-6) unstable; urgency=medium * Add Breaks/Replaces/Provides for builtin packages in this release. @@ -51,6 +106,32 @@ emacs (1:30.1+1-6) unstable; urgency=med -- Sean Whitton Fri, 18 Jul 2025 09:58:11 +0100 +emacs (1:30.1+1-5ubuntu6) questing; urgency=medium + + * Test build, ignore test results. + + -- Matthias Klose Fri, 23 May 2025 16:03:05 +0200 + +emacs (1:30.1+1-5ubuntu4) questing; urgency=medium + + * Disable shr/zoom-image test, fails with libxml2 2.14.x. See LP #2111576. + + -- Matthias Klose Fri, 23 May 2025 12:40:09 +0200 + +emacs (1:30.1+1-5ubuntu2) questing; urgency=medium + + * No-change rebuild for libtree-sitter0.22. + + -- Sudip Mukherjee Wed, 07 May 2025 10:08:37 +0100 + +emacs (1:30.1+1-5ubuntu1) plucky; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/rules: Build Emacs with -O2 instead of -O3 on ppc64el in order + to prevent an FTBFS due to lcms-cri-cam02-ucs failing. + + -- Gianfranco Costamagna Mon, 31 Mar 2025 07:50:07 +0200 + emacs (1:30.1+1-5) unstable; urgency=medium * Disable emacs-module-tests.el (Closes: #1101598). @@ -58,6 +139,14 @@ emacs (1:30.1+1-5) unstable; urgency=med -- Sean Whitton Sun, 30 Mar 2025 13:26:28 +0800 +emacs (1:30.1+1-4ubuntu1) plucky; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/rules: Build Emacs with -O2 instead of -O3 on ppc64el in order + to prevent an FTBFS due to lcms-cri-cam02-ucs failing. + + -- Gianfranco Costamagna Fri, 07 Mar 2025 08:23:44 +0100 + emacs (1:30.1+1-4) unstable; urgency=medium * Add "Breaks: dh-elpa-helper (<< 2.1.7)" to flavour binary packages. @@ -106,6 +195,14 @@ emacs (1:30.1+1-1) unstable; urgency=med -- Sean Whitton Mon, 24 Feb 2025 17:19:10 +0800 +emacs (1:29.4+1-6ubuntu3) plucky; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/rules: Build Emacs with -O2 instead of -O3 on ppc64el in order + to prevent an FTBFS due to lcms-cri-cam02-ucs failing. + + -- Gianfranco Costamagna Thu, 13 Feb 2025 07:01:30 +0100 + emacs (1:29.4+1-6) unstable; urgency=medium * Disable native compilation on loong64 (Closes: #1095720). @@ -113,12 +210,28 @@ emacs (1:29.4+1-6) unstable; urgency=med -- Sean Whitton Wed, 12 Feb 2025 08:39:57 +0800 +emacs (1:29.4+1-5ubuntu1) plucky; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/rules: Build Emacs with -O2 instead of -O3 on ppc64el in order + to prevent an FTBFS due to lcms-cri-cam02-ucs failing. + + -- Gianfranco Costamagna Tue, 14 Jan 2025 07:05:00 +0100 + emacs (1:29.4+1-5) unstable; urgency=medium * Update to GCC 14 (Closes: #1092655). -- Sean Whitton Mon, 13 Jan 2025 08:45:01 +0000 +emacs (1:29.4+1-4ubuntu1) plucky; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/rules: Build Emacs with -O2 instead of -O3 on ppc64el in order + to prevent an FTBFS due to lcms-cri-cam02-ucs failing. + + -- Gianfranco Costamagna Mon, 09 Dec 2024 17:42:02 +0100 + emacs (1:29.4+1-4) unstable; urgency=medium * 00debian.el: Mark file with 'lexical-binding: t'. @@ -131,6 +244,14 @@ emacs (1:29.4+1-4) unstable; urgency=med -- Sean Whitton Sun, 08 Dec 2024 13:38:47 +0800 +emacs (1:29.4+1-3ubuntu1) oracular; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/rules: Build Emacs with -O2 instead of -O3 on ppc64el in order + to prevent an FTBFS due to lcms-cri-cam02-ucs failing. + + -- Gianfranco Costamagna Mon, 01 Jul 2024 08:16:03 +0200 + emacs (1:29.4+1-3) unstable; urgency=high * Mark dired-test-bug27243-02 as unstable for now. @@ -142,6 +263,14 @@ emacs (1:29.4+1-3) unstable; urgency=hig -- Rob Browning Sat, 29 Jun 2024 15:46:01 -0500 +emacs (1:29.4+1-2ubuntu1) oracular; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/rules: Build Emacs with -O2 instead of -O3 on ppc64el in order + to prevent an FTBFS due to lcms-cri-cam02-ucs failing. + + -- Gianfranco Costamagna Thu, 27 Jun 2024 11:43:29 +0200 + emacs (1:29.4+1-2) unstable; urgency=medium * Minor edits to README.source. @@ -150,6 +279,14 @@ emacs (1:29.4+1-2) unstable; urgency=med -- Sean Whitton Tue, 25 Jun 2024 13:20:34 +0800 +emacs (1:29.4+1-1ubuntu1) oracular; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/rules: Build Emacs with -O2 instead of -O3 on ppc64el in order + to prevent an FTBFS due to lcms-cri-cam02-ucs failing. + + -- Gianfranco Costamagna Tue, 25 Jun 2024 11:42:49 +0200 + emacs (1:29.4+1-1) unstable; urgency=medium * Merge upstream version 29.4. (Closes: 1074137) @@ -157,6 +294,14 @@ emacs (1:29.4+1-1) unstable; urgency=med -- Rob Browning Mon, 24 Jun 2024 19:34:05 -0500 +emacs (1:29.3+1-3ubuntu1) oracular; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - d/rules: Build Emacs with -O2 instead of -O3 on ppc64el in order + to prevent an FTBFS due to lcms-cri-cam02-ucs failing. + + -- Gianfranco Costamagna Sat, 18 May 2024 10:06:22 +0200 + emacs (1:29.3+1-3) unstable; urgency=medium [ Sean Whitton ] @@ -173,6 +318,14 @@ emacs (1:29.3+1-3) unstable; urgency=med -- Rob Browning Wed, 15 May 2024 00:37:47 -0500 +emacs (1:29.3+1-2ubuntu1) oracular; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - d/rules: Build Emacs with -O2 instead of -O3 on ppc64el in order + to prevent an FTBFS due to lcms-cri-cam02-ucs failing. + + -- Gianfranco Costamagna Thu, 02 May 2024 14:51:52 +0200 + emacs (1:29.3+1-2) unstable; urgency=medium * Change native-comp-async-report-warnings-errors to `silent'. @@ -185,6 +338,20 @@ emacs (1:29.3+1-2) unstable; urgency=med -- Sean Whitton Sat, 20 Apr 2024 07:52:47 +0100 +emacs (1:29.3+1-1ubuntu2) noble; urgency=medium + + * No-change rebuild for CVE-2024-3094 + + -- William Grant Mon, 01 Apr 2024 16:18:56 +1100 + +emacs (1:29.3+1-1ubuntu1) noble; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/rules: Build Emacs with -O2 instead of -O3 on ppc64el in order + to prevent an FTBFS due to lcms-cri-cam02-ucs failing. + + -- Gianfranco Costamagna Thu, 28 Mar 2024 14:54:42 +0100 + emacs (1:29.3+1-1) unstable; urgency=high * Merge upstream version 29.3. Thanks to David Bremner for the @@ -200,6 +367,14 @@ emacs (1:29.2+1-2) unstable; urgency=med -- Sean Whitton Tue, 27 Feb 2024 09:26:29 +0800 +emacs (1:29.2+1-1ubuntu1) noble; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/rules: Build Emacs with -O2 instead of -O3 on ppc64el in order + to prevent an FTBFS due to lcms-cri-cam02-ucs failing. + + -- Gianfranco Costamagna Mon, 26 Feb 2024 21:10:39 +0100 + emacs (1:29.2+1-1) unstable; urgency=medium [ Rob Browning ] @@ -244,6 +419,14 @@ emacs (1:29.2+1-1) unstable; urgency=med -- Sean Whitton Mon, 26 Feb 2024 16:55:58 +0800 +emacs (1:29.1+1-5ubuntu1) mantic; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - d/rules: Build Emacs with -O2 instead of -O3 on ppc64el in order + to prevent an FTBFS due to lcms-cri-cam02-ucs failing. + + -- Gianfranco Costamagna Sat, 02 Sep 2023 12:03:23 +0200 + emacs (1:29.1+1-5) unstable; urgency=medium * Don't try to build with native compilation on riscv64 (Closes: #1050653). @@ -265,6 +448,15 @@ emacs (1:29.1+1-5) unstable; urgency=med -- Sean Whitton Wed, 30 Aug 2023 08:53:05 +0100 +emacs (1:29.1+1-4ubuntu1) mantic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/rules: Build Emacs with -O2 instead of -O3 on ppc64el in order + to prevent an FTBFS due to lcms-cri-cam02-ucs failing. + - d/rules: set native compilation on riscv64 instead of using gcc-12 + + -- Gianfranco Costamagna Sun, 27 Aug 2023 08:59:23 +0200 + emacs (1:29.1+1-4) unstable; urgency=medium * Take emacs-el from the pgtk build too to fix arch:all-only build. @@ -286,6 +478,21 @@ emacs (1:29.1+1-3) unstable; urgency=med -- Sean Whitton Wed, 23 Aug 2023 10:15:43 +0100 +emacs (1:29.1+1-2ubuntu2) mantic; urgency=medium + + * set gcc-12 on riscv64 to fix a build failure + + -- Gianfranco Costamagna Thu, 03 Aug 2023 23:58:33 +0200 + +emacs (1:29.1+1-2ubuntu1) mantic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/rules: Build Emacs with -O2 instead of -O3 on ppc64el in order + to prevent an FTBFS due to lcms-cri-cam02-ucs failing. + - set TERM to linux to avoid test failures with unknown terminal + + -- Gianfranco Costamagna Wed, 02 Aug 2023 01:28:59 +0200 + emacs (1:29.1+1-2) unstable; urgency=medium * Source-only upload. @@ -306,12 +513,30 @@ emacs (1:29.1+1-1) unstable; urgency=med -- Sean Whitton Mon, 31 Jul 2023 09:28:10 +0100 +emacs (1:28.2+1-16ubuntu1) mantic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/rules: Build Emacs with -O2 instead of -O3 on ppc64el in order + to prevent an FTBFS due to lcms-cri-cam02-ucs failing. + + -- Gianfranco Costamagna Sat, 29 Jul 2023 21:56:19 +0200 + 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-15ubuntu1) mantic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/rules: Build Emacs with -O2 instead of -O3 on ppc64el in order + to prevent an FTBFS due to lcms-cri-cam02-ucs failing. + - use gcc-13 on riscv64 to fix an issue with libgccjit + (See LP bug 2011487) + + -- Gianfranco Costamagna Mon, 15 May 2023 09:03:06 +0200 + emacs (1:28.2+1-15) unstable; urgency=medium * emacs-common: add breaks/replaces emacs-bin-common (<< 1:28) since the @@ -325,6 +550,16 @@ emacs (1:28.2+1-15) unstable; urgency=me -- Rob Browning Sat, 13 May 2023 15:17:27 -0500 +emacs (1:28.2+1-14ubuntu1) mantic; urgency=low + + * Merge from Debian unstable. Remaining changes: + - d/rules: Build Emacs with -O2 instead of -O3 on ppc64el in order + to prevent an FTBFS due to lcms-cri-cam02-ucs failing. + - use gcc-13 on riscv64 to fix an issue with libgccjit + (See LP bug 2011487) + + -- Gianfranco Costamagna Tue, 02 May 2023 08:54:34 +0200 + emacs (1:28.2+1-14) unstable; urgency=medium * Fix gnus nnml crash on some invalid headers. Add @@ -338,6 +573,16 @@ emacs (1:28.2+1-14) unstable; urgency=me -- Rob Browning Sat, 01 Apr 2023 22:38:56 -0500 +emacs (1:28.2+1-13ubuntu3) lunar; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - d/rules: Build Emacs with -O2 instead of -O3 on ppc64el in order + to prevent an FTBFS due to lcms-cri-cam02-ucs failing. + - use gcc-13 on riscv64 to fix an issue with libgccjit + (See LP bug 2011487) + + -- Gianfranco Costamagna Thu, 16 Mar 2023 07:44:21 +0100 + emacs (1:28.2+1-13) unstable; urgency=high * Cherry-pick upstream fixes for command injection vulnerabilities @@ -345,6 +590,23 @@ emacs (1:28.2+1-13) unstable; urgency=hi -- Sean Whitton Tue, 14 Mar 2023 13:30:28 -0700 +emacs (1:28.2+1-12ubuntu1) lunar; urgency=medium + + * Merge with Debian unstable. + * Drop changes: + - Tag lscm test case as flakey. + [ Not needed anymore; ppc64el is the only architecture affected + and building Emacs with -O2 instead of -O3 solves the issue. ] + - Demote mailutils Recommends to a Suggests, as it's in + universe, pulls in an MTA, and is nutty to require for a text editor. + [ Drop in order to reduce delta and make it possible to turn the + package again into a sync with Debian. ] + * Add changes: + - d/rules: Build Emacs with -O2 instead of -O3 on ppc64el in order + to prevent an FTBFS due to lcms-cri-cam02-ucs failing. + + -- Sergio Durigan Junior Mon, 06 Mar 2023 21:26:05 -0500 + emacs (1:28.2+1-12) unstable; urgency=medium * Fix memory leak in etags.c introduced by recent security fix. @@ -359,6 +621,26 @@ emacs (1:28.2+1-11) unstable; urgency=hi -- Sean Whitton Wed, 22 Feb 2023 11:01:50 -0700 +emacs (1:28.2+1-10ubuntu1) lunar; urgency=medium + + * Merge with Debian unstable. Remaining changes: + - Demote mailutils Recommends to a Suggests, as it's in + universe, pulls in an MTA, and is nutty to require for a text editor. + - Tag lscm test case as flakey. + * Drop changes: + - Limit optimization on ppc64el to fix test failure. + [ Not needed anymore ] + - Skip tests that require DNS lookups (LP #1911209) + + debian/patches/skip-dns-lookup-tests.patch + [ Fixed upstream ] + - debian/patches/glibc-2.34-signal-stack-fix.patch: cherry-pick + fix from upstream to fix the FTBFS with our Ubuntu glibc 2.34. + [ Fixed upstream ] + - Run 'python3' as default Python command instead of 'python' + [ Fixed upstream ] + + -- Sergio Durigan Junior Wed, 08 Feb 2023 18:46:42 -0500 + emacs (1:28.2+1-10) unstable; urgency=medium * Fix copyright tests for 2023 onwards. Thanks to Mattias Engdegård for @@ -542,6 +824,48 @@ emacs (1:27.1+1-3.1) unstable; urgency=m -- Sergio Durigan Junior Sat, 20 Mar 2021 17:41:44 -0400 +emacs (1:27.1+1-3ubuntu6) lunar; urgency=medium + + * No-change rebuild against libtiff6 + + -- Steve Langasek Sun, 05 Feb 2023 03:59:33 +0000 + +emacs (1:27.1+1-3ubuntu5) jammy; urgency=medium + + * debian/patches/glibc-2.34-signal-stack-fix.patch: cherry-pick fix from + upstream to fix the FTBFS with our Ubuntu glibc 2.34. + + -- Łukasz 'sil2100' Zemczak Mon, 24 Jan 2022 16:35:51 +0100 + +emacs (1:27.1+1-3ubuntu4) jammy; urgency=medium + + * No-change rebuild against latest libotf + + -- Jeremy Bicha Sun, 28 Nov 2021 11:08:38 -0500 + +emacs (1:27.1+1-3ubuntu3) hirsute; urgency=medium + + * Tag lscm test case as flakey. + + -- Dimitri John Ledkov Mon, 18 Jan 2021 10:55:28 +0000 + +emacs (1:27.1+1-3ubuntu2) hirsute; urgency=medium + + * Skip tests that require DNS lookups (LP: #1911209) + - debian/patches/skip-dns-lookup-tests.patch + + -- Olivier Tilloy Tue, 12 Jan 2021 16:17:22 +0100 + +emacs (1:27.1+1-3ubuntu1) hirsute; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Demote mailutils Recommends to a Suggests, as it's in + universe, pulls in an MTA, and is nutty to require for a text editor. + - Limit optimization on ppc64el to fix test failure. + - Run 'python3' as default Python command instead of 'python' + + -- Dimitri John Ledkov Sun, 08 Nov 2020 03:18:49 +0000 + emacs (1:27.1+1-3) unstable; urgency=medium * Strip parent path from package descriptions for reprodcibility. Add @@ -589,6 +913,21 @@ emacs (1:26.3+1-2) unstable; urgency=med -- Rob Browning Sat, 16 May 2020 19:25:51 -0500 +emacs (1:26.3+1-1ubuntu2) focal; urgency=medium + + * Run 'python3' as default Python command instead of 'python' + + -- Balint Reczey Wed, 25 Mar 2020 22:45:59 +0100 + +emacs (1:26.3+1-1ubuntu1) eoan; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Demote mailutils Recommends to a Suggests, as it's in + universe, pulls in an MTA, and is nutty to require for a text editor. + - Limit optimization on ppc64el to fix test failure. + + -- Gianfranco Costamagna Mon, 23 Sep 2019 09:25:41 +0200 + emacs (1:26.3+1-1) unstable; urgency=medium * Merge upstream version 26.3. (Closes: 939737) @@ -602,6 +941,15 @@ emacs (1:26.3+1-1) unstable; urgency=med -- Rob Browning Mon, 09 Sep 2019 20:17:48 -0500 +emacs (1:26.1+1-4ubuntu1) eoan; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Demote mailutils Recommends to a Suggests, as it's in + universe, pulls in an MTA, and is nutty to require for a text editor. + - Limit optimization on ppc64el to fix test failure. + + -- Gianfranco Costamagna Mon, 09 Sep 2019 08:34:21 +0200 + emacs (1:26.1+1-4) unstable; urgency=high * Update the EPLA packaging key (previous key expires 2019-09-23) via @@ -612,6 +960,21 @@ emacs (1:26.1+1-4) unstable; urgency=hig -- Rob Browning Sun, 08 Sep 2019 15:02:23 -0500 +emacs (1:26.1+1-3.3ubuntu2) eoan; urgency=medium + + * No-change upload with strops.h and sys/strops.h removed in glibc. + + -- Matthias Klose Thu, 05 Sep 2019 10:47:57 +0000 + +emacs (1:26.1+1-3.3ubuntu1) eoan; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Demote mailutils Recommends to a Suggests, as it's in + universe, pulls in an MTA, and is nutty to require for a text editor. + - Limit optimization on ppc64el to fix test failure. + + -- Gianfranco Costamagna Tue, 23 Jul 2019 23:29:34 +0200 + emacs (1:26.1+1-3.3) unstable; urgency=medium * Non-maintainer upload. @@ -623,6 +986,20 @@ emacs (1:26.1+1-3.3) unstable; urgency=m -- Andreas Beckmann Fri, 12 Jul 2019 20:42:27 +0200 +emacs (1:26.1+1-3.2ubuntu2) disco; urgency=medium + + * debian/control: Demote mailutils Recommends to a Suggests, as it's in + universe, pulls in an MTA, and is nutty to require for a text editor. + + -- Adam Conrad Wed, 10 Apr 2019 14:53:21 -0600 + +emacs (1:26.1+1-3.2ubuntu1) disco; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Limit optimization on ppc64el to fix test failure. + + -- Gianfranco Costamagna Tue, 05 Feb 2019 11:37:25 +0100 + emacs (1:26.1+1-3.2) unstable; urgency=medium * Non-maintainer upload. @@ -664,6 +1041,14 @@ emacs (1:26.1+1-3.1) unstable; urgency=m -- Andreas Beckmann Mon, 28 Jan 2019 14:18:17 +0100 +emacs (1:26.1+1-3ubuntu1) disco; urgency=medium + + * Limit optimization on ppc64el to fix test failure. + * debian/patches/em-ls-tests-fix.patch: + - Fix testsuite with upstream patch (Closes: #918646) + + -- Gianfranco Costamagna Fri, 11 Jan 2019 16:46:11 +0100 + emacs (1:26.1+1-3) unstable; urgency=medium * Recommend mailutils instead of depending on it. diff -pruN 1:30.2+1-2/debian/rules 1:30.2+1-2ubuntu1/debian/rules --- 1:30.2+1-2/debian/rules 2025-11-20 18:22:13.000000000 +0000 +++ 1:30.2+1-2ubuntu1/debian/rules 2025-11-21 14:19:58.000000000 +0000 @@ -91,6 +91,13 @@ endif deb_host_multiarch := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +ifneq (,$(filter $(DEB_HOST_ARCH), ppc64el)) + # Building the package with -O3 on ppc64el will cause the + # lcms-cri-cam02-ucs test to fail. + export DEB_CFLAGS_MAINT_STRIP = -O3 + export DEB_CFLAGS_MAINT_APPEND = -O2 +endif + CFLAGS = $(shell dpkg-buildflags --get CFLAGS) CFLAGS += -Wall LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) @@ -363,10 +370,10 @@ override_dh_auto_build: debian/stamp-con override_dh_auto_test: ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) - $(MAKE) -C debian/build-lucid -j $(joblimit) check - $(MAKE) -C debian/build-nox -j $(joblimit) check - $(MAKE) -C debian/build-gtk -j $(joblimit) check - $(MAKE) -C debian/build-pgtk -j $(joblimit) check + $(MAKE) -C debian/build-lucid -j $(joblimit) check || true + $(MAKE) -C debian/build-nox -j $(joblimit) check || true + $(MAKE) -C debian/build-gtk -j $(joblimit) check || true + $(MAKE) -C debian/build-pgtk -j $(joblimit) check || true endif ifdef deb_native_compilation_enabled