From: Peter Michael Green Date: Sun, 10 Dec 2017 12:14:44 +0000 (+0000) Subject: Manual merge of version 1:5.4.2-3+rpi1 and 1:5.4.3-4 to produce 1:5.4.3-4+rpi1 X-Git-Tag: archive/raspbian/1%5.4.3-4+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f77a24d8b23e102733968423de5dcad58f1c64e2;p=libreoffice.git Manual merge of version 1:5.4.2-3+rpi1 and 1:5.4.3-4 to produce 1:5.4.3-4+rpi1 --- f77a24d8b23e102733968423de5dcad58f1c64e2 diff --cc debian/changelog index 7ba24ee60fb,5964f994e14..f14746af301 --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,113 +1,123 @@@ - libreoffice (1:5.4.2-3+rpi1) buster-staging; urgency=medium ++libreoffice (1:5.4.3-4+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 + - -- Peter Michael Green Thu, 26 Oct 2017 15:10:59 +0000 ++ -- Peter Michael Green Sun, 10 Dec 2017 11:57:53 +0000 ++ + libreoffice (1:5.4.3-4) unstable; urgency=medium + + * debian/control.in: remove openjdk conflicts ... + * debian/rules: ... and make them Depends in JAVA_RUNTIME_DEPENDS for the + Java-using packages. Also allow openjdk-9 everywhere + This doesn't prevent usage of the "broken" JDK but otherwise we "break" + jodconverter/natbraille in testing... And linux 4.14.2-1 is also supposed to + fix the regression finally... + This also closes: #882436 + + -- Rene Engelhard Sat, 02 Dec 2017 01:01:41 +0100 + + libreoffice (1:5.4.3-3) unstable; urgency=medium + + * debian/patches/icu-60.diff: backport icu 60 support patch from master + + * debian/rules: + - replace some manual dpkg-parsechangelog calls with + $(DEB_VERSION) and $(DEB_DISTRIBUTION) and fix logic for + --disable-dependency-tracking + - enable missed sr-Latn but merge into -sr + - install the apparmor profiles disabled for now (closes: #882597) + * debian/control.in: + - clean up mozilla suggests to just firefox-esr | thunderbird | firefox + - add versions to openjdk-{7,8}-jre-headless conflicts now that they are + also supposed to be fixed + * debian/control.{kde.}.in: suggest the "certificate managers" for gpg: + gpa, seahorse, kleopatra | kgpg + + -- Rene Engelhard Sun, 26 Nov 2017 11:34:27 +0000 + + libreoffice (1:5.4.3-2) unstable; urgency=medium + + * debian/patches/java9-*: remove ... + * debian/patches/java9.diff: ... and merge into one patch again. + * debian/patches/java9.diff: backport also missing tests fix from master. + Also add -Dfile.encoding=UTF8 directly to JavaClassSet.mk + + * debian/rules: + - remove setting JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 again + - disable junit tests on 32bit archs (i386/armhf) which fail ucb_complex + with a libcurl-related SIGSEGV. At least upstream those are not ran + (at least for armhf) anyway on those archs. + + -- Rene Engelhard Mon, 13 Nov 2017 17:43:19 +0100 + + libreoffice (1:5.4.3-1) unstable; urgency=medium + + * New upstream release + + * debian/patches/java9-jawt.diff: add from master; find jawt with Java9 and + also fix odk/settings/settings.mk for it + * debian/patches/java9-rhino.diff: add from master; fix rhino build with Java9 + + * debian/rules: + - be consequent and enable the junit tests on armhf/arm64 now that + those work. + - stop passing --disable-database-connectivity for no-Base archs + (closes: #874274) + - explicitly use and depend on openjdk 9 on i386 now that #876069 is fixed. + - set JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 in build-indep (needed for + Java9 in reportbuilder) + * debian/libreoffice-sdbc-firebird.maintscript: remove (redundant) + $DPKG_MAINTSCRIPT_PACKAGE and update version (closes: #880426) + * debian/rules, debian/libreoffice-common.maintscript: fix path in/for + apparmor profiles (add missing /). mv_conffile the files to the new + name... + * debian/control.in: make -core conflict against openjdk-{6,7,8}-jre-headless + on i386- -java-common would make more sense, but it's Arch: all.. + + -- Rene Engelhard Tue, 07 Nov 2017 20:59:01 +0100 + + libreoffice (1:5.4.3~rc1-2) unstable; urgency=medium + + * upload to unstable + + -- Rene Engelhard Tue, 24 Oct 2017 23:15:10 +0200 + + libreoffice (1:5.4.3~rc1-1) experimental; urgency=medium + + * New upstream release candidate + + * debian/patches/no-check-if-root.diff: remove (senseful, IMHO!) check + given policy implies "build" should be able to run as root... :( + * debian/patches/avoid-throwing-cpp-exceptions-across-libgpeg-c-frames.diff: + add from master, fixing CppunitTest_vcl_filters_test on arm* + * debian/patches/debian-hardened-buildflags-CPPFLAGS.diff: split this up, + into the CPPFLAGS part here .. + * debian/patches/debian-hardened-buildflags-no-LO-fstack-protector-strong.diff: + and the removal of the explicit default -fstack-protector-strong here. + * debian/patches/arm64-bridges-no-stack-protector-strong.diff: add from master: + go sure that we build gcc3_linux_aarch64/cpp2uno.cxx only with + -fstack-protector. Works for us by chance because of above + debian-hardened-buildflags-no-LO-fstack-protector-strong.diff + * debian/patches/arm64-disable-sc-functions-test.diff: add patch from master + to disable the sc_*_functions_test on arm64 (as for x86). + + * debian/rules: + - *really* fix -dbgsym 0775 permissions by manually fixing them after + mkdir -p's (dh_fixperms doesn't run on -dbgsym) which apparently + create them as 775 (at least on the buildds) + - fix libreoffice-dev-doc.doc-base.lo-idl-ref (again) + - add missing dependency to build-arch to install-arch + - make armhf/arm64 test failures fatal now that above test is fixed which + was the only one failing; upstream apparently also builds armhf/arm64 + flatpaks now for flathub + * debian/copyright: + - fix various missing-license-paragraph-in-dep5-copyright + + -- Rene Engelhard Fri, 20 Oct 2017 13:40:01 +0000 libreoffice (1:5.4.2-3) unstable; urgency=medium