[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.2_rc2-1-120-g7598d51
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 470f1f4281618174604858111f28bd6aa896f02f
Author: Rene Engelhard <rene@debian.org>
Date: Wed Apr 25 00:16:20 2012 +0200
fix typo to actually try to rm -rf /var/lib/libreoffice/share/prereg
Conflicts:
changelog
diff --git a/changelog b/changelog
index 697d377..a369c62 100644
--- a/changelog
+++ b/changelog
@@ -19,8 +19,11 @@ libreoffice (1:3.5.2-2ubuntu2) precise-proposed; urgency=low
- debian/patches/fix-system-lpsolve-build.diff: use -Wl$(COMMA)-rpath as
otherwise gbuild strips everything after the , away;
makes it actually set the rpath
+ * cherry-pick c6e83cc1711e5d4f1025316e0824640e73c1da2d from debian:
+ - debian/libreoffice-common.postrm.in: fix typo to actually try to rm -rf
+ /var/lib/libreoffice/share/prereg
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Mon, 23 Apr 2012 13:18:27 +0200
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 26 Apr 2012 02:50:34 +0200
libreoffice (1:3.5.2-2ubuntu1) precise; urgency=low
diff --git a/libreoffice-common.postrm.in b/libreoffice-common.postrm.in
index 5fc21b0..b19845c 100644
--- a/libreoffice-common.postrm.in
+++ b/libreoffice-common.postrm.in
@@ -14,7 +14,7 @@ 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 @OODDIR@ | sed -e s,usr/,var/,g`/share/prereg/bundled
+ rm -rf /`echo @OODIR@ | 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
--
LibreOffice packaging repository
Reply to: