From a3a847e6bb5d0a0357bc5c3738af215629730cbc Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 26 Mar 2023 13:15:36 -0500 Subject: [PATCH] Adjust debian/patches for the new patch-to-news --- .../patches/0001-Prefer-usr-share-info-emacs.patch | 4 +--- ...debian-startup-and-set-debian-emacs-flavor.patch | 13 ++++--------- ...es-that-appear-to-be-incompatible-with-the.patch | 8 +------- ...Adjust-documentation-references-for-Debian.patch | 4 +--- ...-output-of-version-to-indicate-Debian-modi.patch | 6 +----- ...to-build-src-macuvs.h-via-IVD_Sequences.tx.patch | 2 +- ...g-agent-in-package-test.el-to-avoid-a-race.patch | 4 ++-- ...r-test-fauilt-bzr-autoloads-as-unstable-fo.patch | 2 ++ ...r-set-DUMP_RELOC_ALIGNMENT_BITS-1-for-m68k.patch | 1 + .../0010-Mark-test-undo-region-as-unstable.patch | 2 ++ ...-test-process-tests-multiple-threads-waiti.patch | 2 ++ .../0012-Add-inhibit-native-compilation.patch | 2 ++ ...me-to-inhibit-automatic-native-compilation.patch | 2 ++ ...ect-vc-recognizes-git-test-for-Debian-buil.patch | 2 +- ...native-comp-async-jobs-number-default-to-1.patch | 2 +- 15 files changed, 24 insertions(+), 32 deletions(-) diff --git a/debian/patches/0001-Prefer-usr-share-info-emacs.patch b/debian/patches/0001-Prefer-usr-share-info-emacs.patch index b9c0d4f7789..be34ed95bd0 100644 --- a/debian/patches/0001-Prefer-usr-share-info-emacs.patch +++ b/debian/patches/0001-Prefer-usr-share-info-emacs.patch @@ -1,9 +1,7 @@ From c0df7a07ac80a916207f4cbd7aa6ac15d0fcca35 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. +Subject: 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. diff --git a/debian/patches/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch b/debian/patches/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch index d34853d4e8e..39cb8181213 100644 --- a/debian/patches/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch +++ b/debian/patches/0002-Run-debian-startup-and-set-debian-emacs-flavor.patch @@ -1,16 +1,11 @@ From db11169aaaca4aa86c8e98685bd23eb26ffb9b89 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 +Subject: Emacs sets debian-emacs-flavor and runs debian-startup. -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 +The global variable debian-emacs-flavor is bound to 'emacs, and +debian-startup is run during the startup process unless site-run-file +is false. --- lisp/startup.el | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/debian/patches/0003-Remove-files-that-appear-to-be-incompatible-with-the.patch b/debian/patches/0003-Remove-files-that-appear-to-be-incompatible-with-the.patch index b7d6d9c7be4..2b6339f6e56 100644 --- a/debian/patches/0003-Remove-files-that-appear-to-be-incompatible-with-the.patch +++ b/debian/patches/0003-Remove-files-that-appear-to-be-incompatible-with-the.patch @@ -1,9 +1,7 @@ From 8fff656e51bc7d8ad1842fe0ba2055a0fe16bd86 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. +Subject: 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 @@ -17,10 +15,6 @@ 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 ++++++--------- diff --git a/debian/patches/0004-Adjust-documentation-references-for-Debian.patch b/debian/patches/0004-Adjust-documentation-references-for-Debian.patch index 8b6372f9856..1823799862a 100644 --- a/debian/patches/0004-Adjust-documentation-references-for-Debian.patch +++ b/debian/patches/0004-Adjust-documentation-references-for-Debian.patch @@ -1,9 +1,7 @@ From 48687a2f3c9a6c2babcd0f9b52adfc1f83a79a5c 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. +Subject: Various documentation references have been adjusted for Debian. References to /usr/local/... have been changed to /usr/... as appropriate, etc. diff --git a/debian/patches/0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch b/debian/patches/0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch index 21537ea4629..67f48bd4ce9 100644 --- a/debian/patches/0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch +++ b/debian/patches/0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch @@ -1,12 +1,8 @@ From 49ffe438944fe2a07d0ad1e71fd1b83913a3d44e 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 +Subject: The output of (version) has been modified 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/debian/patches/0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch b/debian/patches/0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch index aa442123366..664814a9507 100644 --- a/debian/patches/0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch +++ b/debian/patches/0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch @@ -1,7 +1,7 @@ From 3e290ebbf7f48d31159141dc3ff17f2ca9bff53c 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) +Subject: src/macuvs.h is not built (via IVD_Sequences.txt). These are OS X specific, and were removed for now, due to uncertainty over the licensing. diff --git a/debian/patches/0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch b/debian/patches/0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch index 5a1f8566370..09417e62a82 100644 --- a/debian/patches/0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch +++ b/debian/patches/0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch @@ -3,8 +3,6 @@ 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 @@ -15,6 +13,8 @@ package-test.el should no longer fail during clean up. * 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. + +README-Debian: package-test.el should no longer fail during clean up. --- test/lisp/emacs-lisp/package-tests.el | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/patches/0008-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch b/debian/patches/0008-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch index 0ba227afb50..bdbe98ca6cb 100644 --- a/debian/patches/0008-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch +++ b/debian/patches/0008-Mark-vc-bzr-test-fauilt-bzr-autoloads-as-unstable-fo.patch @@ -56,6 +56,8 @@ Currently the test fails like this: 1 unexpected results: FAILED vc-bzr-test-faulty-bzr-autoloads + +README-Debian: The vc-bzr-test-fauilt-bzr-autoloads test is allowed to fail. --- test/lisp/vc/vc-bzr-tests.el | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/patches/0009-pdumper-set-DUMP_RELOC_ALIGNMENT_BITS-1-for-m68k.patch b/debian/patches/0009-pdumper-set-DUMP_RELOC_ALIGNMENT_BITS-1-for-m68k.patch index cc0575d246d..1a2c478a539 100644 --- a/debian/patches/0009-pdumper-set-DUMP_RELOC_ALIGNMENT_BITS-1-for-m68k.patch +++ b/debian/patches/0009-pdumper-set-DUMP_RELOC_ALIGNMENT_BITS-1-for-m68k.patch @@ -25,6 +25,7 @@ Origin: debian Bug: https://bugs.gnu.org/44531 Bug-Debian: http://bugs.debian.org/1019130 Forwarded: not-needed +README-Debian: pdumper is built with DUMP_RELOC_ALIGNMENT_BITS=1 for m68k. --- src/pdumper.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/patches/0010-Mark-test-undo-region-as-unstable.patch b/debian/patches/0010-Mark-test-undo-region-as-unstable.patch index 94cb3607554..c9440f13837 100644 --- a/debian/patches/0010-Mark-test-undo-region-as-unstable.patch +++ b/debian/patches/0010-Mark-test-undo-region-as-unstable.patch @@ -30,6 +30,8 @@ seemingly nowhere else: (= 3 2) :value nil)) FAILED 41/44 test-undo-region (0.000185 sec) + +README-Debian: The test-undo-region test is allowed to fail. --- test/lisp/simple-tests.el | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/patches/0011-Mark-flaky-test-process-tests-multiple-threads-waiti.patch b/debian/patches/0011-Mark-flaky-test-process-tests-multiple-threads-waiti.patch index c61627465b3..494941bbbcc 100644 --- a/debian/patches/0011-Mark-flaky-test-process-tests-multiple-threads-waiti.patch +++ b/debian/patches/0011-Mark-flaky-test-process-tests-multiple-threads-waiti.patch @@ -27,6 +27,8 @@ It times out: 1 files did not finish: src/process-tests.log make[4]: *** [Makefile:336: check-doit] Error 2 + +README-Debian: The process-tests/multiple-threads-waiting test is allowed to fail. --- test/src/process-tests.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/patches/0012-Add-inhibit-native-compilation.patch b/debian/patches/0012-Add-inhibit-native-compilation.patch index ee892860236..b3f17b31b2f 100644 --- a/debian/patches/0012-Add-inhibit-native-compilation.patch +++ b/debian/patches/0012-Add-inhibit-native-compilation.patch @@ -22,6 +22,8 @@ The following upstream patch has been backported: Origin: upstream, commit: 5fec9182dbeffa88cef6651d8c798ef9665d6681 Forwarded: not-needed +README-Debian: The inhibit-native-compilation variable has been added. + Backported from upstream. --- lisp/emacs-lisp/comp.el | 47 +++++++++++++++++++----------------- lisp/progmodes/elisp-mode.el | 2 +- diff --git a/debian/patches/0013-Rename-to-inhibit-automatic-native-compilation.patch b/debian/patches/0013-Rename-to-inhibit-automatic-native-compilation.patch index 794c82e47ff..2495b88e577 100644 --- a/debian/patches/0013-Rename-to-inhibit-automatic-native-compilation.patch +++ b/debian/patches/0013-Rename-to-inhibit-automatic-native-compilation.patch @@ -17,6 +17,8 @@ The following upstream patch has been backported: Origin: upstream, commit f97993ee667f9be7589825f3a4fbc095d6944ec6 Forwarded: not-needed +README-Debian: inhibit-native-compilation has been renamed to inhibit-automatic-native-compilation. + Matching the upstream change. --- lisp/emacs-lisp/comp.el | 2 +- lisp/progmodes/elisp-mode.el | 4 ++-- diff --git a/debian/patches/0014-Patch-project-vc-recognizes-git-test-for-Debian-buil.patch b/debian/patches/0014-Patch-project-vc-recognizes-git-test-for-Debian-buil.patch index 8b3c156a0cf..95f2cd94f76 100644 --- a/debian/patches/0014-Patch-project-vc-recognizes-git-test-for-Debian-buil.patch +++ b/debian/patches/0014-Patch-project-vc-recognizes-git-test-for-Debian-buil.patch @@ -1,7 +1,7 @@ From 203201f1f29e74ba00a27f1b16cfb2d12d32468c 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 +Subject: The project-vc-recognizes-git test has been adjusted for Debian builds --- test/lisp/progmodes/project-tests.el | 2 +- diff --git a/debian/patches/0015-Change-native-comp-async-jobs-number-default-to-1.patch b/debian/patches/0015-Change-native-comp-async-jobs-number-default-to-1.patch index 0a5bdc16638..bef37250c23 100644 --- a/debian/patches/0015-Change-native-comp-async-jobs-number-default-to-1.patch +++ b/debian/patches/0015-Change-native-comp-async-jobs-number-default-to-1.patch @@ -1,7 +1,7 @@ From 26155f0997470d4ac10b0295ed5c1c16e070734a 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 +Subject: The native-comp-async-jobs-number default has been set to 1 --- lisp/emacs-lisp/comp.el | 2 +- -- 2.30.2