From: Peter Michael Green Date: Tue, 8 Aug 2017 16:32:09 +0000 (+0000) Subject: Manual merge of version 1:5.3.5~rc1-3+rpi1 and 1:5.4.0-1 to produce 1:5.4.0-1+rpi1 X-Git-Tag: archive/raspbian/1%5.4.0-1+rpi1~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1139e4c4af927ce665600d4d1c58f5f683f58b28;p=libreoffice.git Manual merge of version 1:5.3.5~rc1-3+rpi1 and 1:5.4.0-1 to produce 1:5.4.0-1+rpi1 --- 1139e4c4af927ce665600d4d1c58f5f683f58b28 diff --cc debian/changelog index f88d4100796,4282074091e..43017d92082 --- a/debian/changelog +++ b/debian/changelog @@@ -1,23 -1,8 +1,16 @@@ - libreoffice (1:5.3.5~rc1-3+rpi1) buster-staging; urgency=medium ++libreoffice (1:5.4.0-1+rpi1) buster-staging; urgency=medium + - -- Raspbian forward porter Thu, 27 Jul 2017 23:16:27 +0000 - - libreoffice (1:5.3.5~rc1-3) unstable; urgency=medium - - * debian/tests/control: add more test Depends: for sdk-examples: - libx11-dev, libxt-dev (we don't use @builddeps@ here yet) - - -- Rene Engelhard Fri, 21 Jul 2017 11:17:32 +0200 - - libreoffice (1:5.3.5~rc1-2) unstable; 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. + - * reupload with fixed changelog (broken cherry-pick) ++ -- Peter Michale Green Mon, 07 Aug 2017 05:42:17 +0000 + - -- Rene Engelhard Tue, 18 Jul 2017 08:10:51 +0200 + libreoffice (1:5.4.0-1) unstable; urgency=medium - libreoffice (1:5.3.5~rc1-1) unstable; urgency=medium + * New upstream release - * New upstream release candidate + * upload to unstable * debian/patches/examples-fix-SDK_AUTO_DEPLOYMENT-check.diff: don't try to do "auto deployment" when SDK_AUTO_DEPLOYMENT = NO... diff --cc debian/control index 840a9e3c971,43aa7288533..a3fd06b068b --- a/debian/control +++ b/debian/control @@@ -132,9 -146,12 +143,10 @@@ Build-Depends: ant (>= 1.7.0) [!hppa !i lp-solve (>= 5.5.0.13-5+b1), make (>= 3.81-8.2), maven-repo-helper, - opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2) [amd64 i386], pkg-config, + pstoedit [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , python3, python3-dev (>= 3.3), - rapidjson-dev [amd64 i386], ucpp, unixodbc-dev (>= 2.2.11), unzip,