[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.3-1-24-gc8678c5
The following commit has been merged in the master branch:
commit c8678c528863da50295e7ee2ecbd7ba7b8ea1a03
Author: Rene Engelhard <rene@debian.org>
Date: Fri Sep 16 13:46:03 2011 +0000
fix adding PYTHONPATH to unopkg (closes: #625878)
diff --git a/changelog b/changelog
index d1fd05f..629e4c8 100644
--- a/changelog
+++ b/changelog
@@ -20,12 +20,14 @@ libreoffice (1:3.4.3-2) UNRELEASED; urgency=low
LibreOffice location
* debian/control.reportdesign.in: make -report-builder depend on
-report-builder-bin (>= ${base-version}) (closes: #640900)
- * debian/rules: re-enable -sdbc-postgresql
+ * debian/rules:
+ - re-enable -sdbc-postgresql
+ - fix adding PYTHONPATH to unopkg (closes: #625878)
[ Lionel Elie Mamane ]
* debian/rules: we need translate-toolkit (>= 1.9.0)
- -- Rene Engelhard <rene@debian.org> Fri, 16 Sep 2011 08:28:14 +0000
+ -- Rene Engelhard <rene@debian.org> Fri, 16 Sep 2011 14:10:06 +0200
libreoffice (1:3.4.3-1) unstable; urgency=low
diff --git a/rules b/rules
index 9590073..9dae019 100755
--- a/rules
+++ b/rules
@@ -2916,7 +2916,7 @@ endif
ln -s /$(shell echo $(OODIR) | sed -e s/usr/var/)/share/config/javasettingsunopkginstall.xml \
$(PKGDIR)-common/$(OODIR)/share/config/javasettingsunopkginstall.xml
# set PYTHONPATH in unopkg
- perl -pi -e 's,export PATH,export PATH\n\nexport PYTHONPATH=\"/$(OOBASISDIR)/program\"\n\n,' \
+ perl -pi -e 's,unset XENVIRONMENT,unset XENVIRONMENT\n\nexport PYTHONPATH=\"/$(OOBASISDIR)/program\"\n\n,' \
$(PKGDIR)-common/$(OOBRANDDIR)/program/unopkg
# install DicOOo; we need to do this manually; the
--
LibreOffice packaging repository
Reply to: