Merge branch 'release'

[notmuch] / debian / control

diff --git a/debian/control b/debian/control
index e2bb166f5f6edcb27b146927be46a3e3ace9badc..585ff77889672720d75d40d87d6e49ff40da6e78 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Conflicts:
  ruby1.8,
 Build-Depends:
  bash-completion (>=1.9.0~),
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
  dh-elpa (>= 1.3),
  dh-python,
  desktop-file-utils,
@@ -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
@@ -146,20 +148,12 @@ 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:
  ${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