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

[René Engelhard]

 bin/build-ooo        |    7 +++----
 patches/dev300/apply |    2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit fffe14cefec884519dcf24fa238432b4da401d5b
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Jun 10 17:50:12 2010 +0200

    actually allow nodep=... when *not* building dmake here.
    
    * bin/build-ooo: check for soltools' makedepend instead, dmake can we used
      from the system and thus isn't necessarily there

diff --git a/bin/build-ooo b/bin/build-ooo
index 6a4cd28..4553a94 100755
--- a/bin/build-ooo
+++ b/bin/build-ooo
@@ -75,12 +75,11 @@ else
     . $OOBUILDDIR/*.Set.sh
 fi
 
-# Check to see if dmake was not there - if not, this is a from-pristine build
-echo "Build: z$BUILD_DMAKE == zYES -a ! -f $SOLARENV/$OUTPATH/bin/dmake";
-if test "z$BUILD_DMAKE" == "zYES" -a ! -f "$SOLARENV/$OUTPATH/bin/dmake"; then
+# Check to see if makedepend was not there - if not, this is a from-pristine build
+if test ! -f $OOBUILDDIR/soltools/$OUTPATH/bin/makedepend; then 
 	# Accelerate straight-through compiles by not building / using dependencies
 	echo "A very clean straight-through build - deferring dep generation"
-	export nodep=1
+	export nodep=true
 else
     echo "Building with full dependencies"
 fi
commit 5055533c386df5f36bb72a384d8ffdf32f0171f9
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Jun 9 18:46:13 2010 +0200

    cws-koheiextref01-* and sw-64bit-Size-mismatch.diff are in m82
    
    * patches/dev300/apply:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index b64b0a6..6a020c4 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -211,6 +211,7 @@ cws-koheichart02-xmloff.diff, kohei
 cws-koheicopyborder-sc.diff,  kohei
 cws-koheicopyborder-svx.diff, kohei
 
+[ CWSBackports < dev300-m82 ]
 # koheiextref01 cws
 cws-koheiextref01-offapi.diff, kohei
 cws-koheiextref01-oox.diff,    kohei
@@ -2299,6 +2300,7 @@ oooXXXX.partial-revert-ooo95118.diff
 # it helps to get automatic depencies when packaging extensions in RPMs
 ooo83878.unopkg.enablelinking.diff, i#83878, bnc#493994, caolan
 
+[ FedoraCommonFixes < dev300-m82 ]
 # graphical bullets invisible after saving documents on 64bit Linux
 sw-64bit-Size-mismatch.diff, i#101131, caolan