./packages/openofficeorg/3.1/experimental r1485: move PYTHONPATH setting to the functions for other python stuff if it ever should come and as a reference
------------------------------------------------------------
revno: 1485
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Sun 2009-04-05 22:19:27 +0200
message:
move PYTHONPATH setting to the functions for other python stuff if it ever should come and as a reference
modified:
changelog
openoffice.org-emailmerge.postinst.in
shell-lib.sh
=== modified file 'changelog'
--- a/changelog 2009-04-05 06:26:36 +0000
+++ b/changelog 2009-04-05 20:19:27 +0000
@@ -1,9 +1,8 @@
openoffice.org (1:3.1.0~rc1-2) UNRELEASED; urgency=low
- * debian/openoffice.org-emailmerge.postinst.in:
- export PYTHONPATH="/@OOBASISDIR/program"; as regstering mailmerge.py
- aparently calls "import pythonloader" which does not work anymore without
- (closes: #522536)
+ * debian/shell-lib.sh: export PYTHONPATH="/@OOBASISDIR/program" as
+ regstering mailmerge.py aparently calls "import pythonloader" which
+ does not work anymore without (closes: #522536)
-- Rene Engelhard <rene@debian.org> Sun, 05 Apr 2009 08:24:33 +0200
=== modified file 'openoffice.org-emailmerge.postinst.in'
--- a/openoffice.org-emailmerge.postinst.in 2009-04-05 06:26:36 +0000
+++ b/openoffice.org-emailmerge.postinst.in 2009-04-05 20:19:27 +0000
@@ -8,7 +8,6 @@
#INCLUDE_SHELL_LIB#
if [ "$1" = "configure" -o "$1" = "upgrade" ]; then
- export PYTHONPATH="/@OOBASISDIR/program"
add_extension /@OOBASISDIR@/program/mailmerge.py
fi
=== modified file 'shell-lib.sh'
--- a/shell-lib.sh 2009-03-03 01:25:42 +0000
+++ b/shell-lib.sh 2009-04-05 20:19:27 +0000
@@ -60,6 +60,7 @@
if /usr/lib/openoffice/program/unopkg list --shared $1 >/dev/null; then
echo -n "Removing extension $1..."
INSTDIR=`mktemp -d`
+ 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' \
@@ -73,6 +74,7 @@
add_extension() {
echo -n "Adding extension $1..."
INSTDIR=`mktemp -d`
+ 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' \
Reply to: