diff options
| author | David Bremner <david@tethera.net> | 2025-03-15 19:44:37 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2025-03-15 19:44:37 -0300 |
| commit | 65932712721569c0853c7ad53b310c5420cc6788 (patch) | |
| tree | 1c5345ea2e554bd728c93e0a9b956a5386f5a86f | |
| parent | a5214eabb63ba78b84f4563942de1aa8763f0914 (diff) | |
| parent | 9c767311185aca05d96d0ecf09cc9d66c7a61ce5 (diff) | |
Merge branch 'debian/unstable' into release
merge bugfix uploads from other branch
| -rw-r--r-- | debian/changelog | 14 | ||||
| -rw-r--r-- | debian/patches/debian-changes | 29 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 44 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 45c08461..ef835166 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,6 +45,20 @@ notmuch (0.39~rc0-1) experimental; urgency=medium -- David Bremner <bremner@debian.org> Sat, 22 Feb 2025 08:12:33 -0400 +notmuch (0.38.3-5) unstable; urgency=medium + + * Bug fix: "test suite regressions with fixed GnuPG", thanks to + Daniel Kahn Gillmor (Closes: #1098995). + + -- David Bremner <bremner@debian.org> Fri, 28 Feb 2025 16:24:35 -0500 + +notmuch (0.38.3-4) unstable; urgency=medium + + * Bug fix: "FTBFS: 3 tests fail against Emacs 30.1", thanks to Sean + Whitton (Closes: #1098852). Cherry-pick upstream commit e3d4721b1. + + -- David Bremner <bremner@debian.org> Tue, 25 Feb 2025 16:51:36 -0400 + notmuch (0.38.3-3) unstable; urgency=medium [ James McCoy ] diff --git a/debian/patches/debian-changes b/debian/patches/debian-changes new file mode 100644 index 00000000..44e5e3eb --- /dev/null +++ b/debian/patches/debian-changes @@ -0,0 +1,29 @@ +Description: Autogenerated patch header for a single-debian-patch file. + The delta against upstream is either kept as a single patch, or maintained + in some VCS, and exported as a single patch instead of more manageable + atomic patches. +Forwarded: not-needed + +--- +--- notmuch-0.38.3.orig/test/T350-crypto.sh ++++ notmuch-0.38.3/test/T350-crypto.sh +@@ -453,6 +453,7 @@ y + | gpg --no-tty --quiet --import + output=$(notmuch show --format=json --verify subject:"test signed message 001" \ + | notmuch_json_show_sanitize \ ++ | sed -e 's/"key-\(revoked\|missing\)"/"key-revoked"/g' \ + | sed -e 's|"created": [1234567890]*|"created": 946728000|') + expected='[[[{"id": "XXXXX", + "match": true, +--- notmuch-0.38.3.orig/test/test-lib.el ++++ notmuch-0.38.3/test/test-lib.el +@@ -33,6 +33,9 @@ + + (require 'cl-lib) + ++;; Use old pretty print algorithm, so tests don't break with Emacs 30 ++(setq-default pp-default-function 'pp-28) ++ + ;; Ensure that the dynamic variables that are defined by this library + ;; are defined by the time that we let-bind them. This is needed + ;; because starting with Emacs 27 undeclared variables in evaluated diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 00000000..7bb82529 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +debian-changes |