[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.2-6-58-g7a208db
The following commit has been merged in the debian-experimental-3.6 branch:
commit cbf42dbe3740694ad27f4527f7d33fd673bdee80
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
diff --git a/changelog b/changelog
index 1a42267..aa229ef 100644
--- a/changelog
+++ b/changelog
@@ -21,16 +21,14 @@ libreoffice (1:3.5.2-5) UNRELEASED; urgency=low
- use gcc 4.4 on mips(el)
- only ship (and build) unowinreg.dll for i386/amd64. Probably not used
on other archs and it saves us the g++-mingw-w64-i686 build-dep there
- * debian/libreoffice-common.links: move ...
- * debian/libreoffice-common.links.in: ... here again as we need to
- subsitute @OODIR@ (closes: #669138)
+ - use gcc 4.4 on mips a) for consistency b) as 3.5.3~rc1-1 bus errord on
+ ball, too
* debian/shell-lib-extension.sh: also set HOME to $INSTDIR for unopkg
(as -env=UserInstallation doesn't work (anymore) - closes: #669271
+ * debian/libreoffice-common.postrm.in: fix typo to actually try to rm -rf
+ /var/lib/libreoffice/share/prereg
- [ Björn Michaelsen ]
- * add visio mimetype to libreoffice draw desktop file
-
- -- Rene Engelhard <rene@debian.org> Sun, 22 Apr 2012 18:22:33 +0200
+ -- Rene Engelhard <rene@debian.org> Wed, 25 Apr 2012 00:15:25 +0200
libreoffice (1:3.5.2-4) unstable; urgency=medium
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: