Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3903
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/03/3903/1
Uploading libwpd 0.9.8 release
(cherry picked from commit 9febe2cc5000046bf49b973efb3970013a5b84e1)
Conflicts:
download.lst
Change-Id: I03a9a06058a8fbde736b3d897918e8eea8c2a1d6
---
M download.lst
M libwpd/ExternalPackage_libwpd.mk
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/download.lst b/download.lst
index c93f9ec..cf4e219 100644
--- a/download.lst
+++ b/download.lst
@@ -77,7 +77,7 @@
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 f2375d1..ed104aa 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))
--
To view, visit https://gerrit.libreoffice.org/3903
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I03a9a06058a8fbde736b3d897918e8eea8c2a1d6
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Fridrich Strba <fridrich@documentfoundation.org>
Context
- [PATCH libreoffice-4-0] Uploading libwpd 0.9.8 release · Fridrich Strba (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.