Revert "debian: Generate version from debian/changelog"

[notmuch] / debian / control

diff --git a/debian/control b/debian/control
index 68603baf0d29ace02338dd7535ff81908e4cad32..03afdf444d55cbf4fb3f4e4a237f3da110247531 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~)
-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
@@ -15,7 +15,7 @@ Dm-Upload-Allowed: yes
 
 Package: notmuch
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: libnotmuch1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Recommends: notmuch-emacs | notmuch-vim
 Description: thread-based email index, search and tagging
  Notmuch is a system for indexing, searching, reading, and tagging
@@ -67,8 +67,8 @@ Description: python interface to the notmuch mail search and index library
 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)
@@ -83,10 +83,10 @@ Description: thread-based email index, search and tagging (emacs interface)
 Package: notmuch-vim
 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, vim-addon-manager
-Description: thread-based email index, search and tagging (emacs interface)
+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