From: Raspbian automatic forward porter Date: Fri, 3 Apr 2020 12:38:51 +0000 (+0100) Subject: Merge version 1:6.4.2-2+rpi1 and 1:6.4.2-3 to produce 1:6.4.2-3+rpi1 X-Git-Tag: archive/raspbian/1%6.4.2-3+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=32c3e1074a0832f0fd8f332f81ffe9705b80b2d7;p=libreoffice.git Merge version 1:6.4.2-2+rpi1 and 1:6.4.2-3 to produce 1:6.4.2-3+rpi1 --- 32c3e1074a0832f0fd8f332f81ffe9705b80b2d7 diff --cc debian/changelog index d67b7816962,a0554ef3463..463201efe1b --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,27 +1,37 @@@ - libreoffice (1:6.4.2-2+rpi1) bullseye-staging; urgency=medium ++libreoffice (1:6.4.2-3+rpi1) bullseye-staging; urgency=medium + + [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 Sat, 28 Mar 2020 20:39:47 +0000 ++ -- Raspbian forward porter Fri, 03 Apr 2020 12:38:50 +0000 ++ + libreoffice (1:6.4.2-3) unstable; urgency=medium + + [ Rene Engelhard ] + * debian/patches/Fix-build-with-boost-lesser-than-1.68.diff: add from + gerrit, thanks Rico Tschichholz + + * debian/rules: + - use default boost (and thus system-mdds) again and revert + BOOST_MINVER= (>= 1.68) change + - fix redland dependencies for libreoffice-core-nogui + + * merge from Ubuntu: + - libreoffice-math: Add Breaks/Replaces libreoffice-common + (<< 1:6.4.2~rc1~) + - debian/patches/poppler-0.86.diff: Fix build with poppler 0.86.0 + + [ Jochen Sprickerhof ] + * debian/control.in: + - Prefer libreoffice-core-nogui for -nogui variants + Closes: #954319 + - Drop -core-nogui in non -nogui packages (if -nogui exists) + - Fix report_builder and firebird nogui depends + + -- Rene Engelhard Sat, 28 Mar 2020 06:53:24 +0100 libreoffice (1:6.4.2-2) unstable; urgency=medium