From: Raspbian forward pporter Date: Tue, 4 Sep 2018 17:32:14 +0000 (+0100) Subject: Merge version 1:6.1.1~rc1-1+rpi1 and 1:6.1.1~rc1-2 to produce 1:6.1.1~rc1-2+rpi1 X-Git-Tag: archive/raspbian/1%6.1.1_rc1-2+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ef6ade829c430e92ea656d661be3cccc7d36845e;p=libreoffice.git Merge version 1:6.1.1~rc1-1+rpi1 and 1:6.1.1~rc1-2 to produce 1:6.1.1~rc1-2+rpi1 --- ef6ade829c430e92ea656d661be3cccc7d36845e diff --cc debian/changelog index bc61ca79768,03c3644ce99..91b0ee52999 --- a/debian/changelog +++ b/debian/changelog @@@ -1,15 -1,17 +1,30 @@@ - libreoffice (1:6.1.1~rc1-1+rpi1) buster-staging; urgency=medium ++libreoffice (1:6.1.1~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 Sat, 01 Sep 2018 21:14:53 +0000 ++ -- Raspbian forward porter Tue, 04 Sep 2018 17:32:10 +0000 ++ + libreoffice (1:6.1.1~rc1-2) unstable; urgency=medium + + * debian/patches/apparmor-fixes.diff: add patch from master to + allow printing to file + * debian/patches/do-not-reset-permissions-on-save.diff: as name says, + from libreoffice-6-1 branch (closes: #907476) + + * debian/rules: move libdbahsqllo.so from -base-drivers to -base-core + (closes: #907397) + * debian/control.in: + - add Replaces: for above + - bump ure Dependency in -core to (>= 6.1.1~) (closes: #907650) + + -- Rene Engelhard Fri, 31 Aug 2018 12:45:39 +0200 libreoffice (1:6.1.1~rc1-1) unstable; urgency=medium