Merge tag 'debian/0.29.2-2'

[notmuch] / debian / control

diff --git a/debian/control b/debian/control
index 4fd8e0d5d7f114ebad5491197815b8b6d2408ce9..b1829582c21797be45cabd058381643400dea104 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,31 +4,39 @@ Priority: optional
 Maintainer: Carl Worth <cworth@debian.org>
 Uploaders:
  Jameson Graef Rollins <jrollins@finestructure.net>,
 Maintainer: Carl Worth <cworth@debian.org>
 Uploaders:
  Jameson Graef Rollins <jrollins@finestructure.net>,

- martin f. krafft <madduck@debian.org>,

  David Bremner <bremner@debian.org>
  David Bremner <bremner@debian.org>

+Build-Conflicts: ruby1.8, gdb-minimal, gdb [ia64 mips mips64el]

 Build-Depends:
 Build-Depends:

- debhelper (>= 9),
+ dpkg-dev (>= 1.17.14),
+ debhelper (>= 11~),

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

- libgmime-2.6-dev (>= 2.6.7~) | libgmime-2.4-dev,
+ 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~),
  python3-all (>= 3.1.2-7~),

+ dh-python,
+ dh-elpa (>= 1.3),
+ python3-sphinx,

  ruby, ruby-dev (>>1:1.9.3~),
  ruby, ruby-dev (>>1:1.9.3~),

- emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~) |
+ emacs-nox | emacs-gtk | emacs-lucid |
+ emacs25-nox | emacs25 (>=25~) | emacs25-lucid (>=25~) |

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

- gdb,
- dtach (>= 0.8)
-Standards-Version: 3.9.4
-Homepage: http://notmuchmail.org/
-Vcs-Git: git://notmuchmail.org/git/notmuch
-Vcs-Browser: http://git.notmuchmail.org/git/notmuch
+ gdb [!ia64 !mips !mips64el !kfreebsd-any !alpha] <!nocheck>,
+ dtach (>= 0.8) <!nocheck>,
+ gpgsm <!nocheck>,
+ gnupg <!nocheck>,
+ bash-completion (>=1.9.0~),
+ texinfo
+Standards-Version: 4.3.0
+Homepage: https://notmuchmail.org/
+Vcs-Git: https://git.notmuchmail.org/git/notmuch -b release
+Vcs-Browser: https://git.notmuchmail.org/git/notmuch

 
 Package: notmuch
 Architecture: any
 
 Package: notmuch
 Architecture: any

-Depends: libnotmuch3 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Recommends: notmuch-emacs | notmuch-vim | notmuch-mutt | alot,  gnupg-agent
+Depends: libnotmuch5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+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
 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


@@ -37,7 +45,7 @@ Description: thread-based email index, search and tagging
  .
  This package contains the notmuch command-line interface
 
  .
  This package contains the notmuch command-line interface
 

-Package: libnotmuch3
+Package: libnotmuch5

 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}


@@ -54,7 +62,7 @@ Description: thread-based email index, search and tagging (runtime)
 Package: libnotmuch-dev
 Section: libdevel
 Architecture: any
 Package: libnotmuch-dev
 Section: libdevel
 Architecture: any

-Depends: ${misc:Depends}, libnotmuch3 (= ${binary:Version})
+Depends: ${misc:Depends}, libnotmuch5 (= ${binary:Version})

 Description: thread-based email index, search and tagging (development)
  Notmuch is a system for indexing, searching, reading, and tagging
  large collections of email messages in maildir or mh format. It uses
 Description: thread-based email index, search and tagging (development)
  Notmuch is a system for indexing, searching, reading, and tagging
  large collections of email messages in maildir or mh format. It uses


@@ -64,23 +72,10 @@ 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}, libnotmuch3
-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

-Depends: ${misc:Depends}, ${python3:Depends}, libnotmuch3
+Depends: ${misc:Depends}, ${python3:Depends}, libnotmuch5 (>= ${source:Version})

 Description: Python 3 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
 Description: Python 3 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


@@ -90,7 +85,7 @@ Description: Python 3 interface to the notmuch mail search and index library
  This package provides a Python 3 interface to the notmuch
  functionality, directly interfacing with a shared notmuch library.
 
  This package provides a Python 3 interface to the notmuch
  functionality, directly interfacing with a shared notmuch library.
 

-Package: notmuch-ruby
+Package: ruby-notmuch

 Architecture: any
 Section: ruby
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Architecture: any
 Section: ruby
 Depends: ${shlibs:Depends}, ${misc:Depends}


@@ -104,13 +99,15 @@ Description: Ruby interface to the notmuch mail search and index library
  functionality, directly interfacing with a shared notmuch library.
 
 Package: notmuch-emacs
  functionality, directly interfacing with a shared notmuch library.
 
 Package: notmuch-emacs

+Section: oldlibs

 Architecture: all
 Architecture: all

-Section: mail
-Breaks: notmuch (<<0.6~254~)
-Replaces: notmuch (<<0.6~254~)
-Depends: ${misc:Depends}, notmuch (>= ${source:Version}),
- emacs23 (>= 23~) | emacs23-nox (>=23~) | emacs23-lucid (>=23~) |
- emacs24 (>= 24~) | emacs24-nox (>=24~) | emacs24-lucid (>=24~)
+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: ${misc:Depends}, ${elpa:Depends}

 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
 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


@@ -122,10 +119,9 @@ Description: thread-based email index, search and tagging (emacs interface)
 
 Package: notmuch-vim
 Architecture: all
 
 Package: notmuch-vim
 Architecture: all

-Section: mail

 Breaks: notmuch (<<0.6~254~)
 Replaces: notmuch (<<0.6~254~)
 Breaks: notmuch (<<0.6~254~)
 Replaces: notmuch (<<0.6~254~)

-Depends: ${misc:Depends}, notmuch, vim-addon-manager, vim-ruby, notmuch-ruby
+Depends: ${misc:Depends}, notmuch, vim-addon-manager, vim-ruby, ruby-notmuch

 Recommends: ruby-mail
 Description: thread-based email index, search and tagging (vim interface)
  Notmuch is a system for indexing, searching, reading, and tagging
 Recommends: ruby-mail
 Description: thread-based email index, search and tagging (vim interface)
  Notmuch is a system for indexing, searching, reading, and tagging


@@ -142,9 +138,9 @@ 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,

- libfile-which-perl,
- ${misc:Depends}
-Recommends: mutt, fdupes
+ ${misc:Depends},
+ ${perl:Depends},
+Recommends: mutt

 Enhances: notmuch, mutt
 Description: thread-based email index, search and tagging (Mutt interface)
  notmuch-mutt provides integration among the Mutt mail user agent and
 Enhances: notmuch, mutt
 Description: thread-based email index, search and tagging (Mutt interface)
  notmuch-mutt provides integration among the Mutt mail user agent and


@@ -155,17 +151,3 @@ Description: thread-based email index, search and tagging (Mutt interface)
  a fresh Maildir containing its search results only. The second one is
  the ability to reconstruct threads on the fly starting from the
  current highlighted mail.
  a fresh Maildir containing its search results only. The second one is
  the ability to reconstruct threads on the fly starting from the
  current highlighted mail.

-
-Package: notmuch-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, libnotmuch3 (= ${binary:Version})
-Description: thread-based email index, search and tagging - debugging symbols
- 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 contains the debugging symbols for libnotmuch and the
- notmuch binary. Most people will not need this package.