From: Don Armstrong <don@donarmstrong.com>
Date: Sun, 5 Mar 2017 23:43:05 +0000 (-0800)
Subject: Ignore non-empty /usr/share/lilypond in postinst (Closes: #737505)
X-Git-Tag: debian/2.18.2-9~7
X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=b0852c93880c423d411c0550da9e95b50a4237c3;p=lilypond.git

Ignore non-empty /usr/share/lilypond in postinst (Closes: #737505)
---

diff --git a/debian/changelog b/debian/changelog
index 94332e7866..860dcf2936 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lilypond (2.18.2-6) UNRELEASED; urgency=medium
+
+  * Ignore non-empty /usr/share/lilypond in postinst (Closes: #737505)
+
+ -- Don Armstrong <don@debian.org>  Sun, 05 Mar 2017 15:42:20 -0800
+
 lilypond (2.18.2-7) unstable; urgency=medium
 
   * Fix FTBFS (introduced by me in 2.18.2-5) on hurd-i386
diff --git a/debian/lilypond-data.postinst b/debian/lilypond-data.postinst
index 18394fdb7c..124178e739 100644
--- a/debian/lilypond-data.postinst
+++ b/debian/lilypond-data.postinst
@@ -25,7 +25,7 @@ mktexlsr $TEXMFMAIN
 
 if [ "$1" = "configure" ]; then
     if [ -d /usr/share/info/lilypond ] && [ ! -L /usr/share/info/lilypond ] \
-	&& rmdir /usr/share/lilypond; then
+	&& rmdir --ignore-fail-on-non-empty /usr/share/lilypond; then
 	(cd /usr/share/info; ln -s ../doc/lilypond/html/Documentation/user/ lilypond;)
     fi;
 fi;