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

diff --cc debian/.git-dpm
index c5c13c74196d379377a8f75af7a20d3478d2d28f,0000000000000000000000000000000000000000..3d573f53d900ffc2f5edaa764ac043c7d9917070
mode 100644,000000..100644
--- 1/debian/.git-dpm
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
- 2f28496d038eebe3715cbcfd1cb3981fd5a69739
- 2f28496d038eebe3715cbcfd1cb3981fd5a69739
 +# see git-dpm(1) from git-dpm package
++595617abab6964ac0c6e617bae3d82692bf298b9
++595617abab6964ac0c6e617bae3d82692bf298b9
 +279b82e64e15b5e2df3cb522636c6db85a8ee659
 +279b82e64e15b5e2df3cb522636c6db85a8ee659
 +emacs_28.2+1.orig.tar.xz
 +d7f49858bdec2d47110c2ed7b1d0005f157e20c3
 +26988304

diff --cc debian/patches/0019-Fix-copyright-tests-for-2023-onwards.patch
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..adb2cd32a71c1a20df6212183c5fbb3914f600aa
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/patches/0019-Fix-copyright-tests-for-2023-onwards.patch
@@@ -1,0 -1,0 +1,40 @@@
++From 595617abab6964ac0c6e617bae3d82692bf298b9 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Mattias=20Engdeg=C3=A5rd?= <mattiase@acm.org>
++Date: Sun, 1 Jan 2023 13:18:50 +0100
++Subject: Fix copyright tests for 2023 onwards
++
++This upstream patch has been incorporated to fix the problem:
++
++  ; * test/lisp/emacs-lisp/copyright-tests.el: Fix and future-safe.
++
++Origin: upstream, commit: da77d70deeb2798693ec4f28a291befeb8e43989
++Bug-Debian: https://bugs.debian.org/1028607
++Forwarded: not-needed
++---
++ test/lisp/emacs-lisp/copyright-tests.el | 6 ++++--
++ 1 file changed, 4 insertions(+), 2 deletions(-)
++
++diff --git a/test/lisp/emacs-lisp/copyright-tests.el b/test/lisp/emacs-lisp/copyright-tests.el
++index abb0913a0d7..040071d90d0 100644
++--- a/test/lisp/emacs-lisp/copyright-tests.el
+++++ b/test/lisp/emacs-lisp/copyright-tests.el
++@@ -59,7 +59,8 @@ test-end-chop
++                 "\nCopyright 2006, 2007, 2008 Foo Bar\n\n")
++         (copyright-update)
++         (buffer-substring (- (point-max) 42) (point-max))))
++-    "Copyright 2006, 2007, 2008, 2022 Foo Bar\n\n")))
+++    (format "Copyright 2006, 2007, 2008, %s Foo Bar\n\n"
+++            (format-time-string "%Y")))))
++ 
++ (ert-deftest test-correct-notice ()
++   (should (equal
++@@ -70,7 +71,8 @@ test-correct-notice
++                    (copyright-query nil))
++                (copyright-update))
++              (buffer-string))
++-           "Copyright 2021 FSF\nCopyright 2021, 2022 FSF\n")))
+++           (format "Copyright 2021 FSF\nCopyright 2021, %s FSF\n"
+++                   (format-time-string "%Y")))))
++ 
++ (provide 'copyright-tests)
++ ;;; copyright-tests.el ends here

diff --cc debian/patches/series
index ba0d9f6c66e17d03576681c01327e4f73949cda6,0000000000000000000000000000000000000000..a9e9fa59f3adacbcf384e8aaa07d3f12dfbb2537
mode 100644,000000..100644
--- 1/debian/patches/series
--- /dev/null
+++ b/debian/patches/series
@@@ -1,18 -1,0 +1,19 @@@
 +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-Avoid-fork-bomb-caused-by-native-compilation.patch
 +0011-Avoid-fork-bomb-caused-by-native-compilation-trampol.patch
 +0012-Fix-eln-files-not-being-generated-when-native-comp-a.patch
 +0013-Fix-large-core-dumps-from-background-processes.patch
 +0014-Mark-test-undo-region-as-unstable.patch
 +0015-Mark-flaky-test-process-tests-multiple-threads-waiti.patch
 +0016-Fix-ctags-local-command-execution-vulnerability-CVE-.patch
 +0017-Add-inhibit-native-compilation.patch
 +0018-Rename-to-inhibit-automatic-native-compilation.patch
++0019-Fix-copyright-tests-for-2023-onwards.patch