From: Raspbian forward pporter Date: Wed, 30 May 2018 22:41:57 +0000 (+0100) Subject: Merge version 1:6.0.4~rc1-4+rpi1 and 1:6.0.4-1 to produce 1:6.0.4-1+rpi1 X-Git-Tag: archive/raspbian/1%6.0.4-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2ced4bbf57b3dcb892ce92f7f996c7ba9745964d;p=libreoffice.git Merge version 1:6.0.4~rc1-4+rpi1 and 1:6.0.4-1 to produce 1:6.0.4-1+rpi1 --- 2ced4bbf57b3dcb892ce92f7f996c7ba9745964d diff --cc debian/changelog index 37850d36400,d126310d258..318cfc05425 --- a/debian/changelog +++ b/debian/changelog @@@ -1,15 -1,18 +1,31 @@@ - libreoffice (1:6.0.4~rc1-4+rpi1) buster-staging; urgency=medium ++libreoffice (1:6.0.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 Thu, 03 May 2018 04:22:42 +0000 ++ -- Raspbian forward porter Wed, 30 May 2018 22:41:53 +0000 ++ + libreoffice (1:6.0.4-1) unstable; urgency=medium + + * New upstream release + + * debian/patches/disable-tests-somehow-needing-more-fonts.diff, + debian/patches/tdf108963-test.diff: remove. Obsolete after Liberation + fix + + * debian/rules: + - use internal libetonyek on stretch-backports + - add Build-Conflicts: against "broken" fonts-liberation + - use -type f for pupulating Files: in .doc-base to leave out dirs... + * debian/lo-java-ref.in: move to Programming/Java + + -- Rene Engelhard Mon, 07 May 2018 13:47:22 +0000 libreoffice (1:6.0.4~rc1-4) unstable; urgency=medium