[ooo-build-commit] .: patches/dev300

[René Engelhard]

 patches/dev300/apply                |    2 +-
 patches/dev300/pyuno-ooodir.diff.in |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 00c6232e919efd4deb6198f234771a606479c9fb
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Jun 23 11:26:09 2010 +0200

    make pyuno-ooodir.diff apply again and re-enable
    
    * patches/dev300/apply:
    * patches/dev300/pyuno-ooodir.diff.in:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 9ac25c2..b13a8ff 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1322,7 +1322,7 @@ SectionOwner => fridrich
 [ LinuxOnly ]
 
 system-python-ure-bootstrap.diff, deb#501028, i#90701
-# FIXME dev300-m83 pyuno-ooodir.diff, i#90701
+pyuno-ooodir.diff, i#90701
 system-python-uno-path.diff, i#97629
 
 [ LiberationFontsOnWindows ]
diff --git a/patches/dev300/pyuno-ooodir.diff.in b/patches/dev300/pyuno-ooodir.diff.in
index 2f9eecf..e975934 100644
--- a/patches/dev300/pyuno-ooodir.diff.in
+++ b/patches/dev300/pyuno-ooodir.diff.in
@@ -11,12 +11,12 @@
 --- desktop/scripts/soffice.sh-old	2009-04-08 22:29:43.000000000 +0200
 +++ desktop/scripts/soffice.sh	2009-04-08 22:34:01.000000000 +0200
 @@ -217,6 +217,9 @@
- PATH=$sd_prog${PATH+:$PATH}
- export PATH
+   . /etc/adabasrc
+ fi
  
 +PYTHONPATH=$sd_prog/../basis-link/program${PYTHONPATH+:$PYTHONPATH}
 +export PYTHONPATH
 +
  # test for availability of the fast external splash
  for arg in $@; do
- 	if [ "$arg" = "-nologo" -o "$arg" = "-no-oosplash" ]; then
+     if [ "$arg" = "-nologo" -o "$arg" = "-no-oosplash" ]; then