------------------------------------------------------------
revno: 1487
committer: Rene Engelhard <[email protected]>
branch nick: experimental
timestamp: Wed 2009-04-08 10:02:28 +0200
message:
merg
modified:
changelog
rules
shell-lib.sh
------------------------------------------------------------
revno: 1332.1.118
committer: Rene Engelhard <[email protected]>
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-05 22:38:23 +0000
+++ b/changelog 2009-04-08 08:02:28 +0000
@@ -5,6 +5,9 @@
does not work anymore without (closes: #522536)
* debian/control.in:
- fix override dispariry (-l10n-in/-l10n-za -> localization)
+ * debian/rules, debian/shell-lib.sh:
+ - move javasettingsunopkginstall.xml to /var/lib/openoffice and adapt
+ unopkg calls (closes: #523044)
-- Rene Engelhard <[email protected]> Mon, 06 Apr 2009 00:36:39 +0200
=== modified file 'rules'
--- a/rules 2009-04-02 21:45:26 +0000
+++ b/rules 2009-04-08 08:02:28 +0000
@@ -2671,6 +2671,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-04-05 20:19:27 +0000
+++ b/shell-lib.sh 2009-04-08 08:02:28 +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=$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."
@@ -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=$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."
