From: David Bremner <david@tethera.net>
Date: Fri, 4 Aug 2017 22:43:33 +0000 (-0400)
Subject: Merge tag 'debian/0.25-4'
X-Git-Tag: 0.26_rc0~209
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=aa2abd2958f941caba6ffc8052dd00550f7e7e39;hp=65b17dab461ef847b418aff69bc53e697ec2d20b

Merge tag 'debian/0.25-4'

uploaded to unstable
---

diff --git a/debian/changelog b/debian/changelog
index ae426452..ba096df6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+notmuch (0.25-4) unstable; urgency=medium
+
+  * Recommend elpa-emacs instead emacs-notmuch
+
+ -- David Bremner <bremner@debian.org>  Fri, 04 Aug 2017 18:11:35 -0400
+
 notmuch (0.25-3) unstable; urgency=medium
 
   * Remove old startup file /etc/emacs/site-start.d/50notmuch.el
diff --git a/debian/control b/debian/control
index 25594496..bffcd4dc 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,7 @@ Vcs-Browser: https://git.notmuchmail.org/git/notmuch
 Package: notmuch
 Architecture: any
 Depends: libnotmuch5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Recommends: notmuch-emacs | notmuch-vim | notmuch-mutt | alot,  gnupg-agent, gpgsm
+Recommends: elpa-emacs | notmuch-vim | notmuch-mutt | alot,  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