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

diff --cc debian/changelog
index 5969be49ef318d064dcf18b72554fd58f7c85b5e,cb3731d604f5125d3cf68f06d6d981bf97eeb327..161840943823fb9704c8f705ad40d1690dc974d4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,84 +1,97 @@@
- libreoffice (1:7.4.1~rc2-3+rpi1) bookworm-staging; urgency=medium
++libreoffice (1:7.4.2-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>  Mon, 19 Sep 2022 21:01:55 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 15 Nov 2022 08:12:36 +0000
++
+ libreoffice (1:7.4.2-3) unstable; urgency=medium
+ 
+   * debian/rules:
+     - allow new versioned java-runtime provides in Java runtime dependencies
+     - move ifeq for bullseye-backports down in the file to really exclude
+       the node-prismjs dependency on on bullseye-backports
+   * debian/libreoffice-core.NEWS: add NEWS entry for #1019423
+ 
+  -- Rene Engelhard <rene@debian.org>  Wed, 09 Nov 2022 17:20:12 +0100
+ 
+ libreoffice (1:7.4.2-2) unstable; urgency=medium
+ 
+   * debian/patches/curl-7.86.diff: backport from master; fix
+     JunitTest_ucb_complex test with curl 7.86
+ 
+   * debian/rules:
+     - don't add Graphics; to draws .desktop, it's already there
+       (closes: #1021778) 
+     - add missing >&3 to ufcq calls in bug scripts (also for indep...)
+   * debian/python3-uno.lintian-overrides,
+     debian/libreoffice-base{,-drivers}.lintian-overrides.
+     debian/libreoffice-sdbc-firebird.lintian-overrides: override
+     debian-news-entry-has-unknown-version now triggering after debhelpers
+     new changelog trimming
+   * debian/libreoffice-impress.bug-control: remove report-with: on fglrx
+     and nvidia-glx-* ...
+   * debian/libreoffice-impress.bug-script.in: ... and run
+     dpkg -l | grep nvidia instead
+ 
+  -- Rene Engelhard <rene@debian.org>  Wed, 26 Oct 2022 21:47:10 +0200
+ 
+ libreoffice (1:7.4.2-1) unstable; urgency=medium
+ 
+   * LibreOffice 7.4.2 release (identical to rc3)
+ 
+   * upload to unstable 
+ 
+  -- Rene Engelhard <rene@debian.org>  Mon, 10 Oct 2022 19:32:31 +0200
+ 
+ libreoffice (1:7.4.2~rc3-1) experimental; urgency=medium
+ 
+   * New upstream release candidate 
+ 
+  -- Rene Engelhard <rene@debian.org>  Mon, 10 Oct 2022 19:06:49 +0200
+ 
+ libreoffice (1:7.4.2~rc2-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
+ 
+   * debian/rules:
+     - add missing >&3 to ufcq calls in bug scripts
+     - fix build-depends-on-obsolete-package
+       (s/libfreetype6-dev/libfreetype-dev/,
+       s/libfontconfig1-dev/libfontconfig-dev/) 
+   * debian/control.gtk4.in: remove "when running under GNOME"
+     from package description since GNOME implies gtk3
+   * debian/control.{gtk4,qt5,qt6}.in: mention the need to
+     manually export SAL_USE_VCLPLUGIN
+ 
+  -- Rene Engelhard <rene@debian.org>  Thu, 06 Oct 2022 17:44:16 +0200
+ 
+ libreoffice (1:7.4.2~rc1-2) experimental; urgency=medium
+ 
+   * reupload with correct control... 
+ 
+  -- Rene Engelhard <rene@debian.org>  Wed, 21 Sep 2022 18:08:40 +0200
+ 
+ libreoffice (1:7.4.2~rc1-1) experimental; urgency=medium
+ 
+   * New upstream release candidate
+ 
+  -- Rene Engelhard <rene@debian.org>  Wed, 21 Sep 2022 17:36:50 +0200
+ 
+ libreoffice (1:7.4.1-1) unstable; urgency=medium
+ 
+   * LibreOffice 7.4.1 final release (identical to rc2)
+     (closes: #1018173)
+ 
+   * debian/source/lintian-overrides: update for latest copyright changes
+ 
+  -- Rene Engelhard <rene@debian.org>  Sat, 17 Sep 2022 19:49:58 +0200
  
  libreoffice (1:7.4.1~rc2-3) unstable; urgency=medium
  

diff --cc debian/control
index 1b0f2dc5f43e583d95384c56d14c82cacc1e3792,22fe0115a8e2d575bba276d72f4bc70494584d64..a16ee2746ffe0fc139673f5bc60589e999131cf4
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -13,8 -15,9 +13,8 @@@ Build-Depends: autoconf
                 coinor-libcoinmp-dev (>= 1.8.3-3),
                 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>,
+                default-jdk (>= 2:1.9) [!hppa !hurd-i386 !kfreebsd-amd64 !kfreebsd-i386 !hurd-i386 !powerpcspe !s390 !sparc] <!nojava>,
                 dh-python <!nopython>,
                 dpkg-dev (>= 1.20.1),
                 dwz (>> 0.12-3),

diff --cc debian/rules
Simple merge