[SCM] LibreOffice packaging repository branch, debian-experimental-4.1, updated. libreoffice_4.1.0_beta2-2-47-g558fa71
The following commit has been merged in the debian-experimental-4.1 branch:
commit 558fa7177aabf7023eb534215d706ca433bf14e1
Author: Rene Engelhard <rene@rene-engelhard.de>
Date: Wed Jun 19 19:20:28 2013 +0200
fix sw_python test; use echos during install for uno.py, not a patch...
diff --git a/changelog b/changelog
index 410d94e..c2fbc10 100644
--- a/changelog
+++ b/changelog
@@ -13,8 +13,13 @@ libreoffice (1:4.1.0~rc1-1) UNRELEASED; urgency=low
all bridges are ported to the new gcc 4.7+ behaviour
- remove last buildd special-casing: build --enable-verbose everyhwere,
also on the buildds
+ * debian/patches/make-pyuno-work-for-system-wide-module-install.diff,
+ debian/patches/didable-sw-python.diff, debian/rules:
+ remove patch(es), add the lines to uno.oy during install ("stolen" from
+ Fedora)
+ Otherwise the python-based unit tests fail miserably (sw_python).
- -- Rene Engelhard <rene@debian.org> Mon, 17 Jun 2013 19:31:11 +0200
+ -- Rene Engelhard <rene@debian.org> Wed, 19 Jun 2013 19:05:22 +0200
libreoffice (1:4.1.0~beta2-2) experimental; urgency=low
diff --git a/patches/disable-sw_python.diff b/patches/disable-sw_python.diff
deleted file mode 100644
index a58ff67..0000000
--- a/patches/disable-sw_python.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
-index 202c67c..a9b7e0b 100644
---- a/sw/Module_sw.mk
-+++ b/sw/Module_sw.mk
-@@ -73,9 +73,9 @@ endif
-
- ifneq ($(DISABLE_PYTHON),TRUE)
- ifneq ($(OS),WNT)
--$(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
-- PythonTest_sw_python \
--))
-+#$(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
-+# PythonTest_sw_python \
-+#))
- endif
- endif
-
diff --git a/patches/make-pyuno-work-with-system-wide-module-install.diff b/patches/make-pyuno-work-with-system-wide-module-install.diff
deleted file mode 100644
index 3317b3c..0000000
--- a/patches/make-pyuno-work-with-system-wide-module-install.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
-index defd7b2..ea2a809 100755
---- a/desktop/scripts/soffice.sh
-+++ b/desktop/scripts/soffice.sh
-@@ -128,6 +128,9 @@ if echo "$checks" | grep -q "cc" ; then
- exit 1;
- fi
-
-+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
-+export PYTHONPATH
-+
- case "`uname -s`" in
- NetBSD|OpenBSD|FreeBSD|DragonFly)
- # this is a temporary hack until we can live with the default search paths
-diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
-index f93ac5e..92a2891 100644
---- a/pyuno/source/module/uno.py
-+++ b/pyuno/source/module/uno.py
-@@ -26,8 +26,12 @@
- # except in compliance with the License. You may obtain a copy of
- # the License at http://www.apache.org/licenses/LICENSE-2.0 .
- #
-+import os
- import sys
-
-+sys.path.append('/usr/lib/libreoffice/program')
-+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
-+ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc"
- import pyuno
-
- try:
-diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py
-index 610ac5f..df243d0 100755
---- a/scripting/source/pyprov/officehelper.py
-+++ b/scripting/source/pyprov/officehelper.py
-@@ -44,7 +44,7 @@ def bootstrap():
- if "UNO_PATH" in os.environ:
- sOffice = os.environ["UNO_PATH"]
- else:
-- sOffice = "" # lets hope for the best
-+ sOffice = "/usr/lib/libreoffice/program"
- sOffice = os.path.join(sOffice, "soffice")
- if platform.startswith("win"):
- sOffice += ".exe"
diff --git a/patches/series b/patches/series
index e0467fa..74888d3 100644
--- a/patches/series
+++ b/patches/series
@@ -13,7 +13,6 @@ sensible-browser.diff
reportdesign-mention-package.diff
jdbc-driver-classpaths.diff
mysqlcppconn-libmysqlclient-SONAME.diff
-make-pyuno-work-with-system-wide-module-install.diff
#search-usr-share-for-images.diff
make-package-modules-not-suck.diff
mediwiki-oor-replace.diff
@@ -26,7 +25,6 @@ disable-flaky-unoapi-tests.diff
dont-touch-urd.diff
wheezy-backports-python.diff
fix-internal-hsqldb-build.diff
-disable-sw_python.diff
javadoc-optional.diff
show-the-startcenter.diff
fix-kk-in-lo-xlate-lang.diff
diff --git a/rules b/rules
index 1d73eec..1ccd0c8 100755
--- a/rules
+++ b/rules
@@ -2329,7 +2329,14 @@ endif
ifeq "$(ENABLE_PYTHON)" "y"
# PyUNO packaging
install -d $(PYTHON_SITE)
- mv debian/python3.3-uno/$(OODIR)/program/uno.py $(PYTHON_SITE)
+ # prepend stuff so that it works when the module is not in LOs
+ # 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 echo "os.putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:$(OODIR)/program/fundamentalrc')" >> $(PYTHON_SITE)/uno.py
+ cat debian/python3.3-uno/$(OODIR)/program/uno.py >> $(PYTHON_SITE)/uno.px
+ rm -f debian/python3.3-uno/$(OODIR)/program/uno.py
mv debian/python3.3-uno/$(OODIR)/program/unohelper.py $(PYTHON_SITE)
touch debian/python3.3-uno/$(OODIR)/program/pythonloader.unorc
chmod u+w debian/python3.3-uno/$(OODIR)/program/pythonloader.unorc
--
LibreOffice packaging repository
Reply to: