------------------------------------------------------------
revno: 2086
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Tue 2010-08-24 23:32:12 +0200
message:
remove add_extension()/add_extension_link()
modified:
changelog
shell-lib-extensions.sh
=== modified file 'changelog'
--- a/changelog 2010-08-24 11:40:27 +0000
+++ b/changelog 2010-08-24 21:32:12 +0000
@@ -26,7 +26,7 @@
* debian/*.{pre,post},{inst,rm}.in, debian/shell-lib-{components,extensions}:
cleanup. remove unused THIS_SCRIPT. Use dpkgs DPKG_MAINTSCRIPT_PACKAGE
instead of THIS_SCRIPT
- * debian/shell-lib-extensions.sh: add add_extension_link()
+ * debian/shell-lib-extensions.sh: remove add_extension(), not needed anymore
* debian/*.postinst.in, debian/*.prerm.in: Remove unopkg calls for
extensions in prerm and postinst, as we don't need them anymore
* debian/control*in: remove Pre-Depends: on openoffice.orgVER-common
@@ -48,7 +48,7 @@
* debian/rules, debian/scripts/vars.powerpcspe: add powerpcspe support
(Sebastian Andrzej Siewior) - closes: #594038
- -- Rene Engelhard <r...@debian.org> Mon, 23 Aug 2010 13:13:03 +0200
+ -- Rene Engelhard <r...@debian.org> Tue, 24 Aug 2010 23:20:05 +0200
openoffice.org (1:3.2.1-6) unstable; urgency=high
=== modified file 'shell-lib-extensions.sh'
--- a/shell-lib-extensions.sh 2010-06-14 17:49:21 +0000
+++ b/shell-lib-extensions.sh 2010-08-24 21:32:12 +0000
@@ -20,34 +20,3 @@
fi
}
-add_extension() {
- INSTDIR=`mktemp -d`
- export PYTHONPATH="/@OOBASISDIR@/program"
- 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://$d/share/config/javasettingsunopkginstall.xml"
\
- "-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1"
- if [ -n $INSTDIR ]; then rm -rf $INSTDIR; fi
-}
-
-add_extension_link() {
- INSTDIR=`mktemp -d`
- export PYTHONPATH="/@OOBASISDIR@/program"
- 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 --link $1 \
- "-env:UserInstallation=file:///$INSTDIR" \
-
"-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
-}
-
-
