X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=debian%2Fcontrol;h=20b8a2db1e32e5bcbc5ad39ecf73152dd50a73a1;hb=3e9857a0b98c04973b9b6ad2da7dc5c3992b3b1c;hp=8e55d6699ca2ee0b739155d29660719ef650193e;hpb=be381073c0a7c7be6eabae035220ba631c63e86c;p=notmuch

diff --git a/debian/control b/debian/control
index 8e55d669..20b8a2db 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends:
  debhelper (>= 9),
  pkg-config,
  libxapian-dev,
- libgmime-2.6-dev (>= 2.6.7~) | libgmime-2.4-dev,
+ libgmime-3.0-dev | libgmime-2.6-dev (>= 2.6.7~),
  libtalloc-dev,
  libz-dev,
  python-all (>= 2.6.6-3~),
@@ -20,6 +20,7 @@ Build-Depends:
  dh-elpa (>= 1.3),
  python-sphinx (>= 1.0),
  ruby, ruby-dev (>>1:1.9.3~),
+ emacs25-nox | emacs25 (>=25~) | emacs25-lucid (>=25~) |
  emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~) |
  emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~),
  gdb [!s390x !ia64 !armel !ppc64el !mips !mipsel !mips64el !kfreebsd-any],
@@ -27,7 +28,7 @@ Build-Depends:
  gpgsm <!nocheck>,
  gnupg <!nocheck>,
  bash-completion (>=1.9.0~)
-Standards-Version: 3.9.6
+Standards-Version: 4.0.0
 Homepage: https://notmuchmail.org/
 Vcs-Git: git://notmuchmail.org/git/notmuch
 Vcs-Browser: https://git.notmuchmail.org/git/notmuch
@@ -35,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-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
@@ -75,7 +76,7 @@ Package: python-notmuch
 Architecture: all
 Section: python
 Depends: ${misc:Depends}, ${python:Depends}, libnotmuch5 (>= ${source:Version})
-Description: python interface to the notmuch mail search and index library
+Description: Python interface to the notmuch mail search and index library
  Notmuch is a system for indexing, searching, reading, and tagging
  large collections of email messages in maildir or mh format. It uses
  the Xapian library to provide fast, full-text search with a very
@@ -111,8 +112,10 @@ Description: Ruby interface to the notmuch mail search and index library
  functionality, directly interfacing with a shared notmuch library.
 
 Package: notmuch-emacs
+Section: oldlibs
+Priority: extra
 Architecture: all
-Depends: elpa-notmuch
+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