[Libreoffice-commits] .: configure.in download.in patches/dev300

[Fridrich Strba]

 configure.in                       |    6 +++---
 download.in                        |    6 +++---
 patches/dev300/libwpd-testing.diff |    2 +-
 patches/dev300/libwpg-testing.diff |    2 +-
 patches/dev300/libwps-testing.diff |    2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 17f55cd4ba7e87a55747d586c192a2d4d5d8288e
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Nov 16 13:09:44 2010 +0100

    Adapt the "unstable" libwp* patches to the new stable libwpd/s/g releses

diff --git a/configure.in b/configure.in
index 1853c1e..ae5679b 100755
--- a/configure.in
+++ b/configure.in
@@ -1409,7 +1409,7 @@ if test -n "$with_system_libwpd" && test "$with_system_libwpd" = "yes"; then
 else
     SYSTEM_LIBWPD=NO
     if test "$UNSTABLE_WP" = "YES"; then
-        LIBWPD_TARBALL=32c8599f6f4cbb420e485288f74b398a-libwpd-0.9.0~CVS20081118.tar.gz
+        LIBWPD_TARBALL=86e390f015e505dd71a66f0123c62f09-libwpd-0.9.0.tar.bz2
     fi
 fi
 AC_SUBST(SYSTEM_LIBWPD)
@@ -1420,7 +1420,7 @@ if test -n "$with_system_libwps" && test "$with_system_libwps" = "yes"; then
 else
     SYSTEM_LIBWPS=NO
     if test "$UNSTABLE_WP" = "YES"; then
-        LIBWPS_TARBALL=3c77ef8cb348ab6f98ebf53961cc59ea-libwps-0.2.0~CVS20081118.tar.gz
+        LIBWPS_TARBALL=9e436bff44c60dc8b97cba0c7fc11a5c-libwps-0.2.0.tar.bz2
     fi
 fi
 AC_SUBST(SYSTEM_LIBWPS)
@@ -1431,7 +1431,7 @@ if test "$with_system_libwpg" = "yes"; then
 else
     SYSTEM_LIBWPG=NO
     if test "$UNSTABLE_WP" = "YES"; then
-        LIBWPG_TARBALL=6f0defec3c4342c0f3e1a1fe50f3f5f9-libwpg-0.2.0~CVS20081118.tar.gz
+        LIBWPG_TARBALL=5ba6a61a2f66dfd5fee8cdd4cd262a37-libwpg-0.2.0.tar.bz2
     fi
 fi
 AC_SUBST(SYSTEM_LIBWPG)
diff --git a/download.in b/download.in
index bbddc4c..f2929c1 100755
--- a/download.in
+++ b/download.in
@@ -176,11 +176,11 @@ sub download_tests_dependencies() {
 # Windows .ico icons
     'ooo-windows-icons-0.2.tar.bz2'      => '@MIRROR@/OOO300',
 # Updated libwpd
-    '*libwpd-*'                          => '@MIRROR@/libwpd',
+    '*libwpd-*'                          => '@MIRROR@/src',
 # MS Works importer bits
-    '*libwps-*'                          => '@MIRROR@/SRC680',
+    '*libwps-*'                          => '@MIRROR@/src',
 # WPG importer bits
-    '*libwpg-*'                          => '@MIRROR@/SRC680',
+    '*libwpg-*'                          => '@MIRROR@/src',
 # cairo sources
     'cairo-.*'                           => 'http://cairographics.org/releases/',
 # OxygenOffice extras
diff --git a/patches/dev300/libwpd-testing.diff b/patches/dev300/libwpd-testing.diff
index 40abb54..bfb5a18 100644
--- a/patches/dev300/libwpd-testing.diff
+++ b/patches/dev300/libwpd-testing.diff
@@ -7,7 +7,7 @@
 -TARFILE_NAME=libwpd-0.8.14
 -TARFILE_MD5=64d66018897d759358f454010b6e75d2
 +TARFILE_NAME=libwpd-0.9.0
-+TARFILE_MD5=b0b0e72cb18878461cb6530f070253cb
++TARFILE_MD5=86e390f015e505dd71a66f0123c62f09
  BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
  BUILD_DIR=src$/lib
  
diff --git a/patches/dev300/libwpg-testing.diff b/patches/dev300/libwpg-testing.diff
index 1327425..84c37cc 100644
--- a/patches/dev300/libwpg-testing.diff
+++ b/patches/dev300/libwpg-testing.diff
@@ -10,7 +10,7 @@
 -TARFILE_NAME=libwpg-0.1.3
 -TARFILE_MD5=db556b750bf3eac8481a4cc5e29e5af1
 +TARFILE_NAME=libwpg-0.2.0
-+TARFILE_MD5=e7df3a54ca033d744c465356d32bf6ad
++TARFILE_MD5=5ba6a61a2f66dfd5fee8cdd4cd262a37
  BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
  BUILD_DIR=src/lib
  
diff --git a/patches/dev300/libwps-testing.diff b/patches/dev300/libwps-testing.diff
index 96efae2..3dc4f5a 100644
--- a/patches/dev300/libwps-testing.diff
+++ b/patches/dev300/libwps-testing.diff
@@ -10,7 +10,7 @@
 -TARFILE_NAME=libwps-0.1.2
 -TARFILE_MD5=799fc3b835a79adce8c88a3fee0150c1
 +TARFILE_NAME=libwps-0.2.0
-+TARFILE_MD5=6e637742d12b15d44b81736276885329
++TARFILE_MD5=9e436bff44c60dc8b97cba0c7fc11a5c
  BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
  BUILD_DIR=src/lib