Manual merge of version 1:7.0.2-4+rpi1 and 1:7.0.3-3 to produce 1:7.0.3-3+rpi1
authorPeter Michael Green <plugwash@raspbian.org>
Sun, 8 Nov 2020 01:23:09 +0000 (01:23 +0000)
committerPeter Michael Green <plugwash@raspbian.org>
Sun, 8 Nov 2020 01:23:09 +0000 (01:23 +0000)
Re-enable pdfium, Debian now has it enabled on all architectures, so hopefully
it will work for us too.

1  2 
debian/changelog
debian/control
debian/rules

index 4873040cf8927bca25cf24863669ee4497963a64,5b05ad27b0457aa11f0ed82bc5c8a749287aba3e..9911d55a8c4a1b1d7f44db3bd2bb51768bf8dd36
@@@ -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 <plugwash@raspbian.org> at Fri, 27 Apr 2018 02:14:18 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 22 Oct 2020 06:01:58 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  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 <rene@debian.org>  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 <rene@debian.org>  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 <rene@debian.org>  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 <rene@debian.org>  Thu, 22 Oct 2020 17:01:48 +0200
  
  libreoffice (1:7.0.2-4) unstable; urgency=medium
  
diff --cc debian/control
index 9562d8f617f39ed16b4abff1be53cad83349f6f6,17ad29876e84f0b830fba8ee3a8f29e4579b423d..d75e2370c18da3c9884535e35a50d1e474b62ac7
@@@ -18,15 -19,31 +18,17 @@@ Build-Depends: apparmor <!nocheck>
                 dh-apparmor,
                 dh-python <!nopython>,
                 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] <!nocheck>,
                 flex (>= 2.3.35),
 -               fontconfig [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
                 fontforge-nox | fontforge,
 -               fonts-crosextra-carlito [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
 -               fonts-dejavu [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
 -               fonts-liberation2 [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
                 g++ (>= 4:7),
                 gcc (>= 4:7),
 -               gdb [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
 -               ghostscript [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
                 gobject-introspection (>= 1.32.0),
                 gperf (>= 3.1),
 -               gpg <!nocheck>,
 -               gpg-agent <!nocheck>,
 -               gpgconf <!nocheck>,
 -               hunspell-en-us [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
 -               hyphen-en-us [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
 -               imagemagick [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
                 java-common (>= 0.61) <!nojava>,
                 javahelper (>= 0.37~) <!nojava>,
+                junit4 (>= 4.8.2-2) [amd64 arm64] <!nocheck !nojava>,
+                libabw-dev (<< 0.2~),
                 libabw-dev (>= 0.1),
                 libarchive-zip-perl [!hppa !mips64 !s390 !sparc] <!nojava>,
                 libavahi-client-dev,
                 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] <!nojava>,
 -               libcppunit-dev (>= 1.14) [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
                 libcups2-dev,
                 libcurl4-gnutls-dev,
                 libdbus-1-dev (>= 0.60),
                 libldap2-dev,
                 libloader-java (>= 1.1.6) [!hppa !mips64 !s390 !sparc] <!nojava>,
                 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) <!nocheck>,
                 libmythes-dev (>= 2:1.2),
                 libneon27-gnutls-dev,
                 libnspr4-dev,
                 libserializer-java (>= 1.1.6) [!hppa !mips64 !s390 !sparc] <!nojava>,
                 libsm-dev,
                 libstaroffice-dev,
+                libstaroffice-dev (<< 0.1~),
+                libstaroffice-dev (>= 0.0.3) <!nocheck>,
                 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) <!nocheck>,
                 libx11-dev,
                 libx11-xcb-dev,
                 libxaw7-dev,
diff --cc debian/rules
Simple merge