* [PATCH 1/3] Add Astroid as an alternative Recommends; this one is a GUI client… @ 2024-08-02 21:10 Nicholas D Steeves 2024-08-02 21:10 ` [PATCH 2/3] Allow neomutt to fulfill the "mutt" requirement of notmuch-mutt… Nicholas D Steeves ` (2 more replies) 0 siblings, 3 replies; 6+ messages in thread From: Nicholas D Steeves @ 2024-08-02 21:10 UTC (permalink / raw) To: notmuch; +Cc: Nicholas D Steeves that may be less intimidating for new users. --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 72a52546..442e22ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +notmuch (0.29.1-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 <sten@debian.org> Fri, 02 Aug 2024 16:37:20 -0400 + notmuch (0.29.1-2) unstable; urgency=medium * Re-upload to unstable diff --git a/debian/control b/debian/control index 31d6471c..0494b3c1 100644 --- a/debian/control +++ b/debian/control @@ -37,7 +37,7 @@ Vcs-Browser: https://git.notmuchmail.org/git/notmuch Package: notmuch Architecture: any Depends: libnotmuch5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Recommends: elpa-notmuch | notmuch-vim | notmuch-mutt | alot, gnupg-agent, gpgsm +Recommends: elpa-notmuch | notmuch-vim | notmuch-mutt | alot | astroid, gnupg-agent, gpgsm Description: thread-based email index, search and tagging Notmuch is a system for indexing, searching, reading, and tagging large collections of email messages in maildir or mh format. It uses -- 2.39.2 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] Allow neomutt to fulfill the "mutt" requirement of notmuch-mutt… 2024-08-02 21:10 [PATCH 1/3] Add Astroid as an alternative Recommends; this one is a GUI client… Nicholas D Steeves @ 2024-08-02 21:10 ` Nicholas D Steeves 2024-08-02 21:10 ` [PATCH 3/3] Convert notmuch-vim to Vim addon policy 2.0 Nicholas D Steeves 2024-08-03 18:00 ` [PATCH 1/3] Add Astroid as an alternative Recommends; this one is a GUI client… David Bremner 2 siblings, 0 replies; 6+ messages in thread From: Nicholas D Steeves @ 2024-08-02 21:10 UTC (permalink / raw) To: notmuch; +Cc: Nicholas D Steeves and add related Enhances (Closes: #1029190). --- debian/changelog | 2 ++ debian/control | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 442e22ed..b0858734 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ notmuch (0.29.1-3) UNRELEASED; urgency=medium * Add Astroid as an alternative Recommends; this one is a GUI client that may be less intimidating for new users. + * Allow neomutt to fulfill the "mutt" requirement of notmuch-mutt, and add + related Enhances (Closes: #1029190). -- Nicholas D Steeves <sten@debian.org> Fri, 02 Aug 2024 16:37:20 -0400 diff --git a/debian/control b/debian/control index 0494b3c1..bd5ced64 100644 --- a/debian/control +++ b/debian/control @@ -153,8 +153,8 @@ Depends: libmail-box-perl, libmailtools-perl, libstring-shellquote-perl, libterm-readline-gnu-perl, ${misc:Depends} -Recommends: mutt -Enhances: notmuch, mutt +Recommends: mutt | neomutt +Enhances: notmuch, mutt, neomutt Description: thread-based email index, search and tagging (Mutt interface) notmuch-mutt provides integration among the Mutt mail user agent and the Notmuch mail indexer. -- 2.39.2 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] Convert notmuch-vim to Vim addon policy 2.0 2024-08-02 21:10 [PATCH 1/3] Add Astroid as an alternative Recommends; this one is a GUI client… Nicholas D Steeves 2024-08-02 21:10 ` [PATCH 2/3] Allow neomutt to fulfill the "mutt" requirement of notmuch-mutt… Nicholas D Steeves @ 2024-08-02 21:10 ` Nicholas D Steeves 2024-08-03 18:00 ` [PATCH 1/3] Add Astroid as an alternative Recommends; this one is a GUI client… David Bremner 2 siblings, 0 replies; 6+ messages in thread From: Nicholas D Steeves @ 2024-08-02 21:10 UTC (permalink / raw) To: notmuch; +Cc: Nicholas D Steeves, James McCoy 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> Reviewed-by: Nicholas D Steeves <sten@debian.org> --- debian/changelog | 11 +++++++++++ debian/control | 3 ++- debian/notmuch-vim.install | 5 +---- debian/notmuch-vim.neovim-addon | 1 + debian/notmuch-vim.vim-addon | 1 + debian/rules | 1 + 6 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 debian/notmuch-vim.neovim-addon create mode 100644 debian/notmuch-vim.vim-addon diff --git a/debian/changelog b/debian/changelog index b0858734..f3db599c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,16 @@ notmuch (0.29.1-3) UNRELEASED; urgency=medium + [ James McCoy and Nicholas D Steeves ] + * Convert notmuch-vim to Vim addon policy 2.0 (Closes: #1015936). + * 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. + + [ Nicholas D Steeves ] * Add Astroid as an alternative Recommends; this one is a GUI client that may be less intimidating for new users. * Allow neomutt to fulfill the "mutt" requirement of notmuch-mutt, and add diff --git a/debian/control b/debian/control index bd5ced64..3e8c3afc 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,7 @@ Build-Depends: python3-all (>= 3.1.2-7~), dh-python, dh-elpa (>= 1.3), + dh-sequence-vim-addon, python3-sphinx, ruby, ruby-dev (>>1:1.9.3~), emacs-nox | emacs-gtk | emacs-lucid | @@ -135,7 +136,7 @@ Package: notmuch-vim Architecture: all Breaks: notmuch (<<0.6~254~) Replaces: notmuch (<<0.6~254~) -Depends: ${misc:Depends}, notmuch, vim-addon-manager, vim-ruby, ruby-notmuch +Depends: ${misc:Depends}, notmuch, ${vim-addon:Depends}, vim-ruby, ruby-notmuch Recommends: ruby-mail Description: thread-based email index, search and tagging (vim interface) Notmuch is a system for indexing, searching, reading, and tagging diff --git a/debian/notmuch-vim.install b/debian/notmuch-vim.install index a1af708d..08096d37 100644 --- a/debian/notmuch-vim.install +++ b/debian/notmuch-vim.install @@ -1,4 +1 @@ -vim/notmuch.vim usr/share/vim/addons/plugin -vim/notmuch.txt usr/share/vim/addons/doc -vim/syntax/notmuch-*.vim usr/share/vim/addons/syntax -vim/notmuch.yaml usr/share/vim/registry +/usr/share/notmuch-vim diff --git a/debian/notmuch-vim.neovim-addon b/debian/notmuch-vim.neovim-addon new file mode 100644 index 00000000..a046e2b9 --- /dev/null +++ b/debian/notmuch-vim.neovim-addon @@ -0,0 +1 @@ +notmuch-vim.vim-addon 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 d056edb6..8a929570 100755 --- a/debian/rules +++ b/debian/rules @@ -33,4 +33,5 @@ override_dh_auto_install: dh_auto_install --sourcedirectory bindings/python cd bindings/python && $(python3_all) setup.py install --install-layout=deb --root=$(CURDIR)/debian/tmp $(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 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] Add Astroid as an alternative Recommends; this one is a GUI client… 2024-08-02 21:10 [PATCH 1/3] Add Astroid as an alternative Recommends; this one is a GUI client… Nicholas D Steeves 2024-08-02 21:10 ` [PATCH 2/3] Allow neomutt to fulfill the "mutt" requirement of notmuch-mutt… Nicholas D Steeves 2024-08-02 21:10 ` [PATCH 3/3] Convert notmuch-vim to Vim addon policy 2.0 Nicholas D Steeves @ 2024-08-03 18:00 ` David Bremner 2024-08-03 18:27 ` Nicholas D Steeves 2 siblings, 1 reply; 6+ messages in thread From: David Bremner @ 2024-08-03 18:00 UTC (permalink / raw) To: Nicholas D Steeves, notmuch; +Cc: Nicholas D Steeves Nicholas D Steeves <nsteeves@gmail.com> writes: > that may be less intimidating for new users. > --- > debian/changelog | 7 +++++++ > debian/control | 2 +- > 2 files changed, 8 insertions(+), 1 deletion(-) > > diff --git a/debian/changelog b/debian/changelog > index 72a52546..442e22ed 100644 > --- a/debian/changelog > +++ b/debian/changelog > @@ -1,3 +1,10 @@ > +notmuch (0.29.1-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 <sten@debian.org> Fri, 02 Aug 2024 16:37:20 -0400 > + Hi Nicholas; Thanks for the patches. Unfortunately they are against 5 year old version of notmuch and don't apply. On debian you can try $ debcheckout notmuch For debian only stuff, patches against the release branch (default) are fine. Cheers, d ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] Add Astroid as an alternative Recommends; this one is a GUI client… 2024-08-03 18:00 ` [PATCH 1/3] Add Astroid as an alternative Recommends; this one is a GUI client… David Bremner @ 2024-08-03 18:27 ` Nicholas D Steeves 2024-08-04 9:28 ` David Bremner 0 siblings, 1 reply; 6+ messages in thread From: Nicholas D Steeves @ 2024-08-03 18:27 UTC (permalink / raw) To: notmuch [-- Attachment #1.1: Type: text/plain, Size: 905 bytes --] David Bremner <david@tethera.net> writes: > Hi Nicholas; > > Thanks for the patches. You're welcome. > Unfortunately they are against 5 year old version of notmuch and don't > apply. Oh no. > On debian you can try > > $ debcheckout notmuch > > For debian only stuff, patches against the release branch (default) are > fine. > > Cheers, > > d I have an old clone from https://git.notmuchmail.org/git/notmuch; and I track two branches: debian/unstable and release. I made sure both were up to date. The presence of debian/unstable usually indicates DEP14 layout, and I noticed all the other debian/codename remote branches... Yup, I didn't inspect things beyond that, and it seemed like master was the upstream devel branch and that release was the upstream release branch. Ah well, rebasing now (and checking again if BTS patches apply cleanly). I'll send a new patch series soon. Cheers, Nick [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 861 bytes --] [-- Attachment #2: Type: text/plain, Size: 0 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] Add Astroid as an alternative Recommends; this one is a GUI client… 2024-08-03 18:27 ` Nicholas D Steeves @ 2024-08-04 9:28 ` David Bremner 0 siblings, 0 replies; 6+ messages in thread From: David Bremner @ 2024-08-04 9:28 UTC (permalink / raw) To: Nicholas D Steeves, notmuch Nicholas D Steeves <nsteeves@gmail.com> writes: > > I have an old clone from https://git.notmuchmail.org/git/notmuch; and I > track two branches: debian/unstable and release. I made sure both were > up to date. The presence of debian/unstable usually indicates DEP14 > layout, and I noticed all the other debian/codename remote branches... > Sorry, I'm not much for following DEP** even in Debian specific repos (which this one is not). Anyway, thanks for resending the patches, I'll try to have a look today. d ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-08-04 9:28 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-08-02 21:10 [PATCH 1/3] Add Astroid as an alternative Recommends; this one is a GUI client… Nicholas D Steeves 2024-08-02 21:10 ` [PATCH 2/3] Allow neomutt to fulfill the "mutt" requirement of notmuch-mutt… Nicholas D Steeves 2024-08-02 21:10 ` [PATCH 3/3] Convert notmuch-vim to Vim addon policy 2.0 Nicholas D Steeves 2024-08-03 18:00 ` [PATCH 1/3] Add Astroid as an alternative Recommends; this one is a GUI client… David Bremner 2024-08-03 18:27 ` Nicholas D Steeves 2024-08-04 9:28 ` David Bremner
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).