./packages/openofficeorg/3.0.1/unstable r1450: - move javasettingsunopkginstall.xml to /var/lib/openoffice and adapt
------------------------------------------------------------
revno: 1450
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Wed 2009-04-08 10:00:40 +0200
message:
- move javasettingsunopkginstall.xml to /var/lib/openoffice and adapt
unopkg calls (closes: #523044)
modified:
changelog
rules
shell-lib.sh
=== modified file 'changelog'
--- a/changelog 2009-04-01 21:47:59 +0000
+++ b/changelog 2009-04-08 08:00:40 +0000
@@ -3,6 +3,9 @@
* debian/control{,sdk,reportdesign}.in:
- add last three ${misc:Depends}, even where we have no Depends: line
otherwise
+ * debian/rules, debian/shell-lib.sh:
+ - move javasettingsunopkginstall.xml to /var/lib/openoffice and adapt
+ unopkg calls (closes: #523044)
-- Rene Engelhard <rene@debian.org> Wed, 01 Apr 2009 23:33:20 +0200
=== modified file 'rules'
--- a/rules 2009-03-29 20:42:17 +0000
+++ b/rules 2009-04-08 08:00:40 +0000
@@ -2731,6 +2731,15 @@
# share/uno_packages/cache...
rm -rf $(PKGDIR)-common/$(OODIR)/presets/uno_packages
+ # move javaseetingsunopkginstall.xml to /var/lib
+ mkdir -p $(PKGDIR)-common/var/lib/$(OODIRNAME)
+ mv $(PKGDIR)-common/$(OODIR)/share/config/javasettingsunopkginstall.xml
+ \
+ $(PKGDIR)-common/var/lib/$(OODIRNAME)/javasettingsunopkginstall.xml
+ # hopefully this compat symlink will serve packages not yet updated...
+ ln -s /var/lib/$(OODIRNAME)/javasettingsunopkginstall.xml \
+ $(PKGDIR)-common/$(OODIR)/share/config/javasettingsunopkginstall.xml
+
# install DicOOo; we need to do this manually; the
# dictionaries/ module isn't built with --without-myspell-dicts
# and those two somehow (why?) are in there...
=== modified file 'shell-lib.sh'
--- a/shell-lib.sh 2009-03-03 01:25:42 +0000
+++ b/shell-lib.sh 2009-04-08 08:00:40 +0000
@@ -62,7 +62,7 @@
INSTDIR=`mktemp -d`
/usr/lib/openoffice/program/unopkg remove --shared $1 \
"-env:UserInstallation=file://$INSTDIR" \
- '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' \
+ '-env:UNO_JAVA_JFW_INSTALL_DATA=file:///var/lib/openoffice/javasettingsunopkginstall.xml' \
"-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
echo " done."
@@ -75,7 +75,7 @@
INSTDIR=`mktemp -d`
/usr/lib/openoffice/program/unopkg add --shared $1 \
"-env:UserInstallation=file:///$INSTDIR" \
- '-env:UNO_JAVA_JFW_INSTALL_DATA=$OOO_BASE_DIR/share/config/javasettingsunopkginstall.xml' \
+ '-env:UNO_JAVA_JFW_INSTALL_DATA=file:///var/lib/openoffice/javasettingsunopkginstall.xml' \
"-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
echo " done."
Reply to: