From: David Bremner <david@tethera.net>
Date: Thu, 3 Aug 2017 14:59:32 +0000 (-0400)
Subject: Merge tag 'debian/0.25-3'
X-Git-Tag: 0.26_rc0~210
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=65b17dab461ef847b418aff69bc53e697ec2d20b;hp=e5beec39d6021c7b8c21e6d84050660ad6c69a96;p=notmuch

Merge tag 'debian/0.25-3'

uploaded to unstable
---

diff --git a/debian/changelog b/debian/changelog
index 2c04cb3b..ae426452 100644
--- 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
index 00000000..6f93feb7
--- /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
index 00000000..6f93feb7
--- /dev/null
+++ b/debian/notmuch.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/emacs/site-start.d/50notmuch.el