From: Peter Michael Green Date: Thu, 2 Mar 2017 12:18:03 +0000 (+0000) Subject: Merge tag '1%5.2.5-2' into stretch-working X-Git-Tag: raspbian/1%5.2.5-2+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=68f8e3907c72a07c75db643dee71e42906ffe580;p=libreoffice.git Merge tag '1%5.2.5-2' into stretch-working --- bfc844d02c3929cee840391ec49fdcc7179816d1 diff --cc debian/changelog index 99c32823ef8,6d8fffe0b94..018dd476217 --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,21 +1,29 @@@ - libreoffice (1:5.2.5-1+rpi1) stretch-staging; urgency=medium ++libreoffice (1:5.2.5-2+rpi1) stretch-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. + - -- Raspbian forward porter Sat, 25 Feb 2017 06:28:44 +0000 ++ -- Raspbian forward porter Thu, 02 Mar 2017 12:17:18 +0000 ++ + libreoffice (1:5.2.5-2) unstable; urgency=medium + + * debian/libreoffice.maintscript: revert dir_to_symlink, add new + symlink_to_dir for stretch/sid upgrades + * debian/rules: ignore "libreoffice" for --link-doc + * debian/rules, debian/libreoffice-dev-doc.links, debian/lo*.in: + install SDK documentation into /usr/share/doc/libreoffice/sdk (and adapt + dev-docs symlinks/doc-base stuff). Remove extra license file (thanks + lintian) which otherwise would still install over the symlink. + * debian/control.sdk.in: update -devs libreoffice-dev-doc Conflicts to + (<< 1:5.2.5-2~) and add Conflicts: libreoffice (<< 1:5.2.5-2~) to both + -dev*- for safety + (closes: #854576) + + * debian/rules: fix dh_installdocs calls to install copyright for + "libreoffice" + + -- Rene Engelhard Mon, 13 Feb 2017 19:26:09 +0100 libreoffice (1:5.2.5-1) unstable; urgency=medium