debian: update notmuch-emacs for emacs policy 2.0.6

This involves
- the meta-flavour emacs has gone away
- a compat file is needed (also installed by dh_installemacsen)
- a conflict with pre-2.0.0 emacsen-common
- manually managing the "installed" semaphore file

diff --git a/debian/changelog b/debian/changelog
index 0f2b69b8ba21b178d9b9b28214d28593082e24d3..9ee7ed15522cc97700f99537e744020349f8785a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+notmuch (0.17-3) UNRELEASED; urgency=low
+
+  * update notmuch-emacs for debian emacs policy 2.0.6
+
+ -- David Bremner <bremner@debian.org>  Sun, 12 Jan 2014 17:07:16 -0400
+
 notmuch (0.17-2) unstable; urgency=medium
 
   * Bug fix: "package should warn in a NEWS.Debian file about possible

diff --git a/debian/control b/debian/control
index 1f8cbff725449c5bec294567df61adb9c0290f60..a887263cfbd7d4c5053882f53b7fff6fd0e4f2c5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -108,6 +108,7 @@ Architecture: all
 Section: mail
 Breaks: notmuch (<<0.6~254~)
 Replaces: notmuch (<<0.6~254~)
+Conflicts: emacsen-common (<< 2.0.0)
 Depends: ${misc:Depends}, notmuch (>= ${source:Version}),
  emacs23 (>= 23~) | emacs23-nox (>=23~) | emacs23-lucid (>=23~) |
  emacs24 (>= 24~) | emacs24-nox (>=24~) | emacs24-lucid (>=24~)

diff --git a/debian/notmuch-emacs.emacsen-compat b/debian/notmuch-emacs.emacsen-compat
new file mode 100644 (file)
index 0000000..573541a
--- /dev/null
+++ b/debian/notmuch-emacs.emacsen-compat
@@ -0,0 +1 @@
+0

diff --git a/debian/notmuch-emacs.emacsen-install b/debian/notmuch-emacs.emacsen-install
index 8fd302763b74e74ad591ec773da842bb6c6bb99a..dfd8fda94ded28f9080980d1193a4c9c57162564 100755 (executable)
--- a/debian/notmuch-emacs.emacsen-install
+++ b/debian/notmuch-emacs.emacsen-install
@@ -8,8 +8,6 @@
 FLAVOR=$1
 PACKAGE=notmuch
 
-if [ ${FLAVOR} = emacs ]; then exit 0; fi
-
 # We know that the notmuch emacs code doesn't work with emacs before emacs23
 if [ ${FLAVOR} = emacs21 ]; then exit 0; fi
 if [ ${FLAVOR} = emacs22 ]; then exit 0; fi

diff --git a/debian/notmuch-emacs.emacsen-remove b/debian/notmuch-emacs.emacsen-remove
index 184c2b602ab3807561c9f0f1c44eb6c20922085b..3b433ae2bebe0eb13277caf0139a43a1ee213cf3 100755 (executable)
--- a/debian/notmuch-emacs.emacsen-remove
+++ b/debian/notmuch-emacs.emacsen-remove
@@ -4,7 +4,5 @@
 FLAVOR=$1
 PACKAGE=notmuch
 
-if [ ${FLAVOR} != emacs ]; then
-    echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
-    rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
-fi
+echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
+rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}

diff --git a/debian/notmuch-emacs.postinst b/debian/notmuch-emacs.postinst
new file mode 100644 (file)
index 0000000..48ecf23
--- /dev/null
+++ b/debian/notmuch-emacs.postinst
@@ -0,0 +1,4 @@
+dir="/var/lib/emacsen-common/state/package/installed"
+mkdir -p 0755 ${dir}
+touch ${dir}/notmuch-emacs
+#DEBHELPER#

diff --git a/debian/notmuch-emacs.prerm b/debian/notmuch-emacs.prerm
new file mode 100644 (file)
index 0000000..5e2758d
--- /dev/null
+++ b/debian/notmuch-emacs.prerm
@@ -0,0 +1,3 @@
+#DEBHELPER#
+dir="/var/lib/emacsen-common/state/package/installed"
+rm -f ${dir}/notmuch-emacs