This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 3f9d241044768933e56dd185390f61940de9740f
Author: Rene Engelhard <r...@debian.org>
Date: Thu Aug 1 19:35:53 2013 +0200
readd PYTHONPATH setting to soffice.sh as it's apparently still needed
(closes: #718403)
---
changelog | 9 +++++++++
rules | 6 ++++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/changelog b/changelog
index 39641e6..71b1ab7 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,12 @@
+libreoffice (1:4.1.0-4) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - readd PYTHONPATH setting to soffice (as for unopkg)
+ as it's apparently still needed for the python script provider
+ to work (closes: #718403)
+
+ -- Rene Engelhard <r...@debian.org> Thu, 01 Aug 2013 18:12:02 +0200
+
libreoffice (1:4.1.0-3) unstable; urgency=low
* debian/rules:
diff --git a/rules b/rules
index f5073c6..b49b12a 100755
--- a/rules
+++ b/rules
@@ -2654,8 +2654,10 @@ endif
# share/uno_packages/cache...
rm -rf $(PKGDIR)-common/$(OODIR)/presets/uno_packages
- # set PYTHONPATH in unopkg
- perl -pi -e 's,unset XENVIRONMENT,unset XENVIRONMENT\n\nexport
PYTHONPATH=\"/$(OODIR)/program\"\n\n,' \
+ # 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,' \
$(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
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1v4znl-0003il...@vasks.debian.org
