From 5a3e90d02ff6e462fc5a3f9c0b5ac354d89b20ad Mon Sep 17 00:00:00 2001 From: David Bremner Date: Fri, 26 Jul 2024 12:01:38 +0900 Subject: [PATCH 1/8] changelog for 0.38.3-2 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1177f085..a2ef9b70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +notmuch (0.38.3-2) unstable; urgency=medium + + * No change upload to rebuild with dh-elpa 2.1.5 + + -- David Bremner Fri, 26 Jul 2024 11:59:41 +0900 + notmuch (0.38.3-1) unstable; urgency=medium * New upstream bugfix release From 0aac2ae67e41bc88a359b619402ef2803b4dd0ac Mon Sep 17 00:00:00 2001 From: James McCoy Date: Sat, 3 Aug 2024 14:56:06 -0400 Subject: [PATCH 2/8] Convert notmuch-vim to Vim addon policy 2.0 The new Vim addon policy relies on Vim's native package functionality, rather than the Debian-specific vim-addons tool. This allows the addon to be immediately available when the package is installed, rather than requiring extra setup by the user. * Install notmuch-vim to its own /usr/share/notmuch-vim directory, so the files are self-contained. * Remove vim-addon-manager from notmuch-vim Depends * Add ${vim-addon:Depends} to notmuch-vim Depends to ensure it has the required relationships on Vim/Neovim. * Build-Depend on dh-sequence-vim-addon to automatically setup the required symlinks for Vim and Neovim to see the addon. Signed-off-by: James McCoy --- debian/control | 3 ++- debian/notmuch-vim.dirs | 4 ---- debian/notmuch-vim.install | 5 +---- debian/notmuch-vim.neovim-addon | 1 + debian/notmuch-vim.vim-addon | 1 + debian/rules | 1 + 6 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 debian/notmuch-vim.dirs create mode 120000 debian/notmuch-vim.neovim-addon create mode 100644 debian/notmuch-vim.vim-addon diff --git a/debian/control b/debian/control index 4fded909..77096b85 100644 --- a/debian/control +++ b/debian/control @@ -14,6 +14,7 @@ Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13), dh-elpa (>= 1.3), dh-python, + dh-sequence-vim-addon, desktop-file-utils, doxygen, dpkg-dev (>= 1.17.14), @@ -211,9 +212,9 @@ Replaces: Depends: notmuch, ruby-notmuch, - vim-addon-manager, vim-ruby, ${misc:Depends}, + ${vim-addon:Depends}, Recommends: ruby-mail, Description: thread-based email index, search and tagging (vim interface) diff --git a/debian/notmuch-vim.dirs b/debian/notmuch-vim.dirs deleted file mode 100644 index 2b531314..00000000 --- a/debian/notmuch-vim.dirs +++ /dev/null @@ -1,4 +0,0 @@ -usr/share/vim/addons/doc -usr/share/vim/addons/plugin -usr/share/vim/addons/syntax -usr/share/vim/registry diff --git a/debian/notmuch-vim.install b/debian/notmuch-vim.install index cf898738..08096d37 100644 --- a/debian/notmuch-vim.install +++ b/debian/notmuch-vim.install @@ -1,4 +1 @@ -vim/notmuch.txt usr/share/vim/addons/doc -vim/notmuch.vim usr/share/vim/addons/plugin -vim/notmuch.yaml usr/share/vim/registry -vim/syntax/notmuch-*.vim usr/share/vim/addons/syntax +/usr/share/notmuch-vim diff --git a/debian/notmuch-vim.neovim-addon b/debian/notmuch-vim.neovim-addon new file mode 120000 index 00000000..a576db7c --- /dev/null +++ b/debian/notmuch-vim.neovim-addon @@ -0,0 +1 @@ +notmuch-vim.vim-addon \ No newline at end of file diff --git a/debian/notmuch-vim.vim-addon b/debian/notmuch-vim.vim-addon new file mode 100644 index 00000000..9c23ba18 --- /dev/null +++ b/debian/notmuch-vim.vim-addon @@ -0,0 +1 @@ +/usr/share/notmuch-vim notmuch diff --git a/debian/rules b/debian/rules index a77ffa15..ecf09abc 100755 --- a/debian/rules +++ b/debian/rules @@ -37,4 +37,5 @@ override_dh_auto_install: PYBUILD_NAME=notmuch dh_auto_install --buildsystem=pybuild --sourcedirectory bindings/python PYBUILD_NAME=notmuch2 dh_auto_install --buildsystem=pybuild --sourcedirectory bindings/python-cffi $(MAKE) -C contrib/notmuch-mutt DESTDIR=$(CURDIR)/debian/tmp install + $(MAKE) -C vim prefix=/usr/share/notmuch-vim DESTDIR=$(CURDIR)/debian/tmp install dh_auto_install --sourcedirectory bindings/ruby From 551e1ed6880263ed3693159ed04aaa45213a338b Mon Sep 17 00:00:00 2001 From: Nicholas D Steeves Date: Sat, 3 Aug 2024 14:56:07 -0400 Subject: [PATCH 3/8] Add changelog entry for James McCoy's work --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index a2ef9b70..4843006c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +notmuch (0.38.3-3) UNRELEASED; urgency=medium + + [ James McCoy ] + * Convert notmuch-vim to Vim addon policy 2.0 (Closes: #1015936). + + -- Nicholas D Steeves Sat, 03 Aug 2024 14:33:27 -0400 + notmuch (0.38.3-2) unstable; urgency=medium * No change upload to rebuild with dh-elpa 2.1.5 From fd539928c46b253b3a4e1759d1f5f3bbb2ac84e9 Mon Sep 17 00:00:00 2001 From: Nicholas D Steeves Date: Sat, 3 Aug 2024 14:56:08 -0400 Subject: [PATCH 4/8] Allow neomutt to fulfill the "mutt" requirement of notmuch-mutt, and add related Enhances (Closes: #1029190). --- debian/changelog | 3 +++ debian/control | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4843006c..385d4776 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ notmuch (0.38.3-3) UNRELEASED; urgency=medium [ James McCoy ] * Convert notmuch-vim to Vim addon policy 2.0 (Closes: #1015936). + [ Nicholas D Steeves ] + * Allow neomutt to fulfill the "mutt" requirement of notmuch-mutt, and add + related Enhances (Closes: #1029190). -- Nicholas D Steeves Sat, 03 Aug 2024 14:33:27 -0400 notmuch (0.38.3-2) unstable; urgency=medium diff --git a/debian/control b/debian/control index 77096b85..d07cedea 100644 --- a/debian/control +++ b/debian/control @@ -236,9 +236,10 @@ Depends: ${misc:Depends}, ${perl:Depends}, Recommends: - mutt, + mutt | neomutt, Enhances: mutt, + neomutt, notmuch, Description: thread-based email index, search and tagging (Mutt interface) notmuch-mutt provides integration among the Mutt mail user agent and From a39747c38a49db84d184c7e6c8504ff172088f51 Mon Sep 17 00:00:00 2001 From: Nicholas D Steeves Date: Sat, 3 Aug 2024 14:56:09 -0400 Subject: [PATCH 5/8] Add Astroid as an alternative Recommends; this one is a GUI client that may be less intimidating for new users. --- debian/changelog | 3 +++ debian/control | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 385d4776..9974209a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ notmuch (0.38.3-3) UNRELEASED; urgency=medium [ Nicholas D Steeves ] * Allow neomutt to fulfill the "mutt" requirement of notmuch-mutt, and add related Enhances (Closes: #1029190). + * Add Astroid as an alternative Recommends; this one is a GUI client that + may be less intimidating for new users. + -- Nicholas D Steeves Sat, 03 Aug 2024 14:33:27 -0400 notmuch (0.38.3-2) unstable; urgency=medium diff --git a/debian/control b/debian/control index d07cedea..b3547dff 100644 --- a/debian/control +++ b/debian/control @@ -55,7 +55,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, Recommends: - elpa-notmuch | notmuch-vim | notmuch-mutt | alot, + elpa-notmuch | notmuch-vim | notmuch-mutt | alot | astroid, gpg-agent, gpgsm, Suggests: From d42e9bc3c924b8ae41c921f7a5445b25bb5dd57b Mon Sep 17 00:00:00 2001 From: David Bremner Date: Mon, 5 Aug 2024 07:03:07 -0300 Subject: [PATCH 6/8] debian: drop build conflicts on gdb-minimal Recent gdb Provides gdb-minimal, so we can't conflict with it and require gdb. This may cause problems for people building in dirty environments for older gdb, but there is not much we can do. --- debian/changelog | 6 +++++- debian/control | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9974209a..6d605fbe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,7 +9,11 @@ notmuch (0.38.3-3) UNRELEASED; urgency=medium * Add Astroid as an alternative Recommends; this one is a GUI client that may be less intimidating for new users. - -- Nicholas D Steeves Sat, 03 Aug 2024 14:33:27 -0400 + [ David Bremner ] + * remove "Build-Conflicts: gdb-minimal", thanks to Jeremy Bícha (Closes: + #1077911). + + -- David Bremner Mon, 05 Aug 2024 07:02:47 -0300 notmuch (0.38.3-2) unstable; urgency=medium diff --git a/debian/control b/debian/control index b3547dff..4dc525c1 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,6 @@ Uploaders: David Bremner , Build-Conflicts: gdb [ia64 mips mips64el hppa], - gdb-minimal, ruby1.8, Build-Depends: dpkg-dev (>= 1.22.5), bash-completion (>=1.9.0~), From a7052376d3cbac52f726a3615a3201bac9a086c2 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Mon, 5 Aug 2024 08:48:24 -0300 Subject: [PATCH 7/8] debian: skip T810-tsan everywhere Not sure whose fault the failure is, but for now skip the test. --- debian/changelog | 6 ++++-- debian/rules | 4 +--- debian/tests/control | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6d605fbe..1bd26a1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -notmuch (0.38.3-3) UNRELEASED; urgency=medium +notmuch (0.38.3-3) unstable; urgency=medium [ James McCoy ] * Convert notmuch-vim to Vim addon policy 2.0 (Closes: #1015936). @@ -12,8 +12,10 @@ notmuch (0.38.3-3) UNRELEASED; urgency=medium [ David Bremner ] * remove "Build-Conflicts: gdb-minimal", thanks to Jeremy Bícha (Closes: #1077911). + * skip test T810-tsan everywhere, as it seems broken by the latest glib + (Closes: #1077910). Thanks to Jeremy Bícha for the report - -- David Bremner Mon, 05 Aug 2024 07:02:47 -0300 + -- David Bremner Mon, 05 Aug 2024 08:48:01 -0300 notmuch (0.38.3-2) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index ecf09abc..41f70298 100755 --- a/debian/rules +++ b/debian/rules @@ -1,9 +1,7 @@ #!/usr/bin/make -f include /usr/share/dpkg/architecture.mk -ifeq ($(DEB_HOST_ARCH),ppc64el) - export NOTMUCH_SKIP_TESTS = T810-tsan -endif +export NOTMUCH_SKIP_TESTS = T810-tsan export DEB_BUILD_MAINT_OPTIONS = hardening=+all diff --git a/debian/tests/control b/debian/tests/control index 80be1deb..11aebad9 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -1,7 +1,7 @@ Test-command: env NOTMUCH_TEST_INSTALLED=1 TERM=dumb NOTMUCH_HAVE_MAN=1 NOTMUCH_HAVE_SFSEXP=1 NOTMUCH_HAVE_XAPIAN_DB_RETRY_LOCK=1 NOTMUCH_HAVE_PYTHON3_CFFI=1 NOTMUCH_HAVE_PYTHON3_PYTEST=1 - NOTMUCH_HAVE_ASAN=1 NOTMUCH_HAVE_TSAN=1 + NOTMUCH_HAVE_ASAN=1 NOTMUCH_HAVE_TSAN=1 NOTMUCH_SKIP_TESTS=T810-tsan ./test/notmuch-test Restrictions: allow-stderr Architecture: amd64, arm64 From 85c1dbded05dc182b131e5ad798e5956dc6eb359 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Mon, 5 Aug 2024 10:14:40 -0300 Subject: [PATCH 8/8] debian: migrate build dependency to pkgconf pkgconf is apparently the annointed successor to pkg-config, at least in Debian. --- debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1bd26a1e..3a792518 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,8 +14,9 @@ notmuch (0.38.3-3) unstable; urgency=medium #1077911). * skip test T810-tsan everywhere, as it seems broken by the latest glib (Closes: #1077910). Thanks to Jeremy Bícha for the report + * Replace build-dependency on pkg-config with pkgconf - -- David Bremner Mon, 05 Aug 2024 08:48:01 -0300 + -- David Bremner Mon, 05 Aug 2024 10:13:01 -0300 notmuch (0.38.3-2) unstable; urgency=medium diff --git a/debian/control b/debian/control index 4dc525c1..08e3c7f3 100644 --- a/debian/control +++ b/debian/control @@ -30,7 +30,7 @@ Build-Depends: dpkg-dev (>= 1.22.5), libtalloc-dev, libxapian-dev, libz-dev, - pkg-config, + pkgconf, python3, python3-cffi, python3-pytest,