From: Raspbian forward pporter Date: Thu, 3 May 2018 04:22:47 +0000 (+0100) Subject: Merge version 1:6.0.2-1+rpi2 and 1:6.0.4~rc1-4 to produce 1:6.0.4~rc1-4+rpi1 X-Git-Tag: archive/raspbian/1%6.0.4_rc1-4+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=39c6057037238a0e16181031428fa7b2103c8585;p=libreoffice.git Merge version 1:6.0.2-1+rpi2 and 1:6.0.4~rc1-4 to produce 1:6.0.4~rc1-4+rpi1 --- 39c6057037238a0e16181031428fa7b2103c8585 diff --cc debian/changelog index 1fc6302d1e6,27cc5c97b74..37850d36400 --- a/debian/changelog +++ b/debian/changelog @@@ -1,18 -1,57 +1,70 @@@ - libreoffice (1:6.0.2-1+rpi2) buster-staging; urgency=medium - - * Disable testsuite. - - -- Peter Michael Green Fri, 27 Apr 2018 02:14:18 +0000 - - libreoffice (1:6.0.2-1+rpi1) buster-staging; urgency=medium ++libreoffice (1:6.0.4~rc1-4+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 + - -- Peter Michael Green Tue, 13 Mar 2018 02:30:18 +0000 ++ [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 ++ + libreoffice (1:6.0.4~rc1-4) unstable; urgency=medium + + * debian/patches/patches/disable-java-in-odk-build-examples-on-zero-vm.diff: + as name says, the test builds many Java projects without a output and on + Zero this is slow -> "hangs" gets killed because of inactivity + * explicitely disable junit tests when determining that java uses the Zero VM + + -- Rene Engelhard Tue, 24 Apr 2018 11:46:54 +0200 + + libreoffice (1:6.0.4~rc1-3) unstable; urgency=medium + + * debian/rules: + - sigh. readd lost if to disable make check on big-endian archs. + + -- Rene Engelhard Sat, 21 Apr 2018 19:11:50 +0200 + + libreoffice (1:6.0.4~rc1-2) unstable; urgency=medium + + * debian/rules: + - clean up/simplify test on/off/fatal handling and use findstring + as everywhere else + - disable running make check on armel and mipsel. hangs. + + -- Rene Engelhard Sat, 21 Apr 2018 17:20:41 +0200 + + libreoffice (1:6.0.4~rc1-1) unstable; urgency=medium + + * New upstream release candidate + + * debian/patches/appstream-ignore-startcenter.diff: add + X-AppStream-Ignore=True to startcenter.desktop, thanks Olivier + (closes: #892364) + + -- Rene Engelhard Wed, 18 Apr 2018 14:27:06 +0000 + + libreoffice (1:6.0.3-1) unstable; urgency=medium + + * New upstream release + + * debian/patches/gpg-overly-long-filenames-fix.diff: backport + https://gerrit.libreoffice.org/#/c/50978/ fix to fix gpg encryption + test ("File name too long") + * debian/patches/disable-flaky-tests.diff: remove disabling of + testODFEncryptedGPG. + * debian/patches/check-for-gpgconf-and-run-user.diff: as name says, + don't fail when gpgconf --create-socketdir doesn't work because + /run/user/ doesn't exist... Check for it. + + * debian/rules: + - add explicit gpg-agent and gpgconf build-dependencies + - add explicit python3-distutils build-dependency as + python3.6 3.6.5~rc1-2 dropped its python3-distutils dependency... + + -- Rene Engelhard Mon, 02 Apr 2018 14:48:09 +0000 libreoffice (1:6.0.2-1) unstable; urgency=medium diff --cc debian/control index 24436a84aaa,c09372ac11f..c97e2cf55cb --- a/debian/control +++ b/debian/control @@@ -155,8 -165,10 +161,9 @@@ Build-Depends: ant (>= 1.7.0) [!hppa !m maven-repo-helper, openjdk-9-jdk (>= 9.0.1+11-1~) [i386], pkg-config, - pstoedit [!hppa !kfreebsd-amd64 !kfreebsd-i386 !m68k !mips !mips64 !powerpc !powerpcspe !ppc64 !s390 !s390x !sparc !sparc64] , python3, python3-dev (>= 3.3), + python3-distutils, ucpp, unixodbc-dev (>= 2.2.11), unzip,