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

diff --git a/debian/changelog b/debian/changelog
index 94332e786646d6d6c33a651ccafac42c6e5d9c66..860dcf2936ec10c918551bb59bf3d16ebe799aea 100644 (file)
--- 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 18394fdb7c6dff6994d116a52c6c22c6d8dfc138..124178e73955fd2242a80256b08f67f07cdb340b 100644 (file)
--- 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;