[ooo-build-commit] configure.in download.in

[René Engelhard]

 configure.in |   16 ++--------------
 download.in  |    2 +-
 2 files changed, 3 insertions(+), 15 deletions(-)

New commits:
commit c01a559bd70854c56217efc4491cc9115a90842f
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Oct 12 04:45:06 2009 +0200

    Revert "support OOo-Dev upstream tarballs" because it breaks
    "normal" ./download and unpack somehow...
    
    This reverts commit 70abd7fb1c0dd86ee4097a14bc5e1763645d82af.

diff --git a/configure.in b/configure.in
index 0b8f0ba..60d13af 100644
--- a/configure.in
+++ b/configure.in
@@ -507,7 +507,7 @@ else
    GREP=grep
 fi
 
-if echo "$with_tag" | $GREP -E ['^(dev300|ooo320|OOO320)'] >/dev/null 2>/dev/null ; then
+if echo "$with_tag" | $GREP -E ['^(src680-m2[4-9][0-9]|dev300|beb300|BEB300|ooo300|OOO300|ooo310|OOO310)'] >/dev/null 2>/dev/null ; then
    APPLY_DIR="$TOOLSDIR/patches/dev300"
 else
    APPLY_DIR="$TOOLSDIR/patches/$with_tag"
@@ -1373,8 +1373,6 @@ elif test "$with_tag" = "OOO310_m11" ; then
    UPSTREAM_VERSION=3.1.0
 elif test "$with_tag" = "OOO310_m18" ; then
    UPSTREAM_VERSION=3.1.1
-else
-   UPSTREAM_TAG=$with_tag
 fi
 if test -n "$UPSTREAM_VERSION"; then
    UPSTREAM_NAME="OOo_${UPSTREAM_VERSION}_src"
@@ -1384,17 +1382,7 @@ if test -n "$UPSTREAM_VERSION"; then
       UPSTREAM_URI=
    else
       SOURCE_TYPE="UPSTREAM"
-      UPSTREAM_URI="http://download.services.openoffice.org/files/stable/${UPSTREAM_VERSION}/"
-   fi
-fi
-if test -n "$UPSTREAM_TAG"; then
-   UPSTREAM_NAME="OOo-Dev_${UPSTREAM_TAG}_src"
-   if test "z$with_mirror" != "z" ; then
-      SOURCE_TYPE="MIRROR"
-      UPSTREAM_URI=
-   else
-      SOURCE_TYPE="UPSTREAM"
-      UPSTREAM_URI="http://download.services.openoffice.org/files/extended/developer/{UPSTREAM_TAG}/"
+      UPSTREAM_URI="http://openoffice.bouncer.osuosl.org/?product=OpenOffice.org&os=src_bzip&version=${UPSTREAM_VERSION}"
    fi
 fi
 AC_SUBST(UPSTREAM_NAME)
diff --git a/download.in b/download.in
index caf829f..a86f2d7 100755
--- a/download.in
+++ b/download.in
@@ -176,7 +176,7 @@ sub source_file_ooo($)
     }
     elsif ( '@SOURCE_TYPE@' eq "UPSTREAM" ) {
         die "Up-stream doesn't have a package split" if ($SPLIT);
-        source_file( '@UPSTREAM_URI@' . '@UPSTREAM_NAME@' . "_$upstream_what.tar.bz2" );
+        source_file( '@UPSTREAM_URI@' . "&lang=$upstream_what", '@UPSTREAM_NAME@' . "_$upstream_what.tar.bz2" );
     }
     elsif ( '@SOURCE_TYPE@' eq "MIRROR" ) {
         source_file( '@UPSTREAM_NAME@' . "_$upstream_what.tar.bz2" );