The following commit has been merged in the master branch: commit dcdd96dc468eb785f378faac28c6dacda3405494 Author: Rene Engelhard <r...@debian.org> Date: Fri May 17 21:51:02 2013 +0200
fix sp2bv/regcomp(regsingleton build on mips(el) by linking explicitely with libxmlreader.so diff --git a/changelog b/changelog index 0c38951..e522a8a 100644 --- a/changelog +++ b/changelog @@ -1,11 +1,15 @@ libreoffice (1:4.0.3-3) UNRELEASED; urgency=low + * debian/patches/uno-executables-link-to-xmlreader.diff: fix + sp2bv/regcomp/regsingleton/uno-skeletonmaker build on + mips(el) by linking explicitely with libxmlreader.so + * debian/control.in, debian/rules: - depend on fonts-dejavu instead of ttf-dejavu (closes: #708062) * debian/copyright: - mention swext/mediawiki/src/filter/odt2mediawiki.xsl copyright/license - -- Rene Engelhard <r...@debian.org> Sun, 12 May 2013 22:36:01 +0200 + -- Rene Engelhard <r...@debian.org> Fri, 17 May 2013 21:50:11 +0200 libreoffice (1:4.0.3-2) unstable; urgency=low diff --git a/patches/series b/patches/series index 704aa08..67ed5dc 100644 --- a/patches/series +++ b/patches/series @@ -30,3 +30,4 @@ system-psql-no-krb5-gssapi-check.diff wheezy-backports-python.diff fix-internal-hsqldb-build.diff boost-1.53.diff +uno-executables-link-to-xmlreader.diff diff --git a/patches/uno-executables-link-to-xmlreader.diff b/patches/uno-executables-link-to-xmlreader.diff new file mode 100644 index 0000000..691b116 --- /dev/null +++ b/patches/uno-executables-link-to-xmlreader.diff @@ -0,0 +1,43 @@ +diff -urN cpputools.old/Executable_regcomp.mk cpputools/Executable_regcomp.mk +--- a/cpputools.old/Executable_regcomp.mk 2013-04-30 14:54:23.000000000 +0200 ++++ b/cpputools/Executable_regcomp.mk 2013-05-17 21:41:13.665548985 +0200 +@@ -34,6 +34,7 @@ + cppu \ + cppuhelper \ + sal \ ++ xmlreader \ + $(gb_UWINAPI) \ + )) + +diff -urN cpputools.old/Executable_regsingleton.mk cpputools/Executable_regsingleton.mk +--- a/cpputools.old/Executable_regsingleton.mk 2013-04-30 14:54:23.000000000 +0200 ++++ b/cpputools/Executable_regsingleton.mk 2013-05-17 21:41:22.977549255 +0200 +@@ -34,6 +34,7 @@ + cppu \ + cppuhelper \ + sal \ ++ xmlreader \ + $(gb_UWINAPI) \ + )) + +diff -urN cpputools.old/Executable_sp2bv.mk cpputools/Executable_sp2bv.mk +--- a/cpputools.old/Executable_sp2bv.mk 2013-04-30 14:54:23.000000000 +0200 ++++ b/cpputools/Executable_sp2bv.mk 2013-05-17 21:41:33.373549555 +0200 +@@ -34,6 +34,7 @@ + cppu \ + cppuhelper \ + sal \ ++ xmlreader \ + )) + + $(eval $(call gb_Executable_add_exception_objects,sp2bv,\ +--- a/unodevtools.old/Executable_skeletonmaker.mk 2013-05-18 11:31:49.705153823 +0200 ++++ b/unodevtools/Executable_skeletonmaker.mk 2013-05-18 11:33:07.993156082 +0200 +@@ -41,6 +41,7 @@ + salhelper \ + cppu \ + cppuhelper \ ++ xmlreader \ + )) + + $(eval $(call gb_Executable_use_static_libraries,uno-skeletonmaker,\ -- LibreOffice packaging repository -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1udjgn-0002zk...@vasks.debian.org