From: David Bremner <david@tethera.net>
Date: Sun, 2 Mar 2014 11:36:34 +0000 (-0400)
Subject: debian: fix typo in postinst (Debian bug 740325), clean up empty directory
X-Git-Tag: debian/0.17-5^0
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7b0d53a9064161f2f0f4f88fefd64133d089222e;p=notmuch.git

debian: fix typo in postinst (Debian bug 740325), clean up empty directory

Try to remove the directory /0755 ; if that fails assume it has
something in it to preserve.
---

diff --git a/debian/changelog b/debian/changelog
index d382dbd8..a419ace1 100644
--- 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 48ecf231..1237237d 100644
--- 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