From: David Bremner <bremner@unb.ca>
Date: Tue, 21 Jun 2011 17:31:21 +0000 (-0300)
Subject: debian: split off vim interface to its own package
X-Git-Tag: debian/0.6_254~2
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=33330dc050b0e841fac8bec31eedd2ceb18d9e48

debian: split off vim interface to its own package

So far the package does notthing fancy with vim-addon-manager.
---

diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index f07b4991..00000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,6 +0,0 @@
-notmuch for Debian
-==================
-
-To use the vim plugin, please install it using vim-addons(1)
-
- -- martin f. krafft <madduck@debian.org>  Thu, 21 Jan 2010 14:50:19 +1300
diff --git a/debian/README.notmuch-vim b/debian/README.notmuch-vim
new file mode 100644
index 00000000..f07b4991
--- /dev/null
+++ b/debian/README.notmuch-vim
@@ -0,0 +1,6 @@
+notmuch for Debian
+==================
+
+To use the vim plugin, please install it using vim-addons(1)
+
+ -- martin f. krafft <madduck@debian.org>  Thu, 21 Jan 2010 14:50:19 +1300
diff --git a/debian/control b/debian/control
index 77682b50..68603baf 100644
--- a/debian/control
+++ b/debian/control
@@ -16,16 +16,14 @@ Dm-Upload-Allowed: yes
 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.
  .
- 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
@@ -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.
 
+Package: notmuch-vim
+Architecture: all
+Section: mail
+Breaks: notmuch (<<0.6~238~)
+Replaces: notmuch (<<0.6~238~)
+Depends: ${misc:Depends}, notmuch, vim-addon-manager
+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
+ 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.
+
diff --git a/debian/notmuch-vim.install b/debian/notmuch-vim.install
new file mode 100644
index 00000000..95ab07bb
--- /dev/null
+++ b/debian/notmuch-vim.install
@@ -0,0 +1,3 @@
+vim/plugin/notmuch.vim usr/share/vim/addons/plugin
+vim/syntax/notmuch-*.vim usr/share/vim/addons/syntax
+vim/notmuch.yaml usr/share/vim/registry
diff --git a/debian/rules b/debian/rules
index 9ac190ea..fbd863db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,9 +29,3 @@ override_dh_installdocs:
 
 override_dh_auto_build:
 	make RPATH_LDFLAGS=""
-
-override_dh_install:
-	dh_install
-	install -m644 vim/plugin/notmuch.vim debian/notmuch/usr/share/vim/addons/plugin
-	install -m644 vim/syntax/notmuch-*.vim debian/notmuch/usr/share/vim/addons/syntax
-	install -m644 vim/notmuch.yaml debian/notmuch/usr/share/vim/registry