Merging debian version 4:24.2.0-2.

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

1 files changed, 20 insertions, 15 deletions

diff --git a/debian/control.ure.in b/debian/control.ure.in
index b36f010e2b..cbe7102031 100644
--- a/debian/control.ure.in
+++ b/debian/control.ure.in
@@ -17,12 +17,13 @@ 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: %OOO_ARCHS%
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: ure (<< 5.0.0~rc2-1), uno-libs3
-Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3
+Replaces: ure (<< 5.0.0~rc2-1), uno-libs3, libuno-sal3
+Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3, libuno-sal3 (<< ${source:Version})
+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.
@@ -35,12 +36,13 @@ 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: %OOO_ARCHS%
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: ure (<< 5.0.0~rc2-1), uno-libs3
-Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3
+Replaces: ure (<< 5.0.0~rc2-1), uno-libs3, libuno-salhelpergcc3-3
+Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3, libuno-salhelpergcc3-3 (<< ${source:Version})
+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.
@@ -53,12 +55,13 @@ 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: %OOO_ARCHS%
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: ure (<< 5.0.0~rc2-1), uno-libs3
-Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3
+Replaces: ure (<< 5.0.0~rc2-1), uno-libs3, libuno-cppu3
+Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3, libuno-cppu3 (<< ${source:Version})
+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.
@@ -72,12 +75,13 @@ 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: %OOO_ARCHS%
 Depends: ${misc:Depends}, ${shlibs:Depends}, uno-libs-private (= ${binary:Version})
-Replaces: ure (<< 5.0.0~rc2-1), uno-libs3
-Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3
+Replaces: ure (<< 5.0.0~rc2-1), uno-libs3, libuno-cppuhelpergcc3-3
+Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3, libuno-cppuhelpergcc3-3 (<< ${source:Version})
+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.
@@ -91,12 +95,13 @@ 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: %OOO_ARCHS%
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: ure (<< 5.0.0~rc2-1), uno-libs3
-Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3
+Replaces: ure (<< 5.0.0~rc2-1), uno-libs3, libuno-purpenvhelpergcc3-3
+Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3, libuno-purpenvhelpergcc3-3 (<< ${source:Version})
+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.