[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_4.1.0-2-6-gb335fe7
The following commit has been merged in the master branch:
commit 802e8f8702f60c0a5a8c52a3441183a72e377eb4
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jul 29 13:23:42 2013 +0200
add missed || true and use rm -f for javasettingsunopkginstall.xml...
diff --git a/changelog b/changelog
index cb57a2c..1510f68 100644
--- a/changelog
+++ b/changelog
@@ -2,8 +2,10 @@ libreoffice (1:4.1.0-3) unstable; urgency=low
* debian/rules:
- use system-clucene again now that it's in sid
+ * debian/libreoffice-common.postrm.in:
+ - add missed || true and use rm -f for javasettinsgunopkginstall.xml...
- -- Rene Engelhard <rene@debian.org> Mon 29 Jul 2013 14:39:36 +0200
+ -- Rene Engelhard <rene@debian.org> Fri, 26 Jul 2013 20:25:16 +0200
libreoffice (1:4.1.0-2) unstable; urgency=low
diff --git a/libreoffice-common.postrm.in b/libreoffice-common.postrm.in
index aacc57c..5aec23d 100644
--- a/libreoffice-common.postrm.in
+++ b/libreoffice-common.postrm.in
@@ -25,9 +25,9 @@ case "$1" in
rmdir /`echo @OODIR@ | sed -e s,usr/,var/,g` || true
;;
purge)
- rm /`echo @OODIR@ | sed -e s,usr/,var/,g`/share/config/javasettingsunopkginstall.xml
+ rm -f /`echo @OODIR@ | sed -e s,usr/,var/,g`/share/config/javasettingsunopkginstall.xml
rmdir /`echo @OODIR@ | sed -e s,usr/,var/,g`/share/config || true
- rmdir /`echo @OODIR@ | sed -e s,usr/,var/,g`/share
+ rmdir /`echo @OODIR@ | sed -e s,usr/,var/,g`/share || true
;;
esac
--
LibreOffice packaging repository
Reply to: