diff options
| author | James McCoy <jamessan@debian.org> | 2024-08-03 14:56:06 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2024-08-05 06:59:43 -0300 |
| commit | 0aac2ae67e41bc88a359b619402ef2803b4dd0ac (patch) | |
| tree | 98f7940007d903f31bd80497d61a85f7f8c46826 /debian | |
| parent | 5a3e90d02ff6e462fc5a3f9c0b5ac354d89b20ad (diff) | |
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 <jamessan@debian.org>
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 3 | ||||
| -rw-r--r-- | debian/notmuch-vim.dirs | 4 | ||||
| -rw-r--r-- | debian/notmuch-vim.install | 5 | ||||
| l--------- | debian/notmuch-vim.neovim-addon | 1 | ||||
| -rw-r--r-- | debian/notmuch-vim.vim-addon | 1 | ||||
| -rwxr-xr-x | debian/rules | 1 |
6 files changed, 6 insertions, 9 deletions
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 |