[PATCH 0/4] Bug fixes for Debian packaging

[PATCH 0/4] Bug fixes for Debian packaging

[Nicholas D Steeves]

James McCoy (1):
  Convert notmuch-vim to Vim addon policy 2.0

Nicholas D Steeves (3):
  Add changelog entry for James McCoy's work
  Allow neomutt to fulfill the "mutt" requirement of notmuch-mutt, and
  Add Astroid as an alternative Recommends; this one is a GUI client

 debian/changelog                | 13 +++++++++++++
 debian/control                  |  8 +++++---
 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 +
 7 files changed, 22 insertions(+), 11 deletions(-)
 delete mode 100644 debian/notmuch-vim.dirs
 create mode 120000 debian/notmuch-vim.neovim-addon
 create mode 100644 debian/notmuch-vim.vim-addon

-- 
2.39.2

[PATCH 1/4] Convert notmuch-vim to Vim addon policy 2.0

[Nicholas D Steeves]

From: James McCoy <jamessan@debian.org>

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 <jamessan@debian.org>
---
 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
-- 
2.39.2

[PATCH 2/4] Add changelog entry for James McCoy's work

[Nicholas D Steeves]

---
 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 <sten@debian.org>  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
-- 
2.39.2

[PATCH 3/4] Allow neomutt to fulfill the "mutt" requirement of notmuch-mutt, and

[Nicholas D Steeves]

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 <sten@debian.org>  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
-- 
2.39.2

[PATCH 4/4] Add Astroid as an alternative Recommends; this one is a GUI client

[Nicholas D Steeves]

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 <sten@debian.org>  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:
-- 
2.39.2

Re: [PATCH 0/4] Bug fixes for Debian packaging

[David Bremner]

Nicholas D Steeves <nsteeves@gmail.com> writes:

> James McCoy (1):
>   Convert notmuch-vim to Vim addon policy 2.0
>
> Nicholas D Steeves (3):
>   Add changelog entry for James McCoy's work
>   Allow neomutt to fulfill the "mutt" requirement of notmuch-mutt, and
>   Add Astroid as an alternative Recommends; this one is a GU

Series applied to release branch and uploaded to Debian unstable