[PATCH 1/3] debian: suggest elpa-mailscripts

[PATCH 1/3] debian: suggest elpa-mailscripts

[David Bremner]

These contain some useful functions for notmuch users, mainly wrappers
for scripts from mailscripts.
---
 debian/changelog | 8 ++++++++
 debian/control   | 1 +
 2 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c645dd12..41e036e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+notmuch (0.31~rc2-1) experimental; urgency=medium
+
+  * New upstream release candidate
+  * Bug fix: "suggest elpa-mailscripts", thanks to Sean Whitton (Closes:
+    #944269).
+
+ -- David Bremner <bremner@debian.org>  Tue, 25 Aug 2020 07:36:00 -0300
+
 notmuch (0.31~rc1-1) experimental; urgency=medium
 
   * Fix buggy test in T562-lib-database
diff --git a/debian/control b/debian/control
index e2bb166f..6e5a2750 100644
--- a/debian/control
+++ b/debian/control
@@ -160,6 +160,7 @@ Architecture: all
 Depends:
  ${elpa:Depends},
  ${misc:Depends},
+Suggests: elpa-mailscripts
 Description: thread-based email index, search and tagging (emacs interface)
  Notmuch is a system for indexing, searching, reading, and tagging
  large collections of email messages in maildir or mh format. It uses
-- 
2.28.0

[PATCH 2/3] debian: suggest mailscripts

[David Bremner]

These contain several useful tools for the notmuch user, particularly
on Debian.
---
 debian/changelog | 4 +++-
 debian/control   | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 41e036e7..b2da56c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ notmuch (0.31~rc2-1) experimental; urgency=medium
   * New upstream release candidate
   * Bug fix: "suggest elpa-mailscripts", thanks to Sean Whitton (Closes:
     #944269).
+  * Bug fix: "suggest mailscripts", thanks to Sean Whitton (Closes:
+    #944270).
 
- -- David Bremner <bremner@debian.org>  Tue, 25 Aug 2020 07:36:00 -0300
+ -- David Bremner <bremner@debian.org>  Tue, 25 Aug 2020 07:37:30 -0300
 
 notmuch (0.31~rc1-1) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index 6e5a2750..7cbe9508 100644
--- a/debian/control
+++ b/debian/control
@@ -53,6 +53,8 @@ Recommends:
  elpa-notmuch | notmuch-vim | notmuch-mutt | alot,
  gnupg-agent,
  gpgsm,
+Suggests:
+ mailscripts
 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.28.0

[PATCH 3/3] debian: drop notmuch-emacs dependency package

[David Bremner]

elpa-notmuch is now present in oldstable, and we don't need to support
direct upgrades from older releases than that.
---
 debian/changelog | 4 +++-
 debian/control   | 9 ---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b2da56c5..b800e361 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ notmuch (0.31~rc2-1) experimental; urgency=medium
     #944269).
   * Bug fix: "suggest mailscripts", thanks to Sean Whitton (Closes:
     #944270).
+  * Bug fix: "please drop transitional package notmuch-emacs from
+    src:notmuch", thanks to Holger Levsen (Closes: #940738).
 
- -- David Bremner <bremner@debian.org>  Tue, 25 Aug 2020 07:37:30 -0300
+ -- David Bremner <bremner@debian.org>  Tue, 25 Aug 2020 07:51:33 -0300
 
 notmuch (0.31~rc1-1) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index 7cbe9508..75359bc4 100644
--- a/debian/control
+++ b/debian/control
@@ -148,15 +148,6 @@ Description: Ruby interface to the notmuch mail search and index library
  This package provides a Ruby interface to the notmuch
  functionality, directly interfacing with a shared notmuch library.
 
-Package: notmuch-emacs
-Section: oldlibs
-Architecture: all
-Depends:
- elpa-notmuch,
- ${misc:Depends},
-Description: thread-based email index, search and tagging (transitional package)
- This dummy package help ease transition to the new package elpa-notmuch
-
 Package: elpa-notmuch
 Architecture: all
 Depends:
-- 
2.28.0

Re: [PATCH 1/3] debian: suggest elpa-mailscripts

[David Bremner]

David Bremner <david@tethera.net> writes:

> These contain some useful functions for notmuch users, mainly wrappers
> for scripts from mailscripts.

Series applied to release and master

d