From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 26 Aug 2021 12:08:11 +0000 (+0000)
Subject: Manual merge of version 1:7.0.4-4+rpi1 and 1:7.1.5-2 to produce 1:7.1.5-2+rpi1
X-Git-Tag: archive/raspbian/1%7.1.5-2+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=28414aeccfde19abd0b09ecdaf8c26b6632b8fec;p=libreoffice.git

Manual merge of version 1:7.0.4-4+rpi1 and 1:7.1.5-2 to produce 1:7.1.5-2+rpi1
---

28414aeccfde19abd0b09ecdaf8c26b6632b8fec
diff --cc debian/changelog
index 8cc5d44abb5,2f4a6edaf70..23180fe7fc8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,53 +1,63 @@@
- libreoffice (1:7.0.4-4+rpi1) bullseye-staging; urgency=medium
++libreoffice (1:7.1.5-2+rpi1) bookworm-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.
 +
 +  [changes introduced in 1:5.4.0-1+rpi1 by Peter Michael Green]
 +  * Disable pdfium, it fails to build for armv6
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 27 May 2021 20:37:32 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 25 Aug 2021 00:04:02 +0000
 +
- libreoffice (1:7.0.4-4) unstable; urgency=medium
+ libreoffice (1:7.1.5-2) unstable; urgency=medium
  
-   * debian/patches/apparmor-updates.diff: allow one more digit in temp
-     files (closes: #982274)
+   * debian/rules, debian/tests/control.in:
+     - run junit autopkgtest only on OOO_JUNIT_ARCHS (aka amd64/arm64) 
+ 
+  -- Rene Engelhard <rene@debian.org>  Wed, 18 Aug 2021 08:56:00 +0200
+ 
+ libreoffice (1:7.1.5-1) unstable; urgency=medium
+ 
+   * "New" upstream release
+ 
+   * upload to unstable 
+ 
+  -- Rene Engelhard <rene@debian.org>  Sat, 14 Aug 2021 11:26:09 +0000
+ 
+ libreoffice (1:7.1.4~rc2-1) experimental; urgency=medium
+ 
+   * New upstream release candidate 
+ 
+  -- Rene Engelhard <rene@debian.org>  Mon, 07 Jun 2021 19:06:15 +0200
+ 
+ libreoffice (1:7.1.4~rc1-2) experimental; urgency=medium
+ 
+   * debian/patches/fix-emfio-wmf-test.diff,
+     emfio/qa/cppunit/wmf/data/TestPalette.wmf: fix emfio wmf test
+     on arm64 (from libreoffice-7-1-4 branch)
+ 
+  -- Rene Engelhard <rene@debian.org>  Fri, 28 May 2021 18:47:03 +0200
+ 
+ libreoffice (1:7.1.4~rc1-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   * debian/patches/libstdc++11.diff: fix build with newer gcc (libstdc++)
+     11s, from master
+ 
+   * debian/control.in:
+     - stop suggesting openclipart2-libreoffice (doesn't exist anymore
+       in Debian) (closes: #987900)
+   * debian/rules:
+     - fix SYSTEM_GCC_VERSION detection for gcc 11 (and remove < 10 support) 
+ 
+  -- Rene Engelhard <rene@debian.org>  Fri, 21 May 2021 06:52:59 +0200
+ 
+ libreoffice (1:7.1.3~rc2-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   * debian/patches/apparmor-gnupg-tofu.diff: apply patch to support tofu+pgp in
+     apparmor profile (closes: #955271)
    * debian/control.in, debian/libreoffice-common.{maintscript,postinst.in}:
      apply patch from Adreas Beckmann to fix upgrade buster->bullseye
      - libreoffice-core: Copy some Conflicts from libreoffice-common for smoother
diff --cc debian/control
index 87df387226b,12797bd0caf..0c97e43f554
--- a/debian/control
+++ b/debian/control
@@@ -17,16 -18,31 +17,17 @@@ Build-Depends: apparmor <!nocheck>
                 default-jdk (>= 2:1.9) [!hppa !s390 !sparc !hurd-i386] <!nojava>,
                 dh-apparmor,
                 dh-python <!nopython>,
-                dpkg-dev (>= 1.18.2~),
+                dpkg-dev (>= 1.20.1),
+                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>,