ooo-build r14538 - in trunk: . bin patches/dev300

[strba svn gnome org]

Author: strba
Date: Wed Nov 19 08:58:48 2008
New Revision: 14538
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14538&view=rev

Log:
make UnstableLibwpd section buildable without use of black magic

Modified:
   trunk/ChangeLog
   trunk/bin/unpack
   trunk/download.in
   trunk/patches/dev300/libwpd-testing.diff
   trunk/patches/dev300/libwpg-testing.diff
   trunk/patches/dev300/libwps-testing.diff

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Wed Nov 19 08:58:48 2008
@@ -697,6 +697,11 @@
   echo "Copying libwpd package into the tree"
   mkdir -p $OOBUILDDIR/libwpd/download || exit 1
   $GNUCP -a $SRCDIR/$LIBWPD_PACKAGE $OOBUILDDIR/libwpd/download/ || exit 1
+  LIBWPD_UNSTABLE_PACKAGE=libwpd-0.9.0~CVS20081118.tar.gz
+  check_tarball $SRCDIR/$LIBWPD_UNSTABLE_PACKAGE
+  echo "Copying unstable libwpd package into the tree"
+  mkdir -p $OOBUILDDIR/libwpd/download || exit 1
+  $GNUCP -a $SRCDIR/$LIBWPD_UNSTABLE_PACKAGE $OOBUILDDIR/libwpd/download/ || exit 1
 fi
 
 if test "$SYSTEM_LIBWPS" != "YES"; then
@@ -705,6 +710,11 @@
   echo "Copying libwps package into the tree"
   mkdir -p $OOBUILDDIR/libwps/download || exit 1
   $GNUCP -a $SRCDIR/$LIBWPS_PACKAGE $OOBUILDDIR/libwps/download/ || exit 1
+  LIBWPS_UNSTABLE_PACKAGE=libwps-0.2.0~CVS20081118.tar.gz
+  check_tarball $SRCDIR/$LIBWPS_UNSTABLE_PACKAGE
+  echo "Copying unstable libwps package into the tree"
+  mkdir -p $OOBUILDDIR/libwps/download || exit 1
+  $GNUCP -a $SRCDIR/$LIBWPS_UNSTABLE_PACKAGE $OOBUILDDIR/libwps/download/ || exit 1
 fi
 
 if test "$SYSTEM_LIBWPG" != "YES"; then
@@ -713,6 +723,11 @@
   echo "Copying libwpg package into the tree"
   mkdir -p $OOBUILDDIR/libwpg/download || exit 1
   $GNUCP -a $SRCDIR/$LIBWPG_PACKAGE $OOBUILDDIR/libwpg/download/ || exit 1
+  LIBWPG_UNSTABLE_PACKAGE=libwpg-0.2.0~CVS20081118.tar.gz
+  check_tarball $SRCDIR/$LIBWPG_UNSTABLE_PACKAGE
+  echo "Copying unstable libwpg package into the tree"
+  mkdir -p $OOBUILDDIR/libwpg/download || exit 1
+  $GNUCP -a $SRCDIR/$LIBWPG_UNSTABLE_PACKAGE $OOBUILDDIR/libwpg/download/ || exit 1
 fi
 
 if test "$ENABLE_SCSOLVER" = "YES"; then

Modified: trunk/download.in
==============================================================================
--- trunk/download.in	(original)
+++ trunk/download.in	Wed Nov 19 08:58:48 2008
@@ -338,14 +338,17 @@
 
 if ('@SYSTEM_LIBWPD@' eq 'NO') {
    push @files, ( 'libwpd-0.8.14.tar.gz' );
+   push @files, ( 'libwpd-0.9.0~CVS20081118.tar.gz' );
 }
 
 if ('@SYSTEM_LIBWPS@' eq 'NO') {
    push @files, ( 'libwps-0.1.2.tar.gz' );
+   push @files, ( 'libwps-0.2.0~CVS20081118.tar.gz' );
 }
 
 if ('@SYSTEM_LIBWPG@' eq 'NO') {
    push @files, ( 'libwpg-0.1.3.tar.gz' );
+   push @files, ( 'libwpg-0.2.0~CVS20081118.tar.gz' );
 }
 
 if ('@OOOP_FONTS_PACK@' ne '') {

Modified: trunk/patches/dev300/libwpd-testing.diff
==============================================================================
--- trunk/patches/dev300/libwpd-testing.diff	(original)
+++ trunk/patches/dev300/libwpd-testing.diff	Wed Nov 19 08:58:48 2008
@@ -5,7 +5,7 @@
  .ENDIF
  
 -TARFILE_NAME=libwpd-0.8.14
-+TARFILE_NAME=libwpd-0.9.0
++TARFILE_NAME=libwpd-0.9.0~CVS20081118
  #PATCH_FILE_NAME=$(TARFILE_NAME).diff
  BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
  BUILD_DIR=src$/lib

Modified: trunk/patches/dev300/libwpg-testing.diff
==============================================================================
--- trunk/patches/dev300/libwpg-testing.diff	(original)
+++ trunk/patches/dev300/libwpg-testing.diff	Wed Nov 19 08:58:48 2008
@@ -8,7 +8,7 @@
  .ENDIF
  
 -TARFILE_NAME=libwpg-0.1.3
-+TARFILE_NAME=libwpg-0.2.0
++TARFILE_NAME=libwpg-0.2.0~CVS20081118
  #PATCH_FILE_NAME=$(TARFILE_NAME).diff
  BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
  BUILD_DIR=src/lib

Modified: trunk/patches/dev300/libwps-testing.diff
==============================================================================
--- trunk/patches/dev300/libwps-testing.diff	(original)
+++ trunk/patches/dev300/libwps-testing.diff	Wed Nov 19 08:58:48 2008
@@ -8,7 +8,7 @@
  .ENDIF
  
 -TARFILE_NAME=libwps-0.1.2
-+TARFILE_NAME=libwps-0.2.0
++TARFILE_NAME=libwps-0.2.0~CVS20081118
  #PATCH_FILE_NAME=$(TARFILE_NAME).diff
  BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
  BUILD_DIR=src/lib