Merge version 1:7.4.1~rc1-3+rpi1 and 1:7.4.1~rc2-3 to produce 1:7.4.1~rc2-3+rpi1

diff --cc debian/changelog
index bc8712fd93cff07e5eccc30d05c193b75d53227d,eb4f65c5388da265da1e11329d71a1fd5dff2bd1..5969be49ef318d064dcf18b72554fd58f7c85b5e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,48 +1,61 @@@
- libreoffice (1:7.4.1~rc1-3+rpi1) bookworm-staging; urgency=medium
++libreoffice (1:7.4.1~rc2-3+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
 +
 +  [changes introduced in 1:7.2.4-3+rpi1 by Peter Michael Green]
 +  * Use clang 11, newer versions cause armv7 contamination issues.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Wed, 14 Sep 2022 09:56:03 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 19 Sep 2022 21:01:55 +0000
++
+ libreoffice (1:7.4.1~rc2-3) unstable; urgency=medium
+ 
+   * upload to unstable
+ 
+   * debian/rules:
+     - don't depend on node-prismjs on bullseye-backport since there it
+       depends on nodejs... 
+     - also use node-prismjs/node-normalize.css for the build and add them
+       to Build-Depends-Indep
+   * debian/copyright, debian/libreoffice-common.links: mention prism.css
+     explicitly and link to node-primsjs' prism-coy.css
+ 
+  -- Rene Engelhard <rene@debian.org>  Sun, 11 Sep 2022 22:30:14 +0200
+ 
+ libreoffice (1:7.4.1~rc2-2) experimental; urgency=medium
+ 
+   * upload with correct control.... 
+ 
+  -- Rene Engelhard <rene@debian.org>  Sat, 10 Sep 2022 13:28:55 +0200
+ 
+ libreoffice (1:7.4.1~rc2-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   * debian/patches/poppler-22.09.diff: fix build with poppler 22.09,
+     from gerrit
+ 
+   The "hrmpf. lintian" release.
+ 
+   * debian/source/lintian-overrides, debian/*.lintian-overrides,
+     debian/copryight:
+     - really fix those lintian warnings supposed to be fixed in -3
+   * debian/changelog:
+     - fix debian-changelog-line-too-long in -3s changelog
+   * debian/copyright:
+     - fix license of sysui/desktop/appstream-appdata/*.xml, "fix"
+       some superfluous-file-pattern, thanks lintian
+   * debian/source.lintian-overrides:
+     - override new(?) superfluous-file-pattern, (even the ones before
+       since lintian still complains)
+   * debian/rules, debian/libreoffice-help-common.links: link and depend
+     on node-prismjs (and depend on node-normalize.css instead of the virtual
+     libjs-normalize.css)
+ 
+  -- Rene Engelhard <rene@debian.org>  Sat, 10 Sep 2022 08:16:12 +0200
  
  libreoffice (1:7.4.1~rc1-3) unstable; urgency=medium
  

diff --cc debian/control
index a281b8c7c28132111d2e4bdf457d3a470f7bfa8c,d94df0e0ecff88bc9606add4236c00b89b822233..1b0f2dc5f43e583d95384c56d14c82cacc1e3792
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -9,10 -9,13 +9,10 @@@ Build-Depends: autoconf
                 binutils (>= 2.37-9) [ppc64],
                 bison,
                 bzip2,
 -               clang (>= 1:11) [armel],
 -               clang (>= 1:12) [ppc64el],
 -               clang (>= 1:8.0.1) [alpha amd64 arm64 armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mipsel mips64el],
 +               clang-11 [alpha amd64 arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mipsel mips64el ppc64el],
                 coinor-libcoinmp-dev (>= 1.8.3-3),
-                coinor-libcoinutils-dev (>= 2.10.14+repack1-1),
+                coinor-libcoinutils-dev (>= 2.10.14+repack1-1~),
                 cpp,
 -               debhelper (>= 10.10.4),
                 debhelper-compat (= 12),
                 default-jdk (>= 2:1.9) [!hppa !s390 !sparc !hurd-i386] <!nojava>,
                 dh-python <!nopython>,

diff --cc debian/rules
Simple merge