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

[René Engelhard]

 patches/dev300/apply                                   |   17 ++++++++++++-----
 patches/dev300/odk-configure-honour-ure-link.diff      |   16 ++++++++++++++++
 patches/dev300/packregistry-dont-strip-whitespace.diff |   12 ++++++++++++
 3 files changed, 40 insertions(+), 5 deletions(-)

New commits:
commit 14c635d6fdcbc1b87b5597ad873072cc1d9c0231
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Jul 14 11:53:22 2010 +0200

    buildfix-instsetoo_native-no-PKGFORMAT.diff will be in ooo330-m1
    
    * patches/dev300/apply:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 899a77c..af4958b 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -273,7 +273,7 @@ gcc-HelpLinker.diff # RENAMED transex3 -> l10ntools
 # add the .archive flag to some instsetoo_native/util/makefile.mk rules
 buildfix-instsetoo_native-archive.diff, i#111617
 
-[ TemporaryHacks >= dev300-m83 ]
+[ TemporaryHacks >= dev300-m83 < ooo330-m1 ]
 buildfix-instsetoo_native-no-PKGFORMAT.diff, i#112761, rengelha
 
 [ TemporaryHacks and not MacOSXOnly ]
commit b5b764b899cbfaa648973648cc49af199c4a063f
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Jul 9 20:31:50 2010 +0200

    fix odks configure.pl to honour ure-link
    
    * patches/dev300/apply:
    * patches/dev300/odk-configure-honour-ure-link.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index f71a0ad..899a77c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1263,6 +1263,10 @@ sdk-gid-module-name.diff, pmladek, i#64802
 # do not pack any potential .orig files with ppds
 psprint_config-no-orig.diff, jholesov
 
+[ SdkFixes ]
+# fix configure.pl
+odk-configure-honour-ure-link.diff
+
 [ DebianOnly ]
 open-url-support-iceanimals.diff
 
diff --git a/patches/dev300/odk-configure-honour-ure-link.diff b/patches/dev300/odk-configure-honour-ure-link.diff
new file mode 100644
index 0000000..4646410
--- /dev/null
+++ b/patches/dev300/odk-configure-honour-ure-link.diff
@@ -0,0 +1,16 @@
+--- odk/configure.pl-old	2010-07-09 16:48:56.000000000 +0200
++++ odk/configure.pl	2010-07-09 16:50:37.000000000 +0200
+@@ -31,12 +31,7 @@
+ 
+ $main::OFFICE_BASE_HOME = substr($main::sdkpath, 0, rindex($main::sdkpath, "/sdk"));
+ 
+-if ( $main::operatingSystem =~ m/darwin/ )
+-{
+-#	$main::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`;
+-} else {
+-	$main::OO_SDK_URE_HOME = `cd $main::sdkpath/../../ure && pwd`;
+-}
++$main::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`;
+ chomp($main::OO_SDK_URE_HOME);
+ 
+ $main::OO_SDK_MAKE_HOME = "";
commit d71ef65d3bfbcac8f169a3c4b8f6b6817e7b8880
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Jul 9 20:23:43 2010 +0200

    configure-fix-lpsolve-depends.diff will be in ooo330-m1
    
    * patches/dev300/apply:
    * patches/dev300/packregistry-dont-strip-whitespace.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index de4a391..f71a0ad 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -956,16 +956,17 @@ oosplash-etc-openoffice-sofficerc.diff
 ubuntu-openoffice-java-common.diff, ccheney
 ubuntu-javaldx.diff, ccheney
 
-[ DebianBaseOnly ]
 # mention openoffice.org-report-builder instead of getting people
 # to download it from elsewhere
 reportdesign-mention-package.diff, rengelha
 
-
-[ DebianBaseOnly ]
 # build using -O2 on x86 and sparc according to Debian policy.
 debian-opt.diff
 
+# don't strip whitespace to get readable (and  human-editable) .xcds. Important
+# when we move them to /etc
+packregistry-dont-strip-whitespace.diff, rengelha
+
 [ LocalizeFixes and DebianBaseOnly ]
 # mention openoffice.org-report-builder instead of getting people
 # to download it from elsewhere
@@ -3179,9 +3180,11 @@ store-crash-fix.diff, thorsten
 sd-ppt-fix-document-summary-reading.diff, n#546758, rodo
 # fixes crasher in xml parser
 unoxml-fix-empty-xmlns.diff, rodo
-configure-fix-lpsolve-depends.diff, janneke
 build-fix-xulrunner-npapi-inc.diff, janneke
 
+[ Fixes < ooo330-m1 ]
+configure-fix-lpsolve-depends.diff, janneke
+
 [ DebianSidOnly ]
 # link dynamically with liblpsolve55.so
 system-lpsolve-rpath.diff, rengelha
diff --git a/patches/dev300/packregistry-dont-strip-whitespace.diff b/patches/dev300/packregistry-dont-strip-whitespace.diff
new file mode 100644
index 0000000..e54255f
--- /dev/null
+++ b/patches/dev300/packregistry-dont-strip-whitespace.diff
@@ -0,0 +1,12 @@
+--- solenv/bin/packregistry.xslt
++++ solenv/bin/packregistry.xslt
+@@ -29,9 +29,6 @@
+ <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:oor="http://openoffice.org/2001/registry">
+   <xsl:param name="prefix"/>
+-  <xsl:strip-space elements="*"/>
+-  <xsl:preserve-space elements="value it"/>
+-    <!-- TODO: strip space from "value" elements that have "it" children -->
+   <xsl:template match="/">
+     <oor:data xmlns:xs="http://www.w3.org/2001/XMLSchema"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">