From: Nicholas D Steeves <nsteeves@gmail.com>
To: notmuch@notmuchmail.org
Cc: James McCoy <jamessan@debian.org>
Subject: [PATCH 1/4] Convert notmuch-vim to Vim addon policy 2.0
Date: Sat, 3 Aug 2024 14:56:06 -0400 [thread overview]
Message-ID: <20240803185609.2020351-2-sten@debian.org> (raw)
In-Reply-To: <20240803185609.2020351-1-sten@debian.org>
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
next prev parent reply other threads:[~2024-08-03 18:56 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-03 18:56 [PATCH 0/4] Bug fixes for Debian packaging Nicholas D Steeves
2024-08-03 18:56 ` Nicholas D Steeves [this message]
2024-08-03 18:56 ` [PATCH 2/4] Add changelog entry for James McCoy's work Nicholas D Steeves
2024-08-03 18:56 ` [PATCH 3/4] Allow neomutt to fulfill the "mutt" requirement of notmuch-mutt, and Nicholas D Steeves
2024-08-03 18:56 ` [PATCH 4/4] Add Astroid as an alternative Recommends; this one is a GUI client Nicholas D Steeves
2024-08-05 13:33 ` [PATCH 0/4] Bug fixes for Debian packaging David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240803185609.2020351-2-sten@debian.org \
--to=nsteeves@gmail.com \
--cc=jamessan@debian.org \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).