debian/changelog: Add note that notmuch-vim description is in (bug #631974)

[notmuch] / debian / control

diff --git a/debian/control b/debian/control
index 77682b50021a67f4b1f84a9d6e77b285ae26eabd..78c9849b0b84511b2cd6ef4703a70aa29ee36301 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Jameson Graef Rollins <jrollins@finestructure.net>, martin f. krafft
 Build-Depends: debhelper (>= 7.0.50~), pkg-config, libxapian-dev, 
  libgmime-2.4-dev, libtalloc-dev, libz-dev,  python-all (>= 2.6.6-3~),
  emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~)
 Build-Depends: debhelper (>= 7.0.50~), pkg-config, libxapian-dev, 
  libgmime-2.4-dev, libtalloc-dev, libz-dev,  python-all (>= 2.6.6-3~),
  emacs23-nox | emacs23 (>=23~) | emacs23-lucid (>=23~)

-Standards-Version: 3.9.1.0
+Standards-Version: 3.9.2

 Homepage: http://notmuchmail.org/
 Vcs-Git: git://notmuchmail.org/git/notmuch
 Vcs-Browser: http://git.notmuchmail.org/git/notmuch
 Homepage: http://notmuchmail.org/
 Vcs-Git: git://notmuchmail.org/git/notmuch
 Vcs-Browser: http://git.notmuchmail.org/git/notmuch


@@ -16,16 +16,14 @@ Dm-Upload-Allowed: yes
 Package: notmuch
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Package: notmuch
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}

-Enhances: vim
-Suggests: vim, vim-addon-manager
+Recommends: notmuch-emacs | notmuch-vim

 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
  the Xapian library to provide fast, full-text search with a very
  convenient search syntax.
  .
 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
  the Xapian library to provide fast, full-text search with a very
  convenient search syntax.
  .

- This package contains the notmuch command-line interface as well as
- the vim interface for notmuch.
+ This package contains the notmuch command-line interface

 
 Package: libnotmuch1
 Section: libs
 
 Package: libnotmuch1
 Section: libs


@@ -69,8 +67,8 @@ Description: python interface to the notmuch mail search and index library
 Package: notmuch-emacs
 Architecture: all
 Section: mail
 Package: notmuch-emacs
 Architecture: all
 Section: mail

-Breaks: notmuch (<<0.6~238~)
-Replaces: notmuch (<<0.6~238~)
+Breaks: notmuch (<<0.6~254~)
+Replaces: notmuch (<<0.6~254~)

 Depends: ${misc:Depends}, notmuch,
  emacs23 (>= 23~) | emacs23-nox (>=23~) | emacs23-lucid (>=23~)
 Description: thread-based email index, search and tagging (emacs interface)
 Depends: ${misc:Depends}, notmuch,
  emacs23 (>= 23~) | emacs23-nox (>=23~) | emacs23-lucid (>=23~)
 Description: thread-based email index, search and tagging (emacs interface)


@@ -82,3 +80,18 @@ Description: thread-based email index, search and tagging (emacs interface)
  This package provides an emacs based mail user agent based on
  notmuch.
 
  This package provides an emacs based mail user agent based on
  notmuch.
 

+Package: notmuch-vim
+Architecture: all
+Section: mail
+Breaks: notmuch (<<0.6~254~)
+Replaces: notmuch (<<0.6~254~)
+Depends: ${misc:Depends}, notmuch, vim-addon-manager
+Description: thread-based email index, search and tagging (vim interface)
+ 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 vim based mail user agent based on
+ notmuch.
+