The following commit has been merged in the master branch:
commit 5930f6221cad332bc743d246e85169d57e63b2dc
Author: Rene Engelhard <[email protected]>
Date: Thu Jan 12 19:10:54 2012 +0000
more -core/-common postrm fixes
diff --git a/changelog b/changelog
index d23385c..1902e11 100644
--- a/changelog
+++ b/changelog
@@ -4,8 +4,9 @@ libreoffice (1:3.4.5-1) unstable; urgency=medium
* new upstream release
- fixes build with bleeding edge external boost and gcc (closes: #652784)
- * debian/libreoffice-core.postrm.in:
- - on remove, delete created services.rdb (closes: #650341)
+ * debian/libreoffice-{common,core}.postrm.in:
+ - on remove, delete created services.rdb (closes: #650341) and
+ remove all /var/lib content on remove (prereg/bundled, basisX.Y)
* debian/control.in:
- move libreoffice, libreoffice-l10n-{in,za} to new metapackages
section
@@ -24,7 +25,7 @@ libreoffice (1:3.4.5-1) unstable; urgency=medium
* merge from ubuntu-precise-3.5:
- add debian multiarch support for Qt4
- -- Rene Engelhard <[email protected]> Wed, 11 Jan 2012 12:03:46 +0000
+ -- Rene Engelhard <[email protected]> Thu, 12 Jan 2012 18:56:37 +0000
libreoffice (1:3.4.4-2) unstable; urgency=medium
diff --git a/libreoffice-common.postrm.in b/libreoffice-common.postrm.in
index 5eb33d5..c9bed36 100644
--- a/libreoffice-common.postrm.in
+++ b/libreoffice-common.postrm.in
@@ -17,6 +17,15 @@ case "$1" in
"/etc/openoffice/sofficerc"
"/etc/libreoffice/sofficerc" "" libreoffice-common -- "$@"
dpkg-maintscript-helper mv_conffile \
"/etc/openoffice/soffice.sh"
"/etc/libreoffice/soffice.sh" "" libreoffice-common -- "$@"
+ rm -rf /`echo @OOBRANDDIR@ | sed -e
s,usr/,var/,g`/share/prereg/bundled
+ rmdir /`echo @OOBRANDDIR@ | sed -e s,usr/,var/,g`/share/prereg/
|| true
+ rmdir /`echo @OOBRANDDIR@ | sed -e s,usr/,var/,g`/share/ || true
+ # this belongs to -core, but won't work until we have -common
stuff removed, too, so try here again
+ # in adduition to -core
+ rmdir /`echo @OOBASISDIR@ | sed -e s,usr/,var/,g`/program/ ||
true
+ rmdir /`echo @OOBASISDIR@ | sed -e s,usr/,var/,g` || true
+ # and try to remove /@OOBRANDDIR@ itself
+ rmdir /`echo @OOBRANDDIR@ | sed -e s,usr/,var/,g` || true
fi
;;
esac
diff --git a/libreoffice-core.postrm.in b/libreoffice-core.postrm.in
index 9405f2c..37a7e8e 100755
--- a/libreoffice-core.postrm.in
+++ b/libreoffice-core.postrm.in
@@ -6,8 +6,9 @@ set -e
if [ "$1" = "remove" ]; then
rm -rf /var/spool/libreoffice@VER@
- rm -f /`echo @OOBASISDIR@ | sed -e s,/usr/,/var,g`/program/services.rdb
- rmdir /`echo @OOBASISDIR@ | sed -e s,/usr/,/var,g`/program/
+ rm -f /`echo @OOBASISDIR@ | sed -e s,usr/,var/,g`/program/services.rdb
+ rmdir /`echo @OOBASISDIR@ | sed -e s,usr/,var/,g`/program/ || true
+ rmdir /`echo @OOBASISDIR@ | sed -e s,usr/,var/,g` || true
fi
#DEBHELPER#
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
