Bug#561498: openoffice.org-emailmerge upgrade error

[Rene Engelhard <rene@debian.org>]

tag 561498 - moreinfo
thanks

Hi,

On Sat, Mar 06, 2010 at 10:09:27AM +0100, Rene Engelhard wrote:
> > The problem is that
> > - this link is not in old versions of openoffice.org-common
> > - the PreDepends for openoffice.org-emailmerge is unversioned
> 
> Yeah, but I fear if I added the version we'd run into the same problem as
> for writer2latex..

Especially as -emailmerge doesn't strictly need a newer one..

> But will have a look...

That patch should do it (it doesn't take into account older versions below
1:3.1.0-4, so it would break when you update from them, but that should not
happen anymore anyway - if someone did this this would be broken (and it's
broken already anyway) :-))

=== modified file 'shell-lib-extensions.sh'
--- shell-lib-components.sh     2010-02-15 10:42:03 +0000
+++ shell-lib-components.sh     2010-03-06 13:05:09 +0000
@@ -53,10 +53,14 @@
   if /usr/lib/openoffice/program/unopkg list --shared $1 >/dev/null; then
     INSTDIR=`mktemp -d`
     export PYTHONPATH="/@OOBASISDIR@/program"
-    basis=`readlink /usr/lib/openoffice/basis-link`
+    if [ -L /usr/lib/openoffice/basis-link ]; then
+       d=/var/lib/openoffice/`readlink /usr/lib/openoffice/basis-link`/
+    else
+       d=/usr/lib/openoffice
+    fi
     /usr/lib/openoffice/program/unopkg remove -v --shared $1 \
       "-env:UserInstallation=file://$INSTDIR" \
-      "-env:UNO_JAVA_JFW_INSTALL_DATA=file:///var/lib/openoffice/$basis/share/config/javasettingsunopkginstall.xml" \
+      "-env:UNO_JAVA_JFW_INSTALL_DATA=file://$d/share/config/javasettingsunopkginstall.xml" \
       "-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
     if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
     flush_unopkg_cache
@@ -69,10 +73,14 @@
   check_for_running_ooo
   INSTDIR=`mktemp -d`
   export PYTHONPATH="/@OOBASISDIR@/program"
-  basis=`readlink /usr/lib/openoffice/basis-link`
+  if [ -L /usr/lib/openoffice/basis-link ]; then
+      d=/var/lib/openoffice/`readlink /usr/lib/openoffice/basis-link`/
+  else
+      d=/usr/lib/openoffice
+  fi
   /usr/lib/openoffice/program/unopkg add -v --shared $1 \
     "-env:UserInstallation=file:///$INSTDIR" \
-    "-env:UNO_JAVA_JFW_INSTALL_DATA=file:///var/lib/openoffice/$basis/share/config/javasettingsunopkginstall.xml" \
+    "-env:UNO_JAVA_JFW_INSTALL_DATA=file://$d/share/config/javasettingsunopkginstall.xml" \
     "-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
   if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
   handle_soffice_listeners start

Grüße/Regards,

René
-- 
 .''`.  René Engelhard -- Debian GNU/Linux Developer
 : :' : http://www.debian.org | http://people.debian.org/~rene/
 `. `'  rene@debian.org | GnuPG-Key ID: D03E3E70
   `-   Fingerprint: E12D EA46 7506 70CF A960 801D 0AA0 4571 D03E 3E70