[libreoffice] 01/01: add proper PYUNO_LOADER_PYTHONPATH=$ORIGIN to pythonloader.unorc
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-4.1
in repository libreoffice.
commit ba56ec3d266f5f232304b13a80bb19b86e02c172
Author: Rene Engelhard <rene@debian.org>
Date: Mon Aug 5 17:37:03 2013 +0200
add proper PYUNO_LOADER_PYTHONPATH=$ORIGIN to pythonloader.unorc
This reverts commit 3f9d241044768933e56dd185390f61940de9740.
---
changelog | 5 +++++
rules | 7 +++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/changelog b/changelog
index 99b6907..b675b1c 100644
--- a/changelog
+++ b/changelog
@@ -2,6 +2,11 @@ libreoffice (1:4.1.1~rc1~git20130731-1) UNRELEASED; urgency=low
* new upstream snapshot
+ * debian/rules:
+ - remove PYTHONPATH setting in soffice again and add
+ proper PYUNO_LOADER_PYTHONPATH=$ORIGIN to pythonloader.unorc,
+ thanks Fedora for the hint
+
-- Rene Engelhard <rene@debian.org> Thu, 25 Jul 2013 18:16:23 +0200
libreoffice (1:4.1.0-4) unstable; urgency=low
diff --git a/rules b/rules
index 4b2d60c..e29be33 100755
--- a/rules
+++ b/rules
@@ -2343,6 +2343,7 @@ ifeq "$(ENABLE_PYTHON)" "y"
touch debian/python3-uno/$(OODIR)/program/pythonloader.unorc
chmod u+w debian/python3-uno/$(OODIR)/program/pythonloader.unorc
( echo '[Bootstrap]'; \
+ echo 'PYUNO_LOADER_PYTHONPATH=$$ORIGIN"'; \
echo 'PYTHONHOME=file:///usr/lib/python$(PYMAJOR).$(PYMINOR)' ;\
echo 'PYTHONPATH=$$PYTHONHOME $$PYTHONHOME/site-packages $$PYTHONHOME/lib-dynload $$PYTHONHOME/lib-tk $$ORIGIN' \
) > debian/python3-uno/$(OODIR)/program/pythonloader.unorc
@@ -2654,10 +2655,8 @@ endif
# share/uno_packages/cache...
rm -rf $(PKGDIR)-common/$(OODIR)/presets/uno_packages
- # set PYTHONPATH in soffice and unopkg
- sed -i -e 's,case "`uname -s`" in,PYTHONPATH=$$sd_prog$${PYTHONPATH+:$$PYTHONPATH}\nexport PYTHONPATH\n\ncase "`uname -s`" in,' \
- $(PKGDIR)-common/$(OODIR)/program/soffice
- sed -i -e 's,unset XENVIRONMENT,PYTHONPATH=$$sd_prog$${PYTHONPATH+:$$PYTHONPATH}\nexport PYTHONPATH\n\nunset XENVIRONMENT,' \
+ # set PYTHONPATH in unopkg
+ perl -pi -e 's,unset XENVIRONMENT,unset XENVIRONMENT\n\nexport PYTHONPATH=\"/$(OODIR)/program\"\n\n,' \
$(PKGDIR)-common/$(OODIR)/program/unopkg
ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: