Merge version 1:7.1.5-2+rpi1 and 1:7.2.1-4 to produce 1:7.2.1-4+rpi1

diff --cc debian/changelog
index 23180fe7fc8a951547e2e90256cc1eed876eab24,74041655e87a4ad497c2ede2f85a8527c7e2449d..bea40cc85a7f5e92f0e31ce1e6becafd41c74234
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,40 +1,50 @@@
- libreoffice (1:7.1.5-2+rpi1) bookworm-staging; urgency=medium
++libreoffice (1:7.2.1-4+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>  Wed, 25 Aug 2021 00:04:02 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 30 Sep 2021 06:33:09 +0000
 +
- libreoffice (1:7.1.5-2) unstable; urgency=medium
+ libreoffice (1:7.2.1-4) unstable; urgency=medium
  
-   * debian/rules, debian/tests/control.in:
-     - run junit autopkgtest only on OOO_JUNIT_ARCHS (aka amd64/arm64) 
+   [ merge from Ubuntu ]
+   * debian/patches/arm-fp-mode.diff: Explicitly set fpu mode on armhf. 
+   (closes: #994698)
  
-  -- Rene Engelhard <rene@debian.org>  Wed, 18 Aug 2021 08:56:00 +0200
+  -- Rene Engelhard <rene@debian.org>  Thu, 23 Sep 2021 17:55:20 +0200
  
- libreoffice (1:7.1.5-1) unstable; urgency=medium
+ libreoffice (1:7.2.1-3) unstable; urgency=medium
  
-   * "New" upstream release
+   * debian/control.ure.in: 
+     - also add Breaks: to << 1:7.2.0 libreoffice-cores to ure...
+       (closes: #994624) 
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 19 Sep 2021 13:18:06 +0200
+ 
+ libreoffice (1:7.2.1-2) unstable; urgency=medium
+ 
+   * debian/control.in.
+     - bump ure dependency for libreoffice-core to (>= 1:7.2.0~)
+       (closes: #994624) 
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 19 Sep 2021 12:07:40 +0200
+ 
+ libreoffice (1:7.2.1-1) unstable; urgency=medium
+ 
+   * LibreOffice 7.2.1 release (identical to rc2)
+ 
+   * debian/patches/qt5-fix-popups.diff: add patch from libreoffice-7-2 to
+     fix popup menus in qt5
+   * debian/patches/bison-3.8.diff: fix build with bison 3.8, from master
+   * debian/patches/freetype-2.11.diff: fix (skia) build with freetype 2.11
+ 
+   * debian/control.plasma.in: make -plasma recommend -kf5 (closes: #994445)
+ 
+   * debian/rules, debian/clang_wrapper: remove again, doesn't work and
+     prevents a clang build/a build of skia with clang
  
    * upload to unstable 
  

diff --cc debian/control
index 0c97e43f55496c3f01f8b56fb476ec32144602b2,e898344c90d7fd65f3a89046cfbecadcd628d18a..479df16b90aaef0ede84f9bf6b8691dd70d2a72e
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -45,9 -60,7 +45,6 @@@ Build-Depends: apparmor <!nocheck>
                 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),
@@@ -169,9 -184,13 +165,11 @@@
                 libxtst-dev,
                 libzmf-dev,
                 libzmf-dev (<< 0.1~),
 -               locales [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
+                libzxingcore-dev,
                 lp-solve (>= 5.5.0.13-5+b1),
                 maven-repo-helper,
                 pkg-config,
 -               pstoedit [!armel !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !mips64el] <!nocheck>,
+                poppler-data <!nocheck>,
                 python3,
                 python3-dev (>= 3.3) <!nopython>,
                 python3-distutils <!nopython>,

diff --cc debian/rules
Simple merge