From: Peter Michael Green Date: Sun, 8 Nov 2020 01:23:09 +0000 (+0000) Subject: Manual merge of version 1:7.0.2-4+rpi1 and 1:7.0.3-3 to produce 1:7.0.3-3+rpi1 X-Git-Tag: archive/raspbian/1%7.0.3-3+rpi1~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5e3c2121aece65dbea84c019657fb46224331394;p=libreoffice.git Manual merge of version 1:7.0.2-4+rpi1 and 1:7.0.3-3 to produce 1:7.0.3-3+rpi1 Re-enable pdfium, Debian now has it enabled on all architectures, so hopefully it will work for us too. --- 5e3c2121aece65dbea84c019657fb46224331394 diff --cc debian/changelog index 4873040cf89,5b05ad27b04..9911d55a8c4 --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,60 +1,67 @@@ - libreoffice (1:7.0.2-4+rpi1) bullseye-staging; urgency=medium - - [changes introduced in 1:5.4.0-1+rpi1 by Peter Michael Green] - * Disable pdfium, it fails to build for armv6 ++libreoffice (1:7.0.3-3+rpi1) bullseye-staging; urgency=medium + + [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, 22 Oct 2020 06:01:58 +0000 ++ -- Peter Michael Green Sun, 08 Nov 2020 00:20:54 +0000 ++ + libreoffice (1:7.0.3-3) unstable; urgency=medium + + * debian/patches/icu-68.diff: fix build with ICU 68 + + * more autopkgtest fixes/preparations for new architectures: + - debian/tests/uicheck-{sc,sw}: revert timeout hack for armhf since it's + ran on arm64 workers. + - debian/tests/control: move ... + - debian/tests/control.in: ... here and mark Java-using tests with + Architecture: + - debian/tests/odk-build-examples*: split non-Java and Java tests and mark + Java test with Architecture: + - debian/tests/junit, odk-build-examples-java: skip it if using a Zero-using + architecture + + -- Rene Engelhard Sun, 01 Nov 2020 22:20:53 +0100 + + libreoffice (1:7.0.3-2) unstable; urgency=medium + + * debian/patches/liborcus-0.16.diff: backport liborcus 0.16.1 patch + from master, too to fix 32bit builds (e.g. on buster-backports) + * debian/patches/oox-crypto-bigendian.diff: move ... + * debian/patches/bigendian.diff: ... here and backport more upstream commits + from master + + * debian/rules: + - enable pdfium on all architectures since configure in master says + "Disable building PDFium. Results in unsecure PDF signature + verification." + * debian/tests/uicheck-{sc,sw}: add timeout hack from smoketest also here + for armhf + + -- Rene Engelhard Sun, 01 Nov 2020 17:30:23 +0100 + + libreoffice (1:7.0.3-1) unstable; urgency=medium + + * LibreOffice 7.0.3 final release (identical to rc1) + + * upload to unstable + + * debian/patches/fix-non-pdfium-build.diff: backport from master; as name + says + * debian/rules: + - remove obsolete SHLIBS_OVERRIDE += -Xunordf (closes: #966087) + + -- Rene Engelhard Thu, 29 Oct 2020 17:11:47 +0100 + + libreoffice (1:7.0.3~rc1-1) experimental; urgency=medium + + * New upstream release candidate + + * debian/rules: + - make build-depends for libfoo-x.y.pc-using packages explicitely + libfoo (>= x.y), libfoo (<< x.y+1) to help autopkgtest to find the + right combination... + + -- Rene Engelhard Thu, 22 Oct 2020 17:01:48 +0200 libreoffice (1:7.0.2-4) unstable; urgency=medium diff --cc debian/control index 9562d8f617f,17ad29876e8..d75e2370c18 --- a/debian/control +++ b/debian/control @@@ -18,15 -19,31 +18,17 @@@ Build-Depends: apparmor dh-apparmor, dh-python , dpkg-dev (>= 1.18.2~), - dwz (>> 0.12-3), firebird-dev (>= 3.0.0.32483.ds4-4) [!hppa !mips64 !s390 !sparc], - firebird3.0-server-core [!hppa !mips64 !s390 !sparc] , flex (>= 2.3.35), - fontconfig [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , fontforge-nox | fontforge, - fonts-crosextra-carlito [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , - fonts-dejavu [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , - fonts-liberation2 [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , g++ (>= 4:7), gcc (>= 4:7), - gdb [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , - ghostscript [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , gobject-introspection (>= 1.32.0), gperf (>= 3.1), - gpg , - gpg-agent , - gpgconf , - hunspell-en-us [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , - hyphen-en-us [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , - imagemagick [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , java-common (>= 0.61) , javahelper (>= 0.37~) , + junit4 (>= 4.8.2-2) [amd64 arm64] , + libabw-dev (<< 0.2~), libabw-dev (>= 0.1), libarchive-zip-perl [!hppa !mips64 !s390 !sparc] , libavahi-client-dev, @@@ -39,10 -56,13 +41,12 @@@ libboost-locale-dev (>= 1.71), libc0.1 (>= 2.10.2-7) [kfreebsd-any], libcairo2-dev, + libcdr-dev (<< 0.2~), libcdr-dev (>= 0.1), libclucene-dev (>= 2.3.3.4-4.1), + libcmis-dev (<< 0.6~), libcmis-dev (>= 0.5.2~), libcommons-logging-java [!hppa !mips64 !s390 !sparc] , - libcppunit-dev (>= 1.14) [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] , libcups2-dev, libcurl4-gnutls-dev, libdbus-1-dev (>= 0.60), @@@ -91,9 -117,13 +101,12 @@@ libldap2-dev, libloader-java (>= 1.1.6) [!hppa !mips64 !s390 !sparc] , liblpsolve55-dev (>= 5.5.0.13-5+b1), + libmdds-dev (<< 1.8~), libmdds-dev (>= 1.5), + libmspub-dev (<< 0.2~), libmspub-dev (>= 0.1), + libmwaw-dev (<< 0.4~), libmwaw-dev (>= 0.3.1), - libmwaw-dev (>= 0.3.15) , libmythes-dev (>= 2:1.2), libneon27-gnutls-dev, libnspr4-dev, @@@ -119,11 -154,18 +137,17 @@@ libserializer-java (>= 1.1.6) [!hppa !mips64 !s390 !sparc] , libsm-dev, libstaroffice-dev, + libstaroffice-dev (<< 0.1~), + libstaroffice-dev (>= 0.0.3) , libsuitesparse-dev (>= 1:3.4.0), + libvisio-dev (<< 0.2~), libvisio-dev (>= 0.1), + libwpd-dev (<< 0.11~), libwpd-dev (>= 0.10), + libwpg-dev (<< 0.4~), libwpg-dev (>= 0.3), + libwps-dev (<< 0.5~), libwps-dev (>= 0.4), - libwps-dev (>= 0.4.9) , libx11-dev, libx11-xcb-dev, libxaw7-dev,