[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-180-gf775fb6

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the debian-experimental-3.5 branch:
commit c8ffb26a1f0b663998f98589c103f1f67829b63c
Author: Rene Engelhard <rene@debian.org>
Date:   Thu Dec 22 22:38:03 2011 +0100

    migrate system-python-{ure-bootstrap,uno-path}.diff and pyuno-ooodir.diff from libreoffice/build

diff --git a/changelog b/changelog
index 5eda3fe..e6b565b 100644
--- a/changelog
+++ b/changelog
@@ -34,6 +34,8 @@ libreoffice (1:3.5.0~beta2-1) UNRELEASED; urgency=low
      - migrate reportdesign-mention-package.diff from libreoffice/build
      - migrate jdbc-driver-classpaths.diff from libreoffice/build
      - migrate mysqlcppconn-mysqlclient-SONAME.diff from libreoffice/build
+     - migrate system-python-{ure-bootstrap,uno-path}.diff and pyuno-ooodir.diff
+       from libreoffice/build
 
   [ Bjoern Michaelsen ]
   * debian/rules:
@@ -52,7 +54,7 @@ libreoffice (1:3.5.0~beta2-1) UNRELEASED; urgency=low
       sensible-lomua; add icedove and thunderbird as fallbacks
     - migrate sensible-browser.diff from libreoffice/build
 
- -- Rene Engelhard <rene@debian.org>  Wed, 21 Dec 2011 22:32:48 +0100
+ -- Rene Engelhard <rene@debian.org>  Thu, 22 Dec 2011 22:36:58 +0100
 
 libreoffice (1:3.4.4-3) UNRELEASED; urgency=low
 
diff --git a/patches/make-pyuno-work-with-system-wide-module-install.diff b/patches/make-pyuno-work-with-system-wide-module-install.diff
new file mode 100644
index 0000000..532b5bc
--- /dev/null
+++ b/patches/make-pyuno-work-with-system-wide-module-install.diff
@@ -0,0 +1,44 @@
+diff --git a/desktop/scripts/soffice.sh.in b/desktop/scripts/soffice.sh.in
+index defd7b2..ea2a809 100755
+--- a/desktop/scripts/soffice.sh.in
++++ b/desktop/scripts/soffice.sh.in
+@@ -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 @@
+ # for a copy of the LGPLv3 License.
+ #
+ #*************************************************************************
++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
+@@ -53,7 +53,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 a3abc8a..449b17c 100644
--- a/patches/series
+++ b/patches/series
@@ -21,3 +21,4 @@ fix-unordf_complex-check.diff
 reportdesign-mention-package.diff
 jdbc-driver-classpaths.diff
 mysqlcppconn-mysqlclient-SONAME.diff
+make-pyuno-work-with-system-wide-module-install.diff

-- 
LibreOffice packaging repository