X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=debian%2Fcontrol;h=135eb7ced2bfe9e62829dbc44cfab047253869a7;hb=HEAD;hp=9706b0f753388f8a0f258f3638910f6e404cdae0;hpb=8d3d98991d5b48b6552712a3ca6797b4ac9d95bf;p=notmuch

diff --git a/debian/control b/debian/control
index 9706b0f7..08e3c7f3 100644
--- a/debian/control
+++ b/debian/control
@@ -7,19 +7,21 @@ Uploaders:
  David Bremner <bremner@debian.org>,
 Build-Conflicts:
  gdb [ia64 mips mips64el hppa],
- gdb-minimal,
  ruby1.8,
-Build-Depends:
+Build-Depends: dpkg-dev (>= 1.22.5),
  bash-completion (>=1.9.0~),
  debhelper-compat (= 13),
  dh-elpa (>= 1.3),
  dh-python,
+ dh-sequence-vim-addon,
  desktop-file-utils,
  doxygen,
  dpkg-dev (>= 1.17.14),
  dtach (>= 0.8) <!nocheck>,
  emacs-nox | emacs-gtk | emacs-lucid | emacs25-nox | emacs25 (>=25~) | emacs25-lucid (>=25~) | emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~),
+ emacs-el,
  gdb [!ia64 !mips !mips64el !kfreebsd-any !alpha !hppa] <!nocheck>,
+ git <!nocheck>,
  gnupg <!nocheck>,
  gpgsm <!nocheck>,
  libgmime-3.0-dev (>= 3.0.3~),
@@ -28,7 +30,7 @@ Build-Depends:
  libtalloc-dev,
  libxapian-dev,
  libz-dev,
- pkg-config,
+ pkgconf,
  python3,
  python3-cffi,
  python3-pytest,
@@ -48,12 +50,12 @@ Rules-Requires-Root: no
 Package: notmuch
 Architecture: any
 Depends:
- libnotmuch5 (= ${binary:Version}),
+ libnotmuch5t64 (= ${binary:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
- elpa-notmuch | notmuch-vim | notmuch-mutt | alot,
- gnupg-agent,
+ elpa-notmuch | notmuch-vim | notmuch-mutt | alot | astroid,
+ gpg-agent,
  gpgsm,
 Suggests:
  mailscripts,
@@ -97,7 +99,10 @@ Description: thread-based email index, search and tagging
  .
  This package contains the HTML documentation
 
-Package: libnotmuch5
+Package: libnotmuch5t64
+Provides: ${t64:Provides}
+Replaces: libnotmuch5
+Breaks: libnotmuch5 (<< ${source:Version})
 Section: libs
 Architecture: any
 Depends:
@@ -118,7 +123,7 @@ Package: libnotmuch-dev
 Section: libdevel
 Architecture: any
 Depends:
- libnotmuch5 (= ${binary:Version}),
+ libnotmuch5t64 (= ${binary:Version}),
  ${misc:Depends},
 Description: thread-based email index, search and tagging (development)
  Notmuch is a system for indexing, searching, reading, and tagging
@@ -133,7 +138,7 @@ Package: python3-notmuch
 Architecture: all
 Section: python
 Depends:
- libnotmuch5 (>= ${source:Version}),
+ libnotmuch5t64 (>= ${source:Version}),
  ${misc:Depends},
  ${python3:Depends},
 Description: Python 3 legacy interface to the notmuch mail search and index library
@@ -151,7 +156,7 @@ Package: python3-notmuch2
 Architecture: any
 Section: python
 Depends:
- libnotmuch5 (>= ${source:Version}),
+ libnotmuch5t64 (>= ${source:Version}),
  ${misc:Depends},
  ${python3:Depends},
  ${shlibs:Depends},
@@ -206,9 +211,9 @@ Replaces:
 Depends:
  notmuch,
  ruby-notmuch,
- vim-addon-manager,
  vim-ruby,
  ${misc:Depends},
+ ${vim-addon:Depends},
 Recommends:
  ruby-mail,
 Description: thread-based email index, search and tagging (vim interface)
@@ -225,15 +230,15 @@ Architecture: all
 Depends:
  libmail-box-perl,
  libmailtools-perl,
- libstring-shellquote-perl,
  libterm-readline-gnu-perl,
  notmuch (>= 0.4),
  ${misc:Depends},
  ${perl:Depends},
 Recommends:
- mutt,
+ mutt | neomutt,
 Enhances:
  mutt,
+ neomutt,
  notmuch,
 Description: thread-based email index, search and tagging (Mutt interface)
  notmuch-mutt provides integration among the Mutt mail user agent and