From: David Bremner <david@tethera.net>
Date: Thu, 10 Aug 2017 11:08:49 +0000 (-0400)
Subject: Merge tag 'debian/0.25-5'
X-Git-Tag: 0.26_rc0~207
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=178d62cf9c9959fe603c9ffef9fa90f65b67dcd5;hp=0967e46475be71d39daf928c9370af20b416f102

Merge tag 'debian/0.25-5'

uploaded to unstable
---

diff --git a/debian/changelog b/debian/changelog
index ba096df6..d738d243 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+notmuch (0.25-5) unstable; urgency=medium
+
+  * Bug fix: "dependency on elpa-emacs doesn't seem right", thanks
+    to Jiri Palecek (Closes: #871642).
+
+ -- David Bremner <bremner@debian.org>  Thu, 10 Aug 2017 06:42:50 -0400
+
 notmuch (0.25-4) unstable; urgency=medium
 
   * Recommend elpa-emacs instead emacs-notmuch
diff --git a/debian/control b/debian/control
index bffcd4dc..20b8a2db 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: elpa-emacs | notmuch-vim | notmuch-mutt | alot,  gnupg-agent, gpgsm
+Recommends: elpa-notmuch | 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