Merge tag 'debian/0.25-5'

uploaded to unstable

diff --git a/debian/changelog b/debian/changelog
index ba096df69ae243d75ee6a7f9457285ce39ba1404..d738d24310119d2e7c142580218bd0621e3eafc5 100644 (file)
--- 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 bffcd4dc842c5b5e767a49f79dc0604573c92049..20b8a2db1e32e5bcbc5ad39ecf73152dd50a73a1 100644 (file)
--- 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