Merging debian version 4:24.2.0-2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 36 insertions, 15 deletions

diff --git a/debian/control b/debian/control
index a21df56f49..c0c0683cf7 100644
--- a/debian/control
+++ b/debian/control
@@ -1,3 +1,8 @@
+#
+# NOTE: This file is autogenerated. DO NOT manually edit it! 
+# Edit debian/control*in and rules (whatever applicable), run debian/rules control
+# and move control.new to control if the difference is sane.
+#
 Source: libreoffice
 Section: editors
 Priority: optional
@@ -18,6 +23,7 @@ Build-Depends: autoconf,
                debhelper-compat (= 12),
                default-jdk (>= 2:1.17) [!hppa !hurd-i386 !kfreebsd-amd64 !kfreebsd-i386 !hurd-i386 !powerpcspe !s390 !sparc] <!nojava>,
                dh-python <!nopython>,
+               diffutils,
                firebird-dev,
                flex,
                fontforge-nox | fontforge,
@@ -4796,12 +4802,15 @@ Description: LibreOffice UNO runtime environment -- private libraries used by pu
  This package contains some private UNO/URE libraries which are used by public
  ones (e.g. cppu).
 
-Package: libuno-sal3
+Package: libuno-sal3t64
 Section: libs
 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
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: uno-libs3, ure (<< 5.0.0~rc2-1)
-Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3
+Replaces: libuno-sal3, uno-libs3, ure (<< 5.0.0~rc2-1)
+Breaks: libreoffice-core (<< 1:4.3.0~),
+        libuno-sal3 (<< ${source:Version}),
+        uno-libs3
+Provides: ${t64:Provides}
 Description: LibreOffice UNO runtime environment -- SAL public library
  The Uno Runtime Environment (URE) is the well-known UNO component model
  of LibreOffice, packaged up as an individual product.
@@ -4814,12 +4823,15 @@ Description: LibreOffice UNO runtime environment -- SAL public library
  .
  This package contains the System Abstraction Layer (SAL) library.
 
-Package: libuno-salhelpergcc3-3
+Package: libuno-salhelpergcc3-3t64
 Section: libs
 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
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: uno-libs3, ure (<< 5.0.0~rc2-1)
-Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3
+Replaces: libuno-salhelpergcc3-3, uno-libs3, ure (<< 5.0.0~rc2-1)
+Breaks: libreoffice-core (<< 1:4.3.0~),
+        libuno-salhelpergcc3-3 (<< ${source:Version}),
+        uno-libs3
+Provides: ${t64:Provides}
 Description: LibreOffice UNO runtime environment -- SAL helpers for C++ library
  The Uno Runtime Environment (URE) is the well-known UNO component model
  of LibreOffice, packaged up as an individual product.
@@ -4832,12 +4844,15 @@ Description: LibreOffice UNO runtime environment -- SAL helpers for C++ library
  .
  This package contains C++ helpers to make use of sal easier.
 
-Package: libuno-cppu3
+Package: libuno-cppu3t64
 Section: libs
 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
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: uno-libs3, ure (<< 5.0.0~rc2-1)
-Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3
+Replaces: libuno-cppu3, uno-libs3, ure (<< 5.0.0~rc2-1)
+Breaks: libreoffice-core (<< 1:4.3.0~),
+        libuno-cppu3 (<< ${source:Version}),
+        uno-libs3
+Provides: ${t64:Provides}
 Description: LibreOffice UNO runtime environment -- CPPU public library
  The Uno Runtime Environment (URE) is the well-known UNO component model
  of LibreOffice, packaged up as an individual product.
@@ -4851,14 +4866,17 @@ Description: LibreOffice UNO runtime environment -- CPPU public library
  This package contains CPPU, the type definitions/implementations for the core
  of UNO.
 
-Package: libuno-cppuhelpergcc3-3
+Package: libuno-cppuhelpergcc3-3t64
 Section: libs
 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
 Depends: uno-libs-private (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Replaces: uno-libs3, ure (<< 5.0.0~rc2-1)
-Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3
+Replaces: libuno-cppuhelpergcc3-3, uno-libs3, ure (<< 5.0.0~rc2-1)
+Breaks: libreoffice-core (<< 1:4.3.0~),
+        libuno-cppuhelpergcc3-3 (<< ${source:Version}),
+        uno-libs3
+Provides: ${t64:Provides}
 Description: LibreOffice UNO runtime environment -- CPPU helper library
  The Uno Runtime Environment (URE) is the well-known UNO component model
  of LibreOffice, packaged up as an individual product.
@@ -4872,12 +4890,15 @@ Description: LibreOffice UNO runtime environment -- CPPU helper library
  This package contains the cppuhelper library (helpers for using cppu in C++,
  e.g. templates for implementing UNO components, bootstrapping stuff)
 
-Package: libuno-purpenvhelpergcc3-3
+Package: libuno-purpenvhelpergcc3-3t64
 Section: libs
 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
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: uno-libs3, ure (<< 5.0.0~rc2-1)
-Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3
+Replaces: libuno-purpenvhelpergcc3-3, uno-libs3, ure (<< 5.0.0~rc2-1)
+Breaks: libreoffice-core (<< 1:4.3.0~),
+        libuno-purpenvhelpergcc3-3 (<< ${source:Version}),
+        uno-libs3
+Provides: ${t64:Provides}
 Description: LibreOffice UNO runtime environment -- "purpose environment" helper
  The Uno Runtime Environment (URE) is the well-known UNO component model
  of LibreOffice, packaged up as an individual product.