From: Raspbian forward pporter Date: Thu, 1 Nov 2018 18:27:29 +0000 (+0000) Subject: Merge version 1:6.1.3~rc1-1+rpi1 and 1:6.1.3~rc1-2 to produce 1:6.1.3~rc1-2+rpi1 X-Git-Tag: raspbian/1%6.1.3_rc1-2+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1001744c38dba085be6117d0a666b7fe6d8434b2;p=libreoffice.git Merge version 1:6.1.3~rc1-1+rpi1 and 1:6.1.3~rc1-2 to produce 1:6.1.3~rc1-2+rpi1 --- e5927fe68f1226d07cd71c57b498e1a4474d4599 diff --cc debian/changelog index 334f3b5416f,b6a2bc2c669..5acdb30426c --- a/debian/changelog +++ b/debian/changelog @@@ -1,15 -1,13 +1,26 @@@ - libreoffice (1:6.1.3~rc1-1+rpi1) buster-staging; urgency=medium ++libreoffice (1:6.1.3~rc1-2+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, 18 Oct 2018 12:57:22 +0000 ++ -- Raspbian forward porter Thu, 01 Nov 2018 18:27:26 +0000 ++ + libreoffice (1:6.1.3~rc1-2) unstable; urgency=medium + + * debian/patches/patches/fix-tests-openjdk11.patch: fix odk examples' + build with Java11 (from upstream master) + + * debian/tests/control: mark pyuno-import, uno-import, test-extension, + test-extension-shared and the dk/util/check.pl and apparmor tests as + superficial + + -- Rene Engelhard Sun, 28 Oct 2018 17:16:36 +0000 libreoffice (1:6.1.3~rc1-1) unstable; urgency=medium