[ooo-build-commit] .: 2 commits - configure.in download.in

[René Engelhard]

 configure.in |    2 +-
 download.in  |    9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 85164707e0bbc4cda3d1d5014f603d84ecbb90e7
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Jul 5 23:48:47 2010 +0200

    also use DOWNLOAD for dev300-m84
    
    * configure.in:

diff --git a/configure.in b/configure.in
index 0f1b1f5..9b303de 100644
--- a/configure.in
+++ b/configure.in
@@ -1610,7 +1610,7 @@ if test -n "$UPSTREAM_VERSION"; then
       UPSTREAM_URI="http://openoffice.bouncer.osuosl.org/?product=OpenOffice.org&os=src_bzip&version=${UPSTREAM_VERSION}"
    fi
 fi
-if test "$with_tag" = "dev300-m77" -o "$with_tag" = "dev300-m83" ; then
+if test "$with_tag" = "dev300-m77" -o "$with_tag" = "dev300-m83" -o "$with_tag" = "dev300-m84"; then
     SOURCE_TYPE="DOWNLOAD"
 fi
 AC_SUBST(UPSTREAM_NAME)
commit 77b53f01406e826fd93b55ffa0579e49d9be99e9
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Jul 5 18:55:26 2010 +0200

    don't add mdds to source_files for m84/ooo330
    
    * download.in: it's upstream, so fetch_tarballs.sh will get it for us

diff --git a/download.in b/download.in
index 7dac980..8c66ba5 100755
--- a/download.in
+++ b/download.in
@@ -451,7 +451,14 @@ source_file( "biblio.tar.bz2" );
 
 # Required to build sc.
 if ('@SYSTEM_MDDS@' ne 'YES') {
-    source_file( "cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2" );
+    $tag = "@CVSTAG@";
+    $tag =~ tr/A-Z/a-z/;
+    $tag =~ s/_m/-m/;
+    $_ = $tag;
+    ($mws, $minor) = split/-/;
+    if (/ooo330/i || (/dev300/i && "$minor" ne "m84" )) {
+        source_file( "cf8a6967f7de535ae257fa411c98eb88-mdds_0.3.0.tar.bz2" );
+    }
 }
 
 if (!$SPLIT && ($download_all || '@ENABLE_BINFILTER@' eq 'TRUE')) {