r943 ./packages/openofficeorg/2.3/experimental: debian/shell-lib.sh: fix again to match what a plain upstream build creates
------------------------------------------------------------
revno: 943
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2007-11-09 17:13:26 +0100
message:
debian/shell-lib.sh: fix again to match what a plain upstream build creates
modified:
changelog
shell-lib.sh
=== modified file 'changelog'
--- a/changelog 2007-11-09 14:47:54 +0000
+++ b/changelog 2007-11-09 16:13:26 +0000
@@ -31,8 +31,10 @@
as "gij" alone doesn't seem to be sufficient to make OOo know there's
a "Free Software Foundation" JDK (closes: #440899)
- s/j2re1.4/sun-java5-jre/
+ * debian/shell-lib.sh: fix again to match what a plain upstream build
+ creates when embedding the extension in the installset...
- -- Rene Engelhard <rene@debian.org> Fri, 09 Nov 2007 15:47:13 +0100
+ -- Rene Engelhard <rene@debian.org> Fri, 09 Nov 2007 17:10:29 +0100
openoffice.org (1:2.3.0-4) experimental; urgency=medium
=== modified file 'shell-lib.sh'
--- a/shell-lib.sh 2007-08-16 11:02:15 +0000
+++ b/shell-lib.sh 2007-11-09 16:13:26 +0000
@@ -57,8 +57,8 @@
echo -n "Removing extension $1..."
INSTDIR=`mktemp -d`
/usr/lib/openoffice/program/unopkg remove --shared $1 \
- "-env:UserInstallation=file://////$INSTDIR" \
- "-env:UNO_JAVA_JFW_INSTALL_DATA=\$ORIGIN/../share/config/javasettingsunopkginstall.xml"
+ "-env:UserInstallation=file://$INSTDIR" \
+ '-env:UNO_JAVA_JFW_INSTALL_DATA=$ORIGIN/../share/config/javasettingsunopkginstall.xml'
if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
echo " done."
fi
@@ -68,8 +68,8 @@
echo -n "Adding extension $1..."
INSTDIR=`mktemp -d`
/usr/lib/openoffice/program/unopkg add --shared $1 \
- "-env:UserInstallation=file://////$INSTDIR" \
- "-env:UNO_JAVA_JFW_INSTALL_DATA=\$ORIGIN/../share/config/javasettingsunopkginstall.xml"
+ "-env:UserInstallation=file:///$INSTDIR" \
+ '-env:UNO_JAVA_JFW_INSTALL_DATA=$ORIGIN/../share/config/javasettingsunopkginstall.xml'
if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
echo " done."
}
Reply to: