Merge tag 'debian/0.29.2-2'

[notmuch] / debian / control

diff --git a/debian/control b/debian/control
index ae4e6f0052818106ebb6bde8f4e039b9c6cba852..b1829582c21797be45cabd058381643400dea104 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,29 +8,29 @@ Uploaders:
 Build-Conflicts: ruby1.8, gdb-minimal, gdb [ia64 mips mips64el]
 Build-Depends:
  dpkg-dev (>= 1.17.14),
 Build-Conflicts: ruby1.8, gdb-minimal, gdb [ia64 mips mips64el]
 Build-Depends:
  dpkg-dev (>= 1.17.14),

- debhelper (>= 10~),
+ debhelper (>= 11~),

  pkg-config,
  libxapian-dev,
  pkg-config,
  libxapian-dev,

- libgmime-3.0-dev (>= 3.0.3~) | libgmime-2.6-dev (>= 2.6.7~),
+ libgmime-3.0-dev (>= 3.0.3~),

  libtalloc-dev,
  libz-dev,
  libtalloc-dev,
  libz-dev,

- python-all (>= 2.6.6-3~),

  python3-all (>= 3.1.2-7~),
  dh-python,
  dh-elpa (>= 1.3),
  python3-sphinx,
  ruby, ruby-dev (>>1:1.9.3~),
  python3-all (>= 3.1.2-7~),
  dh-python,
  dh-elpa (>= 1.3),
  python3-sphinx,
  ruby, ruby-dev (>>1:1.9.3~),

+ emacs-nox | emacs-gtk | emacs-lucid |

  emacs25-nox | emacs25 (>=25~) | emacs25-lucid (>=25~) |
  emacs25-nox | emacs25 (>=25~) | emacs25-lucid (>=25~) |

- emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~) |
- emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~),
+ emacs24-nox | emacs24 (>=24~) | emacs24-lucid (>=24~),

  gdb [!ia64 !mips !mips64el !kfreebsd-any !alpha] <!nocheck>,
  dtach (>= 0.8) <!nocheck>,
  gpgsm <!nocheck>,
  gnupg <!nocheck>,
  gdb [!ia64 !mips !mips64el !kfreebsd-any !alpha] <!nocheck>,
  dtach (>= 0.8) <!nocheck>,
  gpgsm <!nocheck>,
  gnupg <!nocheck>,

- bash-completion (>=1.9.0~)
-Standards-Version: 4.1.3
+ bash-completion (>=1.9.0~),
+ texinfo
+Standards-Version: 4.3.0

 Homepage: https://notmuchmail.org/
 Homepage: https://notmuchmail.org/

-Vcs-Git: git://notmuchmail.org/git/notmuch
+Vcs-Git: https://git.notmuchmail.org/git/notmuch -b release

 Vcs-Browser: https://git.notmuchmail.org/git/notmuch
 
 Package: notmuch
 Vcs-Browser: https://git.notmuchmail.org/git/notmuch
 
 Package: notmuch


@@ -72,19 +72,6 @@ Description: thread-based email index, search and tagging (development)
  This package provides the necessary development libraries and header
  files to allow you to develop new software using libnotmuch.
 
  This package provides the necessary development libraries and header
  files to allow you to develop new software using libnotmuch.
 

-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
- 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
- convenient search syntax.
- .
- This package provides a Python interface to the notmuch
- functionality, directly interfacing with a shared notmuch library.
-

 Package: python3-notmuch
 Architecture: all
 Section: python
 Package: python3-notmuch
 Architecture: all
 Section: python


@@ -151,7 +138,8 @@ Depends:
  notmuch (>= 0.4),
  libmail-box-perl, libmailtools-perl,
  libstring-shellquote-perl, libterm-readline-gnu-perl,
  notmuch (>= 0.4),
  libmail-box-perl, libmailtools-perl,
  libstring-shellquote-perl, libterm-readline-gnu-perl,

- ${misc:Depends}
+ ${misc:Depends},
+ ${perl:Depends},

 Recommends: mutt
 Enhances: notmuch, mutt
 Description: thread-based email index, search and tagging (Mutt interface)
 Recommends: mutt
 Enhances: notmuch, mutt
 Description: thread-based email index, search and tagging (Mutt interface)