summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2013-05-14 12:23:41 +0200
committerDavid Tardon <dtardon@redhat.com>2013-05-14 10:51:51 +0000
commit417666b84464d121b1dc9c518d2043973e072ca5 (patch)
treed7a81dd6db2dd8dfd839c2c90546e118329befaa
parent3571c19f0e8f88f612e9c74be5c1c68f6de43cd4 (diff)
Uploading libwpd 0.9.8 release
(cherry picked from commit 9febe2cc5000046bf49b973efb3970013a5b84e1) Conflicts: download.lst Change-Id: I03a9a06058a8fbde736b3d897918e8eea8c2a1d6 Reviewed-on: https://gerrit.libreoffice.org/3903 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
-rw-r--r--download.lst2
-rw-r--r--libwpd/ExternalPackage_libwpd.mk22
2 files changed, 12 insertions, 12 deletions
diff --git a/download.lst b/download.lst
index c93f9ec98c25..cf4e21984009 100644
--- a/download.lst
+++ b/download.lst
@@ -77,7 +77,7 @@ export SWING_TARBALL := 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
export TOMCAT_TARBALL := 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
export UCPP_TARBALL := 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
export VIGRA_TARBALL := ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz
-export WPD_TARBALL := e7f84e3199dfee9122949448cab3823f-libwpd-0.9.6.tar.bz2
+export WPD_TARBALL := 972afb8fdf02d9e7517e258b7fa7f0eb-libwpd-0.9.8.tar.bz2
export WPG_TARBALL := 9d283e02441d8cebdcd1e5d9df227d67-libwpg-0.2.1.tar.bz2
export WPS_TARBALL := d197bd6211669a2fa4ca648faf04bcb1-libwps-0.2.7.tar.bz2
export XPDF_TARBALL := 599dc4cc65a07ee868cf92a667a913d2-xpdf-3.02.tar.gz
diff --git a/libwpd/ExternalPackage_libwpd.mk b/libwpd/ExternalPackage_libwpd.mk
index f2375d190c43..ed104aa3c746 100644
--- a/libwpd/ExternalPackage_libwpd.mk
+++ b/libwpd/ExternalPackage_libwpd.mk
@@ -10,20 +10,20 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,libwpd,wpd))
$(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd,inc/external/libwpd,\
- src/lib/libwpd.h \
- src/lib/WPDocument.h \
- src/lib/WPXBinaryData.h \
- src/lib/WPXDocumentInterface.h \
- src/lib/WPXProperty.h \
- src/lib/WPXPropertyList.h \
- src/lib/WPXString.h \
- src/lib/WPXPropertyListVector.h \
+ inc/libwpd/libwpd.h \
+ inc/libwpd/WPDocument.h \
+ inc/libwpd/WPXBinaryData.h \
+ inc/libwpd/WPXDocumentInterface.h \
+ inc/libwpd/WPXProperty.h \
+ inc/libwpd/WPXPropertyList.h \
+ inc/libwpd/WPXString.h \
+ inc/libwpd/WPXPropertyListVector.h \
))
$(eval $(call gb_ExternalPackage_add_unpacked_files,libwpd,inc/external/libwpd-stream,\
- src/lib/libwpd-stream.h \
- src/lib/WPXStream.h \
- src/lib/WPXStreamImplementation.h \
+ inc/libwpd-stream/libwpd-stream.h \
+ inc/libwpd-stream/WPXStream.h \
+ inc/libwpd-stream/WPXStreamImplementation.h \
))
$(eval $(call gb_ExternalPackage_use_external_project,libwpd,libwpd))