[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_4.1.0-1-4-gd2dbab3
The following commit has been merged in the master branch:
commit d2dbab37c2b933abf510d9bd4f879d75b628004b
Author: Rene Engelhard <rene@debian.org>
Date: Fri Jul 26 00:06:15 2013 +0200
fix path in uno.py
diff --git a/changelog b/changelog
index b4390e8..e7dd51b 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:4.1.0-2) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - fix uno.py, actually add starting / in LOs path
+
+ -- Rene Engelhard <rene@debian.org> Thu, 25 Jul 2013 18:33:02 +0200
+
libreoffice (1:4.1.0-1) unstable; urgency=low
* new upstream release
diff --git a/control b/control
index 38acf51..9004f22 100644
--- a/control
+++ b/control
@@ -167,7 +167,7 @@ XS-Python3-Version: 3.3
XS-Testsuite: autopkgtest
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
-Bugs:
+Bugs: mailto:debian-openoffice@lists.debian.org
Homepage: http://www.libreoffice.org
Package: libreoffice
diff --git a/rules b/rules
index 4fd86cf..be2588d 100755
--- a/rules
+++ b/rules
@@ -2335,8 +2335,8 @@ ifeq "$(ENABLE_PYTHON)" "y"
# directories but in $(PYTHON_SITE). Can't be a patch (anymore)
# as otherwise the python-based unittests fail miserably.
echo "import sys, os" > $(PYTHON_SITE)/uno.py
- echo "sys.path.append('$(OODIR)/program')" >> $(PYTHON_SITE)/uno.py
- echo "os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:$(OODIR)/program/fundamentalrc')" >> $(PYTHON_SITE)/uno.py
+ echo "sys.path.append('/$(OODIR)/program')" >> $(PYTHON_SITE)/uno.py
+ echo "os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:/$(OODIR)/program/fundamentalrc')" >> $(PYTHON_SITE)/uno.py
cat debian/python3-uno/$(OODIR)/program/uno.py >> $(PYTHON_SITE)/uno.py
rm -f debian/python3-uno/$(OODIR)/program/uno.py
mv debian/python3-uno/$(OODIR)/program/unohelper.py $(PYTHON_SITE)
--
LibreOffice packaging repository
Reply to: