From: Peter Michael Green Date: Thu, 20 Dec 2018 15:57:12 +0000 (+0000) Subject: Manual merge of version 1:6.1.3-1+rpi1 and 1:6.1.4-1 to produce 1:6.1.4-1+rpi1 X-Git-Tag: archive/raspbian/1%6.1.4-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=caa7c4d86ab20f50048d13b7323c95058ef28c0d;p=libreoffice.git Manual merge of version 1:6.1.3-1+rpi1 and 1:6.1.4-1 to produce 1:6.1.4-1+rpi1 --- caa7c4d86ab20f50048d13b7323c95058ef28c0d diff --cc debian/changelog index ab9937a4f9a,6aa2ee44d96..cb270c40bab --- a/debian/changelog +++ b/debian/changelog @@@ -1,15 -1,64 +1,74 @@@ - libreoffice (1:6.1.3-1+rpi1) buster-staging; urgency=medium ++libreoffice (1:6.1.4-1+rpi1) buster-staging; urgency=medium + - [changes brought forward from 1:5.2.4-2+rpi1 by Peter Michael Green at Sat, 07 Jan 2017 01:42:16 +0000] - * Disable chromium stuff as we don't currently have chromium in the Raspbian - repository. + [changes introduced in 1:5.4.0-1+rpi1 by Peter Michael Green] + * Disable pdfium, it fails to build for armv6 + + [changes brought forward from 1:6.0.2-1+rpi2 by Peter Michael Green at Fri, 27 Apr 2018 02:14:18 +0000] + * Disable testsuite. + - -- Raspbian forward porter Sun, 11 Nov 2018 13:41:17 +0000 ++ -- Raspbian forward porter Thu, 20 Dec 2018 06:09:37 +0000 ++ + libreoffice (1:6.1.4-1) unstable; urgency=medium + + * New upstream release candidate + + * debian/patches/disableClassPathURLCheck.diff: add new upstream + configure check for this (from master) + + * debian/patches/mdds-1.4.1.diff, debian/patches/orcus-0.14.diff, + debian/rules, debian/shlibs.override.orcus: + use mdds 1.4.x and orcus 0.14.x + + * debian/rules, debian/control.firebird.in: + - enable Firebird on BE archs + * debian/rules: + - fix running the odk/build-examples* tests on _all builds + - disable gdrive stuff. chromium isn't in buster anymore and gdrive didn't + work with chromiums id/secret anyway) (closes: #909152) + - build-depend on libmysqlcppconn >= 1.1.9-4 if building with libcmis 0.5.2 + (snapshots) since LO will pick up c++17 then and otherwise it'll break + - debian/tests/smoketest: skip test on big-endian architectures (see below) + + * merge from Ubuntu: + [ Evangelos Foutras ] + - poppler-fix-build-0-70.patch: fix build failure with poppler >= 0.70 + [ Olivier Tilloy ] + - debian/patches/poppler-dropped-gbool.patch: cherry-pick + upstream commit to fix build failure with poppler >= 0.71 + (see https://gerrit.libreoffice.org/#/c/63625/) + (closes: #915726) + - debian/tests/smoketest: revert previous change and skip the test + altogether on s390x, where unit tests are intentionally not built + + -- Rene Engelhard Sat, 15 Dec 2018 14:02:18 +0000 + + libreoffice (1:6.1.3-2) unstable; urgency=medium + + * debian/patches/apparmor-mesa.diff: #include mesa abstraction + (closes: #905437) + * debian/patches/disableClassPathURLCheck.diff: add workaround to + fix build with openjdks with S8195874 included - add + -Djdk.net.URLClassPath.disableClassPathURLCheck=true to JAVAIFLAGS; + see https://gerrit.libreoffice.org/#/c/63118/2 + + * debian/patches/use-mariadb-java-instead-of-mysql-java.diff: as name says; + use org.mariadb.jdbc.Driver instead of com.mysql.jdbc.Driver + * debian/control.in: + - Suggest libmariadb-java instead of libmysql-java. See #912916 for more + information. + * debian/patches/jdbc-driver-classpaths.diff: add org.mariadb.jdbc.Driver + classpath pointing to /usr/share/java/mariadb-java-client.jar + * debian/libreoffice-base.bug-script.in: add libmariadb-java + (closes: #913360, thanks Markus Koschany) + + * debian/libreoffice-base-drivers.NEWS: add NEWS about above change + * debian/libreoffice-base.{postrm,preinst}.in: remove manual + --package $DPKG_MAINTSCRIPT_PACKAGE, since dpkg-divert defaults to it + since 1.16.0 anyway if not specified (see #912140). + * debian/control.in: update -core versioned Breaks: to -kde5, not -kde, thanks + Julien Cristau + + -- Rene Engelhard Sat, 24 Nov 2018 10:59:44 +0100 libreoffice (1:6.1.3-1) unstable; urgency=medium