[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.3_rc1-1-8-gd7a82fb



The following commit has been merged in the debian-experimental-3.5 branch:
commit 08bb5d4dd1028db97b6c7f008e8a9cdb11c7f3a3
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 7774899..2130a08 100644
--- a/changelog
+++ b/changelog
@@ -9,8 +9,10 @@ libreoffice (1:3.5.3~rc2-1) UNRELEASED; urgency=low
       on other archs and it saves us the g++-mingw-w64-i686 build-dep there 
     - 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
 
- -- Rene Engelhard <rene@debian.org>  Tue, 24 Apr 2012 22:21:54 +0200
+ -- Rene Engelhard <rene@debian.org>  Tue, 24 Apr 2012 23:55:51 +0200
 
 libreoffice (1:3.5.3~rc1-1) experimental; urgency=low
 
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: