[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 72156b1ce4d97249560c605022ba2f472a1c38a7
Author: Rene Engelhard <rene@debian.org>
Date: Wed Apr 25 00:08:04 2012 +0200
also set HOME to $INSTDIR for unopkg (as -env=UserInstallation does not work (anymore)
diff --git a/changelog b/changelog
index 2bbd8d7..1a42267 100644
--- a/changelog
+++ b/changelog
@@ -24,6 +24,8 @@ libreoffice (1:3.5.2-5) UNRELEASED; urgency=low
* debian/libreoffice-common.links: move ...
* debian/libreoffice-common.links.in: ... here again as we need to
subsitute @OODIR@ (closes: #669138)
+ * debian/shell-lib-extension.sh: also set HOME to $INSTDIR for unopkg
+ (as -env=UserInstallation doesn't work (anymore) - closes: #669271
[ Björn Michaelsen ]
* add visio mimetype to libreoffice draw desktop file
diff --git a/shell-lib-extensions.sh b/shell-lib-extensions.sh
index 652efd8..c0e74bd 100644
--- a/shell-lib-extensions.sh
+++ b/shell-lib-extensions.sh
@@ -14,11 +14,13 @@ sync_extensions() {
fi
if /usr/lib/libreoffice/program/unopkg list --bundled >/dev/null 2>/dev/null; then
if [ -e /usr/lib/libreoffice/share/prereg/bundled ] && readlink /usr/lib/libreoffice/share/prereg/bundled 2>&1 >/dev/null && [ -L $d/ure-link ]; then
- /usr/lib/libreoffice/program/unopkg sync -v --bundled \
+ HOME=$INSTDIR \
+ /usr/lib/libreoffice/program/unopkg sync -v --bundled \
"-env:BUNDLED_EXTENSIONS_USER=file:///usr/lib/libreoffice/share/prereg/bundled" \
"-env:UserInstallation=file://$INSTDIR" \
"-env:UNO_JAVA_JFW_INSTALL_DATA=file://$d/share/config/javasettingsunopkginstall.xml" \
"-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
+ rm -rf $INSTDIR
fi
fi
}
--
LibreOffice packaging repository
Reply to: