1 files changed, 51 insertions, 47 deletions
diff --git a/debian/control b/debian/control
index 661448e2f1..bf26937ae6 100644
--- a/debian/control
+++ b/debian/control
@@ -14,32 +14,23 @@ Build-Depends: autoconf,
                binutils (>= 2.37-9) [ppc64],
                bison,
                bzip2,
-               clang [!alpha !hppa !ia64 !m68k !mips !mipsel !mips64 !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !s390x !sparc !sparc64],
-               coinor-libcoinmp-dev,
-               coinor-libcoinutils-dev,
                debhelper-compat (= 12),
-               default-jdk (>= 2:1.17) [!hppa !hurd-i386 !kfreebsd-amd64 !kfreebsd-i386 !hurd-i386 !powerpcspe !s390 !sparc !ppc64el !s390x !armhf] <!nojava>,
+               default-jdk (>= 2:1.9) [!hppa !hurd-i386 !kfreebsd-amd64 !kfreebsd-i386 !hurd-i386 !powerpcspe !s390 !sparc !ppc64el !s390x !armhf] <!nojava>,
                dh-python <!nopython>,
                dpkg-dev (>= 1.22.5) [armel armhf hppa kfreebsd-i386 m68k mips mipsel powerpc powerpcspe sparc],
-               firebird-dev,
                flex,
-               fontforge-nox | fontforge,
                g++ (>= 4:12),
                g++-12 [i386],
                gcc (>= 4:12),
                gcc-12 [i386],
-               gobject-introspection <!nogir>,
                gperf,
                java-common (>= 0.75) <!nojava>,
-               javahelper <!nojava>,
+               javahelper [!armhf !hppa !kfreebsd-amd64 !kfreebsd-i386 !mips64 !powerpcspe !ppc64el !s390x !sparc] <!nojava>,
                junit4 [amd64 arm64] <!nocheck !nojava>,
-               libabsl-dev [alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 loong64 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el riscv64 s390x sparc sparc64],
                libabw-dev (<< 0.2~),
                libabw-dev (>= 0.1),
                libarchive-zip-perl [!armhf !hppa !kfreebsd-amd64 !kfreebsd-i386 !mips64 !powerpcspe !ppc64el !s390x !sparc] <!nojava>,
                libargon2-dev,
-               libatk1.0-dev,
-               libavahi-client-dev,
                libbase-java [!armhf !hppa !kfreebsd-amd64 !kfreebsd-i386 !mips64 !powerpcspe !ppc64el !s390x !sparc] <!nojava>,
                libbluetooth-dev [linux-any],
                libboost-date-time-dev,
@@ -57,12 +48,10 @@ Build-Depends: autoconf,
                libcmis-dev (>= 0.6.1~),
                libcups2-dev,
                libcurl4-openssl-dev,
-               libdbus-1-dev,
                libdconf-dev (>= 0.40),
                libdragonbox-dev,
                libe-book-dev (<< 0.2~),
                libe-book-dev (>= 0.1),
-               libebook1.2-dev,
                libeot-dev,
                libepoxy-dev,
                libepubgen-dev (<< 0.2~),
@@ -80,18 +69,10 @@ Build-Depends: autoconf,
                libfreehand-dev (>= 0.1),
                libfreetype-dev,
                libfrozen-dev,
-               libgirepository1.0-dev <!nogir>,
                libgl-dev,
                libglib2.0-dev,
                libglm-dev,
-               libgpg-error-dev,
-               libgpgme-dev,
-               libgpgmepp-dev,
                libgraphite2-dev,
-               libgstreamer-plugins-base1.0-dev,
-               libgstreamer1.0-dev,
-               libgtk-3-dev,
-               libgtk-4-dev,
                libharfbuzz-dev (>= 5.1.0),
                libhsqldb1.8.0-java [!armhf !hppa !kfreebsd-amd64 !kfreebsd-i386 !mips64 !powerpcspe !ppc64el !s390x !sparc] <!nojava>,
                libhunspell-dev,
@@ -99,19 +80,12 @@ Build-Depends: autoconf,
                libice-dev,
                libicu-dev,
                libjpeg-dev,
-               libkf5config-dev,
-               libkf5coreaddons-dev,
-               libkf5i18n-dev,
-               libkf5kio-dev,
-               libkf5windowsystem-dev,
+               libkrb5-dev,
                liblangtag-dev,
                liblayout-java [!armhf !hppa !kfreebsd-amd64 !kfreebsd-i386 !mips64 !powerpcspe !ppc64el !s390x !sparc] <!nojava>,
                liblcms2-dev,
-               libldap-dev,
                libloader-java [!armhf !hppa !kfreebsd-amd64 !kfreebsd-i386 !mips64 !powerpcspe !ppc64el !s390x !sparc] <!nojava>,
                liblockfile-bin,
-               liblpsolve55-dev,
-               libmariadb-dev,
                libmdds-dev (<< 2.2~),
                libmdds-dev (>= 2.1),
                libmspub-dev (<< 0.2~),
@@ -124,7 +98,6 @@ Build-Depends: autoconf,
                libnumbertext-dev,
                libodfgen-dev (<< 0.2~),
                libodfgen-dev (>= 0.1),
-               libopenjp2-7-dev [alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 loong64 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el riscv64 s390x sparc sparc64],
                liborcus-dev (<< 0.20~),
                liborcus-dev (>= 0.19.1),
                libpagemaker-dev,
@@ -134,8 +107,6 @@ Build-Depends: autoconf,
                libpoppler-cpp-dev,
                libpoppler-dev,
                libpoppler-private-dev,
-               libpq-dev,
-               libqt5x11extras5-dev,
                libqxp-dev,
                libqxp-dev (<< 0.1~),
                librdf0-dev,
@@ -162,7 +133,6 @@ Build-Depends: autoconf,
                libx11-dev,
                libx11-xcb-dev,
                libxaw7-dev,
-               libxcb1-dev,
                libxext-dev,
                libxinerama-dev,
                libxkbfile-dev,
@@ -180,19 +150,11 @@ Build-Depends: autoconf,
                libzmf-dev (<< 0.1~),
                libzxcvbn-dev,
                libzxing-dev,
-               llvm [!alpha !hppa !ia64 !m68k !mips !mipsel !mips64 !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !s390x !sparc !sparc64],
-               lp-solve,
                maven-repo-helper [!armhf !hppa !kfreebsd-amd64 !kfreebsd-i386 !mips64 !powerpcspe !ppc64el !s390x !sparc] <!nojava>,
                pkg-config,
                python3,
                python3-dev <!nopython>,
-               python3-distutils <!nopython>,
-               qmake6,
-               qt5-qmake,
-               qt6-base-dev,
-               qt6-base-dev-tools,
-               qtbase5-dev,
-               qtbase5-dev-tools,
+               python3-setuptools <!nopython>,
                unixodbc-dev,
                unzip,
                x11proto-render-dev,
@@ -200,8 +162,12 @@ Build-Depends: autoconf,
                zip,
                zlib1g-dev
 Build-Depends-Arch: at-spi2-core [!alpha !armel !hppa !i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !loong64 !m68k !mips !mipsel !mips64 !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !riscv64 !s390x !sparc !sparc64] <!nocheck>,
+                    clang [!alpha !hppa !ia64 !m68k !mips !mipsel !mips64 !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !s390x !sparc !sparc64],
+                    coinor-libcoinmp-dev,
+                    coinor-libcoinutils-dev,
                     dbus-x11 [!alpha !armel !hppa !i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !loong64 !m68k !mips !mipsel !mips64 !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !riscv64 !s390x !sparc !sparc64] <!nocheck>,
-                    firebird3.0-server-core <!nocheck>,
+                    firebird-dev [!m68k],
+                    firebird3.0-server-core [!m68k] <!nocheck>,
                     fontconfig [amd64 arm64 armhf i386 ppc64el s390x] <!nocheck>,
                     fonts-crosextra-caladea [amd64 arm64 armhf i386 ppc64el s390x] <!nocheck>,
                     fonts-crosextra-carlito (>= 20230309) [amd64 arm64 armhf i386 ppc64el s390x] <!nocheck>,
@@ -210,8 +176,10 @@ Build-Depends-Arch: at-spi2-core [!alpha !armel !hppa !i386 !ia64 !kfreebsd-amd6
                     fonts-liberation (>= 1:2) [amd64 arm64 armhf i386 ppc64el s390x] <!nocheck>,
                     fonts-linuxlibertine [amd64 arm64 armhf i386 ppc64el s390x] <!nocheck>,
                     fonts-noto-core [amd64 arm64 armhf i386 ppc64el s390x] <!nocheck>,
+                    fonts-opensymbol <!pkg.libreoffice.opensymbolbuild>,
                     gdb [!alpha !armel !hppa !i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !loong64 !m68k !mips !mipsel !mips64 !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !riscv64 !s390x !sparc !sparc64] <!nocheck>,
                     ghostscript [!alpha !armel !hppa !i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !loong64 !m68k !mips !mipsel !mips64 !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !riscv64 !s390x !sparc !sparc64] <!nocheck>,
+                    gobject-introspection <!nogir>,
                     gpg [!alpha !armel !hppa !i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !loong64 !m68k !mips !mipsel !mips64 !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !riscv64 !s390x !sparc !sparc64] <!nocheck>,
                     gpg-agent [!alpha !armel !hppa !i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !loong64 !m68k !mips !mipsel !mips64 !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !riscv64 !s390x !sparc !sparc64] <!nocheck>,
                     gpgconf [!alpha !armel !hppa !i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !loong64 !m68k !mips !mipsel !mips64 !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !riscv64 !s390x !sparc !sparc64] <!nocheck>,
@@ -219,14 +187,49 @@ Build-Depends-Arch: at-spi2-core [!alpha !armel !hppa !i386 !ia64 !kfreebsd-amd6
                     hyphen-en-us [!alpha !armel !hppa !i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !loong64 !m68k !mips !mipsel !mips64 !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !riscv64 !s390x !sparc !sparc64] <!nocheck>,
                     hyphen-es [!alpha !armel !hppa !i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !loong64 !m68k !mips !mipsel !mips64 !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !riscv64 !s390x !sparc !sparc64] <!nocheck>,
                     imagemagick [!alpha !armel !hppa !i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !loong64 !m68k !mips !mipsel !mips64 !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !riscv64 !s390x !sparc !sparc64] <!nocheck>,
+                    libabsl-dev [alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 loong64 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el riscv64 s390x sparc sparc64],
+                    libatk1.0-dev,
                     libatspi2.0-dev [!alpha !armel !hppa !i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !loong64 !m68k !mips !mipsel !mips64 !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !riscv64 !s390x !sparc !sparc64] <!nocheck>,
+                    libavahi-client-dev,
+                    libcairo2-dev,
                     libcppunit-dev (>= 1.15.1-4) [amd64 arm64 armhf] <!nocheck>,
                     libcppunit-dev <!nocheck>,
+                    libdbus-1-dev,
+                    libebook1.2-dev,
+                    libgirepository1.0-dev <!nogir>,
+                    libglib2.0-dev,
+                    libgpg-error-dev,
+                    libgpgme-dev,
+                    libgpgmepp-dev,
+                    libgstreamer-plugins-base1.0-dev,
+                    libgstreamer1.0-dev,
+                    libgtk-3-dev,
+                    libgtk-4-dev,
+                    libkf5config-dev,
+                    libkf5coreaddons-dev,
+                    libkf5i18n-dev,
+                    libkf5kio-dev,
+                    libkf5windowsystem-dev,
+                    libldap-dev,
+                    liblpsolve55-dev,
+                    libmariadb-dev,
                     libnumbertext-data (>= 1.0.11) <!nocheck>,
+                    libopenjp2-7-dev [alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 loong64 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el riscv64 s390x sparc sparc64],
+                    libpq-dev,
+                    libqt5x11extras5-dev,
+                    libxcb1-dev,
+                    llvm [!alpha !hppa !ia64 !m68k !mips !mipsel !mips64 !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !s390x !sparc !sparc64],
                     locales [!alpha !armel !hppa !i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !loong64 !m68k !mips !mipsel !mips64 !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !riscv64 !s390x !sparc !sparc64] <!nocheck>,
+                    lp-solve,
                     poppler-data [!alpha !armel !hppa !i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !loong64 !m68k !mips !mipsel !mips64 !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !riscv64 !s390x !sparc !sparc64] <!nocheck>,
                     pstoedit [!alpha !armel !hppa !i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !loong64 !m68k !mips !mipsel !mips64 !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !riscv64 !s390x !sparc !sparc64] <!nocheck>,
                     python3-lxml [!alpha !armel !hppa !i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !loong64 !m68k !mips !mipsel !mips64 !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !riscv64 !s390x !sparc !sparc64] <!nocheck !nopython>,
+                    qmake6,
+                    qt5-qmake,
+                    qt6-base-dev,
+                    qt6-base-dev-tools,
+                    qtbase5-dev,
+                    qtbase5-dev-tools,
                     xauth [!alpha !armel !hppa !i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !loong64 !m68k !mips !mipsel !mips64 !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !riscv64 !s390x !sparc !sparc64] <!nocheck>,
                     xvfb [!alpha !armel !hppa !i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !loong64 !m68k !mips !mipsel !mips64 !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !riscv64 !s390x !sparc !sparc64] <!nocheck>
 Build-Depends-Indep: ant [!armhf !hppa !kfreebsd-amd64 !kfreebsd-i386 !mips64 !powerpcspe !ppc64el !s390x !sparc] <!nojava>,
@@ -234,6 +237,7 @@ Build-Depends-Indep: ant [!armhf !hppa !kfreebsd-amd64 !kfreebsd-i386 !mips64 !p
                      apparmor <!nocheck>,
                      dh-apparmor,
                      doxygen <!nodoc>,
+                     fontforge-nox | fontforge <!pkg.libreoffice.noopensymbolbuild>,
                      gettext,
                      graphviz <!nodoc>,
                      junit4 <!nojava>,
@@ -246,7 +250,6 @@ Build-Conflicts: amd-libopencl1,
                  fontconfig-config (= 2.14.1-1) <!nocheck>,
                  fontconfig-config (= 2.14.1-2) <!nocheck>,
                  fontconfig-config (= 2.14.1-3) <!nocheck>,
-                 fonts-opensymbol <!nocheck>,
                  nvidia-glx-dev,
                  nvidia-glx-legacy-dev,
                  nvidia-libopencl1
@@ -645,7 +648,7 @@ Package: libreoffice-help-common
 Architecture: all
 Depends: libreoffice-common, ${help-common-depends}, ${misc:Depends}
 Breaks: libreoffice-common (<< 1:6.1.0~alpha1-1)
-Replaces: libreoffice-common (<< 1:6.1.0~alpha1-1)
+Replaces: libreoffice-common (<< 4:24.2.2~rc2)
 Description: office productivity suite -- common files for LibreOffice help
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
@@ -5040,7 +5043,7 @@ Depends: liblibreoffice-java,
          ${java:Depends},
          ${misc:Depends}
 Enhances: libreoffice-writer
-Suggests: mediawiki
+Suggests: libreoffice-help-common, mediawiki
 Description: LibreOffice extension for working with MediaWiki articles
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
@@ -5128,6 +5131,7 @@ Depends: liblibreoffice-java,
          ${java-common-depends},
          ${java-runtime-depends},
          ${misc:Depends}
+Suggests: libreoffice-help-common
 Section: math
 Description: "Solver for Nonlinear Programming" extension for LibreOffice
  By default LibreOffice Calc ships with a solver engine for linear
@@ -5454,7 +5458,7 @@ Depends: libreoffice-core-nogui | libreoffice-core,
          ${firebird-engine-depends},
          ${misc:Depends},
          ${shlibs:Depends}
-Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 loong64 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el riscv64 s390x sparc sparc64
+Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 loong64 mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el riscv64 s390x sparc sparc64
 Section: database
 Enhances: libreoffice-base-drivers
 Description: Firebird SDBC driver for LibreOffice