The following commit has been merged in the debian-experimental-3.5 branch:
commit 365c2b947573ab0899be0a4e369b16bc9c3821ee
Author: Rene Engelhard <[email protected]>
Date: Fri Jan 27 09:25:00 2012 +0000
debian/libreoffice-common.postrm.in: fix merge: @OOBRANDDIR@/@OOBASISDIR@
-> @OODIR@
diff --git a/changelog b/changelog
index eeb20ff..c396d44 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:3.5.0~rc2-1) UNRELEASED; urgency=low
+libreoffice (1:3.5.0~rc2-1) experimental; urgency=low
* new upstream release candidate
@@ -11,8 +11,10 @@ libreoffice (1:3.5.0~rc2-1) UNRELEASED; urgency=low
- install full changelog only for packages with the same name in OOo
times; strip pre-libreoffice entries otherwise.
- (re-)enable -script-provider-js
+ * debian/libreoffice-common.postrm.in: fix merge:
+ @OOBRANDDIR@/@OOBASISDIR@ -> @OODIR@
- -- Rene Engelhard <[email protected]> Wed, 25 Jan 2012 11:48:19 +0000
+ -- Rene Engelhard <[email protected]> Fri, 27 Jan 2012 09:23:07 +0000
libreoffice (1:3.5.0~rc1-1) experimental; urgency=low
diff --git a/libreoffice-common.postrm.in b/libreoffice-common.postrm.in
index c9bed36..3f209eb 100644
--- a/libreoffice-common.postrm.in
+++ b/libreoffice-common.postrm.in
@@ -17,15 +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
+ rm -rf /`echo @OODDIR@ | sed -e
s,usr/,var/,g`/share/prereg/bundled
+ rmdir /`echo @OODIR@ | sed -e s,usr/,var/,g`/share/prereg/ ||
true
+ rmdir /`echo @OODIR@ | 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
+ rmdir /`echo @OODIR@ | sed -e s,usr/,var/,g`/program/ || true
+ rmdir /`echo @OODIR@ | sed -e s,usr/,var/,g` || true
# and try to remove /@OOBRANDDIR@ itself
- rmdir /`echo @OOBRANDDIR@ | sed -e s,usr/,var/,g` || true
+ rmdir /`echo @OODIR@ | sed -e s,usr/,var/,g` || true
fi
;;
esac
--
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]
