./packages/openofficeorg/3.1/unstable r1582: don't rely on basis-link *and* javasettingsunopkginstall.xml symlinks

[Rene Engelhard]

------------------------------------------------------------
revno: 1582
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Mon 2009-06-08 00:46:16 +0200
message:
  don't rely on basis-link *and* javasettingsunopkginstall.xml symlinks
modified:
  changelog
  shell-lib.sh

=== modified file 'changelog'
--- a/changelog 2009-06-05 07:38:17 +0000
+++ b/changelog 2009-06-07 22:46:16 +0000
@@ -7,8 +7,13 @@
     - BOOST_VERSION=default (closes: #531118)
     - remove mono-jit (>= 1.9+dfsg-2) B-D as it's apparently gone
       in mono 2.4 and lenny has -6 anyway.
+  * debian/shell-lib.sh:
+    - don't rely on
+      /u/l/openoffice/basis-link/share/config/javasettingsunopkginstall.xml
+      - find out the basis and specify /var/lib/openoffice/basisX.Y directly
+      (hopefully closes: #530694, #531116, #531750)
 
- -- Rene Engelhard <r...@debian.org>  Thu, 04 Jun 2009 22:14:40 +0200
+ -- Rene Engelhard <r...@debian.org>  Mon, 08 Jun 2009 00:30:11 +0200
 
 openoffice.org (1:3.1.0-4) unstable; urgency=low
 

=== modified file 'shell-lib.sh'
--- a/shell-lib.sh      2009-05-22 10:18:39 +0000
+++ b/shell-lib.sh      2009-06-07 22:46:16 +0000
@@ -61,9 +61,10 @@
     echo -n "Removing extension $1..."
     INSTDIR=`mktemp -d`
     export PYTHONPATH="/@OOBASISDIR@/program"
+    basis=`readlink /usr/lib/openoffice/basis-link`
     /usr/lib/openoffice/program/unopkg remove --shared $1 \
       "-env:UserInstallation=file://$INSTDIR" \
-      
'-env:UNO_JAVA_JFW_INSTALL_DATA=file:///usr/lib/openoffice/basis-link/share/config/javasettingsunopkginstall.xml'
 \
+      
"-env:UNO_JAVA_JFW_INSTALL_DATA=file:///var/lib/openoffice/$basis/share/config/javasettingsunopkginstall.xml"
 \
       "-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
     if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
     echo " done."
@@ -75,9 +76,10 @@
   echo -n "Adding extension $1..."
   INSTDIR=`mktemp -d`
   export PYTHONPATH="/@OOBASISDIR@/program"
+  basis=`readlink /usr/lib/openoffice/basis-link`
   /usr/lib/openoffice/program/unopkg add --shared $1 \
     "-env:UserInstallation=file:///$INSTDIR" \
-    
'-env:UNO_JAVA_JFW_INSTALL_DATA=file:///usr/lib/openoffice/basis-link/share/config/javasettingsunopkginstall.xml'
 \
+    
"-env:UNO_JAVA_JFW_INSTALL_DATA=file:///var/lib/openoffice/$basis/share/config/javasettingsunopkginstall.xml'
 \
     "-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
   if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
   echo " done."