From 6f3d3c68a0f36325ec29b8196ee9b956bcd31a37 Mon Sep 17 00:00:00 2001
From: David Bremner <bremner@debian.org>
Date: Mon, 20 Jun 2011 22:00:44 -0300
Subject: [PATCH] debian: split off emacs interface into its own package.
- rename emacsen-install/remove files, and change embedded package
name
- split notmuch.install, notmuch.dirs
- add Breaks/Replaces for previous notmuch packages with overlapping
files.
---
debian/NEWS.Debian | 7 ++++++
debian/control | 23 ++++++++++++++++---
debian/notmuch-emacs.dirs | 1 +
...-install => notmuch-emacs.emacsen-install} | 2 +-
...en-remove => notmuch-emacs.emacsen-remove} | 2 +-
debian/notmuch-emacs.install | 1 +
debian/notmuch.dirs | 1 -
debian/notmuch.install | 1 -
8 files changed, 31 insertions(+), 7 deletions(-)
create mode 100644 debian/NEWS.Debian
create mode 100644 debian/notmuch-emacs.dirs
rename debian/{notmuch.emacsen-install => notmuch-emacs.emacsen-install} (95%)
rename debian/{notmuch.emacsen-remove => notmuch-emacs.emacsen-remove} (78%)
create mode 100644 debian/notmuch-emacs.install
diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian
new file mode 100644
index 00000000..69477542
--- /dev/null
+++ b/debian/NEWS.Debian
@@ -0,0 +1,7 @@
+notmuch (0.6~238) unstable; urgency=low
+
+ The emacs user interface to notmuch is now contained in a seperate
+ package called notmuch-emacs.
+
+ -- David Bremner <bremner@debian.org> Mon, 20 Jun 2011 23:57:55 -0300
+
diff --git a/debian/control b/debian/control
index 8288e3b1..77682b50 100644
--- a/debian/control
+++ b/debian/control
@@ -16,8 +16,8 @@ Dm-Upload-Allowed: yes
Package: notmuch
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Enhances: emacs, vim
-Suggests: emacs, vim, vim-addon-manager
+Enhances: vim
+Suggests: vim, vim-addon-manager
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
@@ -25,7 +25,7 @@ Description: thread-based email index, search and tagging
convenient search syntax.
.
This package contains the notmuch command-line interface as well as
- emacs and vim interfaces for notmuch.
+ the vim interface for notmuch.
Package: libnotmuch1
Section: libs
@@ -65,3 +65,20 @@ Description: python interface to the notmuch mail search and index library
.
This package provides a Python interface to the notmuch
functionality, directly interfacing with a shared notmuch library.
+
+Package: notmuch-emacs
+Architecture: all
+Section: mail
+Breaks: notmuch (<<0.6~238~)
+Replaces: notmuch (<<0.6~238~)
+Depends: ${misc:Depends}, notmuch,
+ emacs23 (>= 23~) | emacs23-nox (>=23~) | emacs23-lucid (>=23~)
+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 an emacs based mail user agent based on
+ notmuch.
+
diff --git a/debian/notmuch-emacs.dirs b/debian/notmuch-emacs.dirs
new file mode 100644
index 00000000..caeb4003
--- /dev/null
+++ b/debian/notmuch-emacs.dirs
@@ -0,0 +1 @@
+usr/share/emacs/site-lisp/notmuch
diff --git a/debian/notmuch.emacsen-install b/debian/notmuch-emacs.emacsen-install
similarity index 95%
rename from debian/notmuch.emacsen-install
rename to debian/notmuch-emacs.emacsen-install
index 98ec1282..8fd30276 100755
--- a/debian/notmuch.emacsen-install
+++ b/debian/notmuch-emacs.emacsen-install
@@ -1,5 +1,5 @@
#! /bin/sh -e
-# /usr/lib/emacsen-common/packages/install/notmuch
+# /usr/lib/emacsen-common/packages/install/notmuch-emacs
# Written by Jim Van Zandt <jrv@debian.org>, borrowing heavily
# from the install scripts for gettext by Santiago Vila
diff --git a/debian/notmuch.emacsen-remove b/debian/notmuch-emacs.emacsen-remove
similarity index 78%
rename from debian/notmuch.emacsen-remove
rename to debian/notmuch-emacs.emacsen-remove
index c35e8a42..184c2b60 100755
--- a/debian/notmuch.emacsen-remove
+++ b/debian/notmuch-emacs.emacsen-remove
@@ -1,5 +1,5 @@
#!/bin/sh -e
-# /usr/lib/emacsen-common/packages/remove/notmuch
+# /usr/lib/emacsen-common/packages/remove/notmuch-emacs
FLAVOR=$1
PACKAGE=notmuch
diff --git a/debian/notmuch-emacs.install b/debian/notmuch-emacs.install
new file mode 100644
index 00000000..c73aecef
--- /dev/null
+++ b/debian/notmuch-emacs.install
@@ -0,0 +1 @@
+usr/share/emacs/site-lisp/notmuch/*.el
diff --git a/debian/notmuch.dirs b/debian/notmuch.dirs
index ce7f2393..4b4ce9ea 100644
--- a/debian/notmuch.dirs
+++ b/debian/notmuch.dirs
@@ -1,5 +1,4 @@
usr/bin
-usr/share/emacs/site-lisp/notmuch
usr/share/vim/registry
usr/share/vim/addons/plugin
usr/share/vim/addons/syntax
diff --git a/debian/notmuch.install b/debian/notmuch.install
index dd310fad..5b7de1be 100644
--- a/debian/notmuch.install
+++ b/debian/notmuch.install
@@ -1,5 +1,4 @@
usr/bin
-usr/share/emacs/site-lisp/notmuch/*.el
usr/share/man/man1
etc/bash_completion.d
usr/share/zsh
--
2.45.2