Merge tag 'debian/0.25-3'

uploaded to unstable

diff --git a/debian/changelog b/debian/changelog
index 2c04cb3bd0b6b9ff8037b57767c39aa7b12f26e0..ae426452eab58ef3ced3d6e1fc58e599762ee2ba 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+notmuch (0.25-3) unstable; urgency=medium
+
+  * Remove old startup file /etc/emacs/site-start.d/50notmuch.el
+
+ -- David Bremner <bremner@debian.org>  Thu, 03 Aug 2017 09:26:00 -0400
+
 notmuch (0.25-2) unstable; urgency=medium
 
   * Drop build-dep on libgmime-2.4-dev, long unsupported upstream

diff --git a/debian/notmuch-emacs.maintscript b/debian/notmuch-emacs.maintscript
new file mode 100644 (file)
index 0000000..6f93feb
--- /dev/null
+++ b/debian/notmuch-emacs.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/emacs/site-start.d/50notmuch.el

diff --git a/debian/notmuch.maintscript b/debian/notmuch.maintscript
new file mode 100644 (file)
index 0000000..6f93feb
--- /dev/null
+++ b/debian/notmuch.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/emacs/site-start.d/50notmuch.el