./packages/openofficeorg/3.1/unstable r1561: * debian/openoffice.org-common.preinst.in, debian/rules:
------------------------------------------------------------
revno: 1561
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Fri 2009-05-22 12:18:39 +0200
message:
* debian/openoffice.org-common.preinst.in, debian/rules:
- again move javasettingsunopkginstall.xml to
/var/lib/openoffice/basisX.Y/share/config to match what $OOO_BASE_DIR
would do...
* debian/shell-lib.sh:
- adapt to rely on /usr/lib/openoffice/basis-link instead of
hardcoding the path
modified:
changelog
openoffice.org-common.preinst.in
rules
shell-lib.sh
=== modified file 'changelog'
--- a/changelog 2009-05-20 09:22:21 +0000
+++ b/changelog 2009-05-22 10:18:39 +0000
@@ -4,8 +4,15 @@
- use gcj-jdk instead of java-gcj-compat-dev (closes: #526292)
* debian/control.in:
- make -evolution depend on libebook-1.2-9 (which is dlopen()ed)
+ * debian/openoffice.org-common.preinst.in, debian/rules:
+ - again move javasettingsunopkginstall.xml to
+ /var/lib/openoffice/basisX.Y/share/config to match what $OOO_BASE_DIR
+ would do...
+ * debian/shell-lib.sh:
+ - adapt to rely on /usr/lib/openoffice/basis-link instead of
+ hardcoding the path
- -- Rene Engelhard <rene@debian.org> Tue, 19 May 2009 13:45:06 +0200
+ -- Rene Engelhard <rene@debian.org> Fri, 22 May 2009 11:14:57 +0200
openoffice.org (1:3.1.0-3) unstable; urgency=low
=== modified file 'openoffice.org-common.preinst.in'
--- a/openoffice.org-common.preinst.in 2009-05-20 00:12:26 +0000
+++ b/openoffice.org-common.preinst.in 2009-05-22 10:18:39 +0000
@@ -20,16 +20,21 @@
fi
# obsolete. no conffile.
rm -f /etc/openoffice/dictionary.lst /etc/openoffice/dictionary.lst-old
- if [ ! -e /var/lib/openoffice/share/config/javasettingsunopkginstall.xml ]; then
+ if [ ! -e `echo $OOBASISDIR | sed -e s/usr/var`/share/config/javasettingsunopkginstall.xml ]; then
+ if [ ! -d `echo $OOBASISDIR | sed -e s/usr/var`/share/config ]; then
+ mkdir -p `echo $OOBASISDIR | sed -e s/usr/var`/share/config
+ fi
if [ -e /var/lib/openoffice/javasettingsunopkginstall.xml ]; then
- if [ ! -d /var/lib/openoffice/share/config ]; then
- mkdir -p /var/lib/openoffice/share/config
- fi
mv /var/lib/openoffice/javasettingsunopkginstall.xml \
/var/lib/openoffice/share/config/javasettingsunopkginstall.xml
fi
+ if [ -e /var/lib/openoffice/share/config/javasettingsunopkginstall.xml ]; then
+ mv /var/lib/openoffice/share/config/javasettingsunopkginstall.xml \
+ `echo $OOBASISDIR | sed -e s/usr/var`/share/config/javasettingsunopkginstall.xml
+ fi
else
rm -f /var/lib/openoffice/javasettingsunopkginstall.xml
+ rm -f /var/lib/openoffice/share/config/javasettingsunopkginstall.xml
fi
;;
esac
=== modified file 'rules'
--- a/rules 2009-05-20 09:22:21 +0000
+++ b/rules 2009-05-22 10:18:39 +0000
@@ -2728,11 +2728,10 @@
rm -rf $(PKGDIR)-common/$(OODIR)/presets/uno_packages
# move javasettingsunopkginstall.xml to /var/lib
- mkdir -p $(PKGDIR)-common/var/lib/$(OODIRNAME)/share/config
+ mkdir -p $(PKGDIR)-common/$(shell echo $(OODIR) | sed -e s/usr/var/)/share/config
mv $(PKGDIR)-common/$(OODIR)/share/config/javasettingsunopkginstall.xml \
- $(PKGDIR)-common/var/lib/$(OODIRNAME)/share/config/javasettingsunopkginstall.xml
- # hopefully this compat symlink will serve packages not yet updated...
- ln -s /var/lib/$(OODIRNAME)/share/config/javasettingsunopkginstall.xml \
+ $(PKGDIR)-common/$(shell echo $(OODIR) | sed -e s/usr/var/)/share/config/javasettingsunopkginstall.xml
+ ln -s /$(shell echo $(OODIR) | sed -e s/usr/var/)/share/config/javasettingsunopkginstall.xml \
$(PKGDIR)-common/$(OODIR)/share/config/javasettingsunopkginstall.xml
# install DicOOo; we need to do this manually; the
=== modified file 'shell-lib.sh'
--- a/shell-lib.sh 2009-05-20 08:06:56 +0000
+++ b/shell-lib.sh 2009-05-22 10:18:39 +0000
@@ -63,7 +63,7 @@
export PYTHONPATH="/@OOBASISDIR@/program"
/usr/lib/openoffice/program/unopkg remove --shared $1 \
"-env:UserInstallation=file://$INSTDIR" \
- '-env:UNO_JAVA_JFW_INSTALL_DATA=file:///var/lib/openoffice/share/config/javasettingsunopkginstall.xml' \
+ '-env:UNO_JAVA_JFW_INSTALL_DATA=file:///usr/lib/openoffice/basis-link/share/config/javasettingsunopkginstall.xml' \
"-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
echo " done."
@@ -77,7 +77,7 @@
export PYTHONPATH="/@OOBASISDIR@/program"
/usr/lib/openoffice/program/unopkg add --shared $1 \
"-env:UserInstallation=file:///$INSTDIR" \
- '-env:UNO_JAVA_JFW_INSTALL_DATA=file:///var/lib/openoffice/share/config/javasettingsunopkginstall.xml' \
+ '-env:UNO_JAVA_JFW_INSTALL_DATA=file:///usr/lib/openoffice/basis-link/share/config/javasettingsunopkginstall.xml' \
"-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
echo " done."
Reply to: