[ooo-build-commit] .: bin/setup.in bin/unpack download.in

[René Engelhard]

 bin/setup.in |    1 -
 bin/unpack   |    7 -------
 download.in  |    5 -----
 3 files changed, 13 deletions(-)

New commits:
commit ca104c812801e5ed1d7a308f43543a2a563093d6
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Sep 13 18:06:19 2010 +0200

    remove download and copy of ooo_oxygen_images, seems it's in the clone already

diff --git a/bin/setup.in b/bin/setup.in
index 7c98629..a607853 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -88,7 +88,6 @@ export GNUCP=@GNUCP@
 GNUPATCH=@GNUPATCH@
 GNUTAR=@GNUTAR@
 DRINK="@DRINK@"
-OXYGEN_IMAGES_TAR='@OXYGEN_IMAGES_TAR@'
 if [ -z "$TARFILE_LOCATION" ]; then TARFILE_LOCATION=$SRCDIR; fi
 
 if test -f "$TOOLSDIR/distro-configs/Common.conf" ; then
diff --git a/bin/unpack b/bin/unpack
index 41d7cef..30401d9 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -929,13 +929,6 @@ if test "x$OOOBLOGGER_EXTENSION" != "x"; then
     $GNUCP $SRCDIR/$OOOBLOGGER_EXTENSION -d $OOBUILDDIR/extras/source/extensions || exit 1
 fi
 
-if test "x$OXYGEN_IMAGES_TAR" != "x"; then
-    check_tarball $SRCDIR/$OXYGEN_IMAGES_TAR
-    echo "Copying $OXYGEN_IMAGES_TAR into external_images"
-    mkdir -p $OOBUILDDIR/external_images || exit 1
-    $GNUCP $SRCDIR/$OXYGEN_IMAGES_TAR $OOBUILDDIR/external_images/ooo_oxygen_images.tar.gz || exit 1
-fi
-
 if echo $PROPAGATED_ARGS | grep -q enable-mysql-connector; then
     if ! echo $PROPAGATED_ARGS | grep -q system-mysql-cppconn; then
 	if [ ! -f $OOBUILDDIR/mysqlcppconn/download/mysql-connector-cpp.zip ]; then
diff --git a/download.in b/download.in
index dbd6140..2d1e035 100755
--- a/download.in
+++ b/download.in
@@ -120,7 +120,6 @@ sub download_tests_dependencies() {
     'extras-.*'                          => '@MIRROR@/SRC680',
     'ooo_custom_images.*'                => '@MIRROR@/SRC680',
     'ooo_crystal_images.*'               => '@MIRROR@/SRC680',
-    'ooo_oxygen_images-*'                => '@MIRROR@/DEV300',
     'ooo-cli-prebuilt-*'                 => '@MIRROR@/DEV300',
     'mdbtools.*'                         => '@MIRROR@/SRC680',
     'libpixman-.*'                       => '@MIRROR@/SRC680',
@@ -607,10 +606,6 @@ if ('@OOOBLOGGER_EXTENSION@' ne '') {
     source_file( '@OOOBLOGGER_EXTENSION@' );
 }
 
-if ('@OXYGEN_IMAGES_TAR@' ne '') {
-    source_file( '@OXYGEN_IMAGES_TAR@' );
-}
-
 $suntemplang = trim('@SUNTEMPLATES_LANG@');
 @templang = split (/ /, $suntemplang);
 foreach (@templang) {