Merge tag 'debian/0.17-5'

uploaded to unstable

diff --git a/debian/changelog b/debian/changelog
index d382dbd8732a4675ece153dce6bf44ff72038315..a419ace11e49afac7db656c3a64253ed175ad64f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+notmuch (0.17-5) unstable; urgency=medium
+
+  * Bug fix: "unowned directory after purge: /0755/", thanks to
+    Andreas Beckmann (Closes: #740325).
+
+ -- David Bremner <bremner@debian.org>  Mon, 03 Mar 2014 07:29:06 -0400
+
 notmuch (0.17-4) unstable; urgency=medium
 
   * Bug fix: "Please update ruby binary extension install path",

diff --git a/debian/notmuch-emacs.postinst b/debian/notmuch-emacs.postinst
index 48ecf231c354509f2247dcdb77ad6aab53f1078e..1237237de5791ecdf641140218a96876af523561 100644 (file)
--- a/debian/notmuch-emacs.postinst
+++ b/debian/notmuch-emacs.postinst
@@ -1,4 +1,7 @@
 dir="/var/lib/emacsen-common/state/package/installed"
-mkdir -p 0755 ${dir}
+mkdir -p -m 0755 ${dir}
 touch ${dir}/notmuch-emacs
 #DEBHELPER#
+if [ -d /0755 ]; then
+   rmdir /0755 || true
+fi