[Libreoffice-commits] .: Branch 'libreoffice-3-3' - configure.in ooo.lst

[Fridrich Strba]

 configure.in |    6 +++---
 ooo.lst      |    8 +++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

New commits:
commit 012be493bb1510f5fb83e2b734b833f1ccee4a29
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Nov 16 13:55:28 2010 +0100

    Use the new stable libwp* releases as default

diff --git a/configure.in b/configure.in
index 7fe61eb..f03ca25 100644
--- a/configure.in
+++ b/configure.in
@@ -3971,7 +3971,7 @@ if test -n "$with_system_libwpd" -o -n "$with_system_libs" && \
         test "$with_system_libwpd" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_LIBWPD=YES
-    PKG_CHECK_MODULES( LIBWPD, libwpd-0.8 )
+    PKG_CHECK_MODULES( LIBWPD, libwpd-0.9 libwpd-stream-0.9 )
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LIBWPD=NO
@@ -4018,7 +4018,7 @@ if test -n "$with_system_libwps" -o -n "$with_system_libs" && \
         test "$with_system_libwps" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_LIBWPS=YES
-    PKG_CHECK_MODULES( LIBWPS, libwps-0.1 )
+    PKG_CHECK_MODULES( LIBWPS, libwps-0.2 )
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LIBWPS=NO
@@ -4036,7 +4036,7 @@ if test -n "$with_system_libwpg" -o -n "$with_system_libs" && \
         test "$with_system_libwpg" != "no"; then
     AC_MSG_RESULT([external])
     SYSTEM_LIBWPG=YES
-    PKG_CHECK_MODULES( LIBWPG, libwpg-0.1 )
+    PKG_CHECK_MODULES( LIBWPG, libwpg-0.2 )
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LIBWPG=NO
diff --git a/ooo.lst b/ooo.lst
index 59b247f..802a85a 100644
--- a/ooo.lst
+++ b/ooo.lst
@@ -77,11 +77,9 @@ debc62758716a169df9f62e6ab2bc634-zlib-1.2.3.tar.gz
 e3738abd0d3ce1870dc1fd1f22bba5b1-icu4c-4_2_1-src.tgz
 0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz
 71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz
-http://download.go-oo.org/SRC680
-799fc3b835a79adce8c88a3fee0150c1-libwps-0.1.2.tar.gz
-db556b750bf3eac8481a4cc5e29e5af1-libwpg-0.1.3.tar.gz
-http://download.go-oo.org/libwpd
-64d66018897d759358f454010b6e75d2-libwpd-0.8.14.tar.gz
+5ba6a61a2f66dfd5fee8cdd4cd262a37-libwpg-0.2.0.tar.bz2
+86e390f015e505dd71a66f0123c62f09-libwpd-0.9.0.tar.bz2
+9e436bff44c60dc8b97cba0c7fc11a5c-libwps-0.2.0.tar.bz2
 http://download.go-oo.org/extern
 185d60944ea767075d27247c3162b3bc-unowinreg.dll
 http://www.numbertext.org/linux