------------------------------------------------------------
revno: 2371 [merge]
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Wed 2011-02-09 17:38:06 +0100
message:
debian/shell-lib-extensions.sh: properly set INSTDIR and d also in
sync_extensions() (closes: #612572)
modified:
changelog
shell-lib-extensions.sh
=== modified file 'changelog'
--- a/changelog 2011-02-09 16:37:47 +0000
+++ b/changelog 2011-02-09 16:38:06 +0000
@@ -13,8 +13,10 @@
buildds)
* debian/control.sdk.in:
- conflict against openoffice.org-dev-doc (closes: #612494)
+ * debian/shell-lib-extensions.sh: properly set INSTDIR and d also in
+ sync_extensions() (closes: #612572)
- -- Rene Engelhard <[email protected]> Tue, 08 Feb 2011 22:51:32 +0000
+ -- Rene Engelhard <[email protected]> Wed, 09 Feb 2011 17:31:46 +0100
libreoffice (1:3.3.0-2) unstable; urgency=low
=== modified file 'shell-lib-extensions.sh'
--- a/shell-lib-extensions.sh 2010-10-04 17:54:30 +0000
+++ b/shell-lib-extensions.sh 2011-02-09 16:35:51 +0000
@@ -25,6 +25,13 @@
}
sync_extensions() {
+ INSTDIR=`mktemp -d`
+ export PYTHONPATH="/@OOBASISDIR@/program"
+ if [ -L /usr/lib/libreoffice/basis-link ]; then
+ d=/var/lib/libreoffice/`readlink /usr/lib/libreoffice/basis-link`/
+ else
+ d=/usr/lib/libreoffice
+ fi
if [ -e /usr/lib/libreoffice/share/prereg/bundled ] && readlink
/usr/lib/libreoffice/share/prereg/bundled 2>&1 >/dev/null; then
/usr/lib/libreoffice/program/unopkg sync -v --shared \
"-env:BUNDLED_EXTENSIONS_USER=file:///usr/lib/libreoffice/share/prereg/bundled"
\
