aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Bremner <david@tethera.net>2017-08-04 18:43:33 -0400
committerDavid Bremner <david@tethera.net>2017-08-04 18:43:33 -0400
commitaa2abd2958f941caba6ffc8052dd00550f7e7e39 (patch)
treefe45d20e65f0a9b036afb842becb9762c84aff7e
parent65b17dab461ef847b418aff69bc53e697ec2d20b (diff)
parentcdfeeda5e44bd4dd887180bb62d2aeefe1afef27 (diff)
Merge tag 'debian/0.25-4'
uploaded to unstable
-rw-r--r--debian/changelog6
-rw-r--r--debian/control2
2 files changed, 7 insertions, 1 deletions
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