[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.3-2-4-gc29adc4
The following commit has been merged in the master branch:
commit 2b9b338743fa66e38e02cad74aa5ea99deaeb4d4
Author: Andreas Beckmann <debian@abeckmann.de>
Date: Fri May 11 00:41:57 2012 +0200
set HOME to $INSTDIR also for unopkg list --bundled
diff --git a/changelog b/changelog
index bcfb231..759c98e 100644
--- a/changelog
+++ b/changelog
@@ -1,10 +1,15 @@
libreoffice (1:3.5.3-3) UNRELEASED; urgency=low
+ [ Rene Engelhard ]
* debian/patches/ignore-sc_cellrangesbase-fails.diff:
make .IGNORE actually work
* debian/patches/wiki-publisher-add-missing-xsls.diff:
add missing .xsls for -wiki-publisher
+ [ Andreas Beckmann ]
+ * debian/shell-lib-extension.sh: set HOME to $INSTDIR also for
+ unopkg list --bundled (Closes: #669271)
+
-- Rene Engelhard <rene@debian.org> Tue, 08 May 2012 11:37:43 +0200
libreoffice (1:3.5.3-2) unstable; urgency=low
diff --git a/shell-lib-extensions.sh b/shell-lib-extensions.sh
index c0e74bd..41619aa 100644
--- a/shell-lib-extensions.sh
+++ b/shell-lib-extensions.sh
@@ -12,7 +12,7 @@ sync_extensions() {
else
d=/usr/lib/libreoffice
fi
- if /usr/lib/libreoffice/program/unopkg list --bundled >/dev/null 2>/dev/null; then
+ if HOME=$INSTDIR /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
HOME=$INSTDIR \
/usr/lib/libreoffice/program/unopkg sync -v --bundled \
@@ -20,8 +20,8 @@ sync_extensions() {
"-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
+ rm -rf $INSTDIR
}
--
LibreOffice packaging repository
Reply to:
- Prev by Date:
Processed: affects 672160, affects 672255, found 672255 in kfreebsd-image-8.3-1-amd64/8.3-2, tagging 669271 ...
- Next by Date:
[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.3-2-4-gc29adc4
- Previous by thread:
Processed: affects 672160, affects 672255, found 672255 in kfreebsd-image-8.3-1-amd64/8.3-2, tagging 669271 ...
- Next by thread:
[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.3-2-4-gc29adc4
- Index(es):