Reverting t64 migration for backports.

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

19 files changed, 70 insertions, 95 deletions

diff --git a/debian/control b/debian/control
index c0c0683cf7..15a3b9f953 100644
--- a/debian/control
+++ b/debian/control
@@ -4802,15 +4802,12 @@ 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-sal3t64
+Package: libuno-sal3
 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: 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}
+Replaces: uno-libs3, ure (<< 5.0.0~rc2-1)
+Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3
 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.
@@ -4823,15 +4820,12 @@ Description: LibreOffice UNO runtime environment -- SAL public library
  .
  This package contains the System Abstraction Layer (SAL) library.
 
-Package: libuno-salhelpergcc3-3t64
+Package: libuno-salhelpergcc3-3
 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: 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}
+Replaces: uno-libs3, ure (<< 5.0.0~rc2-1)
+Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3
 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.
@@ -4844,15 +4838,12 @@ Description: LibreOffice UNO runtime environment -- SAL helpers for C++ library
  .
  This package contains C++ helpers to make use of sal easier.
 
-Package: libuno-cppu3t64
+Package: libuno-cppu3
 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: 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}
+Replaces: uno-libs3, ure (<< 5.0.0~rc2-1)
+Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3
 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.
@@ -4866,17 +4857,14 @@ Description: LibreOffice UNO runtime environment -- CPPU public library
  This package contains CPPU, the type definitions/implementations for the core
  of UNO.
 
-Package: libuno-cppuhelpergcc3-3t64
+Package: libuno-cppuhelpergcc3-3
 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: 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}
+Replaces: uno-libs3, ure (<< 5.0.0~rc2-1)
+Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3
 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.
@@ -4890,15 +4878,12 @@ 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-3t64
+Package: libuno-purpenvhelpergcc3-3
 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: 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}
+Replaces: uno-libs3, ure (<< 5.0.0~rc2-1)
+Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3
 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.
diff --git a/debian/control.ure.in b/debian/control.ure.in
index cbe7102031..b36f010e2b 100644
--- a/debian/control.ure.in
+++ b/debian/control.ure.in
@@ -17,13 +17,12 @@ 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-sal3t64
+Package: libuno-sal3
 Section: libs
 Architecture: %OOO_ARCHS%
 Depends: ${misc:Depends}, ${shlibs:Depends}
-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}
+Replaces: ure (<< 5.0.0~rc2-1), uno-libs3
+Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3
 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.
@@ -36,13 +35,12 @@ Description: LibreOffice UNO runtime environment -- SAL public library
  .
  This package contains the System Abstraction Layer (SAL) library.
 
-Package: libuno-salhelpergcc3-3t64
+Package: libuno-salhelpergcc3-3
 Section: libs
 Architecture: %OOO_ARCHS%
 Depends: ${misc:Depends}, ${shlibs:Depends}
-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}
+Replaces: ure (<< 5.0.0~rc2-1), uno-libs3
+Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3
 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.
@@ -55,13 +53,12 @@ Description: LibreOffice UNO runtime environment -- SAL helpers for C++ library
  .
  This package contains C++ helpers to make use of sal easier.
 
-Package: libuno-cppu3t64
+Package: libuno-cppu3
 Section: libs
 Architecture: %OOO_ARCHS%
 Depends: ${misc:Depends}, ${shlibs:Depends}
-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}
+Replaces: ure (<< 5.0.0~rc2-1), uno-libs3
+Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3
 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.
@@ -75,13 +72,12 @@ Description: LibreOffice UNO runtime environment -- CPPU public library
  This package contains CPPU, the type definitions/implementations for the core
  of UNO.
 
-Package: libuno-cppuhelpergcc3-3t64
+Package: libuno-cppuhelpergcc3-3
 Section: libs
 Architecture: %OOO_ARCHS%
 Depends: ${misc:Depends}, ${shlibs:Depends}, uno-libs-private (= ${binary:Version})
-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}
+Replaces: ure (<< 5.0.0~rc2-1), uno-libs3
+Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3
 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.
@@ -95,13 +91,12 @@ 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-3t64
+Package: libuno-purpenvhelpergcc3-3
 Section: libs
 Architecture: %OOO_ARCHS%
 Depends: ${misc:Depends}, ${shlibs:Depends}
-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}
+Replaces: ure (<< 5.0.0~rc2-1), uno-libs3
+Breaks: libreoffice-core (<< 1:4.3.0~), uno-libs3
 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.
diff --git a/debian/libuno-cppu3.lintian-overrides b/debian/libuno-cppu3.lintian-overrides
new file mode 100644
index 0000000000..8a71f33686
--- /dev/null
+++ b/debian/libuno-cppu3.lintian-overrides
@@ -0,0 +1 @@
+libuno-cppu3: symbols-declares-dependency-on-other-package libstdc++6 (>= 4.1.1) (libuno_cppu.so.3) [symbols]
diff --git a/debian/libuno-cppu3t64.symbols b/debian/libuno-cppu3.symbols
index c745fb9677..258414ca30 100644
--- a/debian/libuno-cppu3t64.symbols
+++ b/debian/libuno-cppu3.symbols
@@ -1,5 +1,5 @@
-libuno_cppu.so.3 libuno-cppu3t64 #MINVER#
-| libuno-cppu3t64 #MINVER#, libstdc++6 (>= 4.1.1)
+libuno_cppu.so.3 libuno-cppu3 #MINVER#
+| libuno-cppu3 #MINVER#, libstdc++6 (>= 4.1.1)
  (symver)UDK_3_0_0 1.4.0
  (symver)UDK_3.1 1.4.0
  (symver)UDK_3.2 1.4.0
diff --git a/debian/libuno-cppu3t64.lintian-overrides b/debian/libuno-cppu3t64.lintian-overrides
deleted file mode 100644
index ad1c692104..0000000000
--- a/debian/libuno-cppu3t64.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libuno-cppu3t64: symbols-declares-dependency-on-other-package libstdc++6 (>= 4.1.1) (libuno_cppu.so.3) [symbols]
-libuno-cppu3t64: package-name-doesnt-match-sonames libuno-cppu3
diff --git a/debian/libuno-cppuhelpergcc3-3.lintian-overrides b/debian/libuno-cppuhelpergcc3-3.lintian-overrides
new file mode 100644
index 0000000000..d5f90ada11
--- /dev/null
+++ b/debian/libuno-cppuhelpergcc3-3.lintian-overrides
@@ -0,0 +1,2 @@
+libuno-cppuhelpergcc3-3: symbols-declares-dependency-on-other-package uno-libs-private (libuno_cppuhelpergcc3.so.3) [symbols]
+libuno-cppuhelpergcc3-3: symbols-declares-dependency-on-other-package libstdc++6 (>= 4.1.1) (libuno_cppuhelpergcc3.so.3) [symbols]
diff --git a/debian/libuno-cppuhelpergcc3-3t64.symbols b/debian/libuno-cppuhelpergcc3-3.symbols
index 814f8b3f7a..30be52c3ac 100644
--- a/debian/libuno-cppuhelpergcc3-3t64.symbols
+++ b/debian/libuno-cppuhelpergcc3-3.symbols
@@ -1,5 +1,5 @@
-libuno_cppuhelpergcc3.so.3 libuno-cppuhelpergcc3-3t64 #MINVER#, uno-libs-private
-| libuno-cppuhelpergcc3-3t64 #MINVER#, uno-libs-private, libstdc++6 (>= 4.1.1)
+libuno_cppuhelpergcc3.so.3 libuno-cppuhelpergcc3-3 #MINVER#, uno-libs-private
+| libuno-cppuhelpergcc3-3 #MINVER#, uno-libs-private, libstdc++6 (>= 4.1.1)
  (symver)UDK_3_0_0 1.4.0
  (symver)UDK_3.1 1.4.0
  (symver)UDK_3.2 1.4.0
diff --git a/debian/libuno-cppuhelpergcc3-3t64.lintian-overrides b/debian/libuno-cppuhelpergcc3-3t64.lintian-overrides
deleted file mode 100644
index 3e4ed0e9e9..0000000000
--- a/debian/libuno-cppuhelpergcc3-3t64.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-libuno-cppuhelpergcc3-3t64: symbols-declares-dependency-on-other-package uno-libs-private (libuno_cppuhelpergcc3.so.3) [symbols]
-libuno-cppuhelpergcc3-3t64: symbols-declares-dependency-on-other-package libstdc++6 (>= 4.1.1) (libuno_cppuhelpergcc3.so.3) [symbols]
-libuno-cppuhelpergcc3-3t64: package-name-doesnt-match-sonames libuno-cppuhelpergcc3-3
diff --git a/debian/libuno-purpenvhelpergcc3-3.lintian-overrides b/debian/libuno-purpenvhelpergcc3-3.lintian-overrides
new file mode 100644
index 0000000000..8a716d2dcf
--- /dev/null
+++ b/debian/libuno-purpenvhelpergcc3-3.lintian-overrides
@@ -0,0 +1 @@
+libuno-purpenvhelpergcc3-3: symbols-declares-dependency-on-other-package libstdc++6 (>= 4.1.1) (libuno_purpenvhelpergcc3.so.3) [symbols]
diff --git a/debian/libuno-purpenvhelpergcc3-3t64.symbols b/debian/libuno-purpenvhelpergcc3-3.symbols
index 75b85e93e4..e9054a798d 100644
--- a/debian/libuno-purpenvhelpergcc3-3t64.symbols
+++ b/debian/libuno-purpenvhelpergcc3-3.symbols
@@ -1,5 +1,5 @@
-libuno_purpenvhelpergcc3.so.3 libuno-purpenvhelpergcc3-3t64 #MINVER#
-| libuno-purpenvhelpergcc3-3t64 #MINVER#, libstdc++6 (>= 4.1.1)
+libuno_purpenvhelpergcc3.so.3 libuno-purpenvhelpergcc3-3 #MINVER#
+| libuno-purpenvhelpergcc3-3 #MINVER#, libstdc++6 (>= 4.1.1)
  (symver)UDK_3_0_0 1.4.0
  (symver)GLIBCXX_3.4 3.6 1
 # add new stuff BELOW this line
diff --git a/debian/libuno-purpenvhelpergcc3-3t64.lintian-overrides b/debian/libuno-purpenvhelpergcc3-3t64.lintian-overrides
deleted file mode 100644
index fca2887d13..0000000000
--- a/debian/libuno-purpenvhelpergcc3-3t64.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libuno-purpenvhelpergcc3-3t64: symbols-declares-dependency-on-other-package libstdc++6 (>= 4.1.1) (libuno_purpenvhelpergcc3.so.3) [symbols]
-libuno-purpenvhelpergcc3-3t64: package-name-doesnt-match-sonames libuno-purpenvhelpergcc3-3
diff --git a/debian/libuno-sal3.lintian-overrides b/debian/libuno-sal3.lintian-overrides
new file mode 100644
index 0000000000..6a166e4967
--- /dev/null
+++ b/debian/libuno-sal3.lintian-overrides
@@ -0,0 +1 @@
+libuno-sal3: symbols-declares-dependency-on-other-package libstdc++6 (>= 4.1.1) (libuno_sal.so.3) [symbols]
diff --git a/debian/libuno-sal3t64.symbols b/debian/libuno-sal3.symbols
index 7e174a6f67..6449051867 100644
--- a/debian/libuno-sal3t64.symbols
+++ b/debian/libuno-sal3.symbols
@@ -1,5 +1,5 @@
-libuno_sal.so.3 libuno-sal3t64 #MINVER#
-| libuno-sal3t64 #MINVER#, libstdc++6 (>= 4.1.1)
+libuno_sal.so.3 libuno-sal3 #MINVER#
+| libuno-sal3 #MINVER#, libstdc++6 (>= 4.1.1)
  (symver)UDK_3_0_0 1.4.0
  (symver)UDK_3.1 1.4.0
  (symver)UDK_3.2 1.4.0
diff --git a/debian/libuno-sal3t64.lintian-overrides b/debian/libuno-sal3t64.lintian-overrides
deleted file mode 100644
index 48f5f465aa..0000000000
--- a/debian/libuno-sal3t64.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libuno-sal3t64: symbols-declares-dependency-on-other-package libstdc++6 (>= 4.1.1) (libuno_sal.so.3) [symbols]
-libuno-sal3t64: package-name-doesnt-match-sonames libuno-sal3
diff --git a/debian/libuno-salhelpergcc3-3.lintian-overrides b/debian/libuno-salhelpergcc3-3.lintian-overrides
new file mode 100644
index 0000000000..1e71601792
--- /dev/null
+++ b/debian/libuno-salhelpergcc3-3.lintian-overrides
@@ -0,0 +1 @@
+libuno-salhelpergcc3-3: symbols-declares-dependency-on-other-package libstdc++6 (>= 4.1.1) (libuno_salhelpergcc3.so.3) [symbols]
diff --git a/debian/libuno-salhelpergcc3-3t64.symbols b/debian/libuno-salhelpergcc3-3.symbols
index f9b9bacff3..3ff04b785c 100644
--- a/debian/libuno-salhelpergcc3-3t64.symbols
+++ b/debian/libuno-salhelpergcc3-3.symbols
@@ -1,5 +1,5 @@
-libuno_salhelpergcc3.so.3 libuno-salhelpergcc3-3t64 #MINVER#
-| libuno-salhelpergcc3-3t64 #MINVER#, libstdc++6 (>= 4.1.1)
+libuno_salhelpergcc3.so.3 libuno-salhelpergcc3-3 #MINVER#
+| libuno-salhelpergcc3-3 #MINVER#, libstdc++6 (>= 4.1.1)
  (symver)UDK_3_0_0 1.4.0
  (symver)UDK_3.1 1.4.0
  (symver)LIBO_UDK_3.6 3.6.0~beta
diff --git a/debian/libuno-salhelpergcc3-3t64.lintian-overrides b/debian/libuno-salhelpergcc3-3t64.lintian-overrides
deleted file mode 100644
index 956945a733..0000000000
--- a/debian/libuno-salhelpergcc3-3t64.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libuno-salhelpergcc3-3t64: symbols-declares-dependency-on-other-package libstdc++6 (>= 4.1.1) (libuno_salhelpergcc3.so.3) [symbols]
-libuno-salhelpergcc3-3t64: package-name-doesnt-match-sonames libuno-salhelpergcc3-3
diff --git a/debian/rules b/debian/rules
index 606581d31b..7ee022c47a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3167,18 +3167,18 @@ ifeq "$(ENABLE_JAVA)" "y"
 endif
 	# and the public libs to their respective packages
 	for i in sal cppu; do \
-		mkdir -p debian/libuno-$${i}3t64/$(OODIR)/program; \
-		mkdir -p debian/libuno-$${i}3t64/usr/lib/$(DEB_HOST_MULTIARCH); \
+		mkdir -p debian/libuno-$${i}3/$(OODIR)/program; \
+		mkdir -p debian/libuno-$${i}3/usr/lib/$(DEB_HOST_MULTIARCH); \
 		mv debian/ure/$(OODIR)/program/libuno_$${i}.so.3 \
-			debian/libuno-$${i}3t64/$(OODIR)/program; \
-		ln -sf /$(OODIR)/program/`basename libuno_$$i.so.3` debian/libuno-$${i}3t64/usr/lib/$(DEB_HOST_MULTIARCH)/`basename libuno_$$i.so.3`; \
+			debian/libuno-$${i}3/$(OODIR)/program; \
+		ln -sf /$(OODIR)/program/`basename libuno_$$i.so.3` debian/libuno-$${i}3/usr/lib/$(DEB_HOST_MULTIARCH)/`basename libuno_$$i.so.3`; \
 	done
 	for i in salhelpergcc3 cppuhelpergcc3 purpenvhelpergcc3; do \
-		mkdir -p debian/libuno-$${i}-3t64/$(OODIR)/program; \
-		mkdir -p debian/libuno-$${i}-3t64/usr/lib/$(DEB_HOST_MULTIARCH); \
+		mkdir -p debian/libuno-$${i}-3/$(OODIR)/program; \
+		mkdir -p debian/libuno-$${i}-3/usr/lib/$(DEB_HOST_MULTIARCH); \
 		mv debian/ure/$(OODIR)/program/libuno_$${i}.so.3 \
-			debian/libuno-$${i}-3t64/$(OODIR)/program; \
-		ln -sf /$(OODIR)/program/`basename libuno_$$i.so.3` debian/libuno-$${i}-3t64/usr/lib/$(DEB_HOST_MULTIARCH)/`basename libuno_$$i.so.3`; \
+			debian/libuno-$${i}-3/$(OODIR)/program; \
+		ln -sf /$(OODIR)/program/`basename libuno_$$i.so.3` debian/libuno-$${i}-3/usr/lib/$(DEB_HOST_MULTIARCH)/`basename libuno_$$i.so.3`; \
 	done
 	# we also need libxmlreaderlo.so, libreglo.so and libunoidllo.so (libuno_cppuhelpergcc3.so.3
         # needs it) and libstorelo.so (libreglo.so needs it)
@@ -3980,7 +3980,7 @@ endif
 	dh_bugfiles -a -A
 	dh_link -a
 ifeq "$(BUILD_DBGSYM_PACKAGES)" "y"
-	for i in libuno-cppu3t64 libuno-sal3t64 libreoffice-core libreoffice-writer; do \
+	for i in libuno-cppu3 libuno-sal3 libreoffice-core libreoffice-writer; do \
 		rm -rf debian/.debhelper/$$i/dbgsym-root; \
 	done
   ifeq "$(BUILD_NOGUI_PACKAGES)" "y"
@@ -4006,12 +4006,12 @@ ifeq "$(BUILD_DBGSYM_PACKAGES)" "y"
 
 	# move sal and cppu gdb helpers into their respective packages
 	for i in sal cppu; do \
-		mkdir -p debian/.debhelper/libuno-$${i}3t64/dbgsym-root/usr/share/gdb/auto-load/$(OODIR)/program; \
-		mkdir -p debian/.debhelper/libuno-$${i}3t64/dbgsym-root/usr/share/libreoffice/gdb/libreoffice; \
+		mkdir -p debian/.debhelper/libuno-$${i}3/dbgsym-root/usr/share/gdb/auto-load/$(OODIR)/program; \
+		mkdir -p debian/.debhelper/libuno-$${i}3/dbgsym-root/usr/share/libreoffice/gdb/libreoffice; \
 		mv debian/.debhelper/libreoffice-core/dbgsym-root/usr/share/gdb/auto-load/$(OODIR)/program/libuno_$$i.so.3-gdb.py \
-			debian/.debhelper/libuno-$${i}3t64/dbgsym-root/usr/share/gdb/auto-load/$(OODIR)/program; \
+			debian/.debhelper/libuno-$${i}3/dbgsym-root/usr/share/gdb/auto-load/$(OODIR)/program; \
 		mv debian/.debhelper/libreoffice-core/dbgsym-root/usr/share/libreoffice/gdb/libreoffice/$$i.py \
-			debian/.debhelper/libuno-$${i}3t64/dbgsym-root/usr/share/libreoffice/gdb/libreoffice; \
+			debian/.debhelper/libuno-$${i}3/dbgsym-root/usr/share/libreoffice/gdb/libreoffice; \
 	done
 
 	# move sw and writerfilter gdb helpers to writer-dbgsym
@@ -4062,7 +4062,7 @@ ifeq "$(ENABLE_INTROSPECTION)" "y"
 endif
 	dh_strip_nondeterminism -a
 	for i in sal3 cppu3 salhelpergcc3-3 cppuhelpergcc3-3 purpenvhelpergcc3-3; do \
-		dh_makeshlibs -plibuno-$${i}t64 -V"libuno-$${i}t64 (>= 4:$(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }' | cut -d. -f1-3)~)" -- -c2 -V -v$(BINARY_VERSION); \
+		dh_makeshlibs -plibuno-$${i} -V"libuno-$${i} (>= 4:$(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }' | cut -d. -f1-3)~)" -- -c2 -V -v$(BINARY_VERSION); \
 	done
 	dh_makeshlibs -n -pure -V"ure (>= 4:$(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }' | cut -d. -f1-3)~)" -- -d -V -v$(BINARY_VERSION)
 	dh_installdeb -a
@@ -4117,17 +4117,17 @@ endif
 endif
 
 		dh_shlibdeps -a -Nlibreoffice-core-nogui -Nure \
-			-Lure -Llibuno-sal3t64 -Llibpuno-cppu3t64 -Llibuno-salhelpergcc3-3t64 -Llibcppuhelpergcc3-3t64 -Llibuno-purpenvhelpergcc3-3t64 \
-			-l$(CURDIR)/debian/libuno-sal3t64/$(OODIR)/program:$(CURDIR)/debian/libuno-cppu3t64/$(OODIR)/program:$(CURDIR)/debian/libuno-salhelpergcc3-3t64/$(OODIR)/program:$(CURDIR)/debian/libuno-cppuhelpergcc3-3t64/$(OODIR)/program:$(CURDIR)/debian/libuno-purpenvhelpergcc3-3t64/$(OODIR)/program:$(CURDIR)/debian/ure/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-core/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-base-core/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-base/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-writer/$(OODIR)/program \
+			-Lure -Llibuno-sal3 -Llibpuno-cppu3 -Llibuno-salhelpergcc3-3 -Llibcppuhelpergcc3-3 -Llibuno-purpenvhelpergcc3-3 \
+			-l$(CURDIR)/debian/libuno-sal3/$(OODIR)/program:$(CURDIR)/debian/libuno-cppu3/$(OODIR)/program:$(CURDIR)/debian/libuno-salhelpergcc3-3/$(OODIR)/program:$(CURDIR)/debian/libuno-cppuhelpergcc3-3/$(OODIR)/program:$(CURDIR)/debian/libuno-purpenvhelpergcc3-3/$(OODIR)/program:$(CURDIR)/debian/ure/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-core/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-base-core/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-base/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-writer/$(OODIR)/program \
 			$(SHLIBS_OVERRIDE)
 		dh_shlibdeps -pure \
-			-Llibuno-sal3t64 -Llibpuno-cppu3t64 -Llibuno-salhelpergcc3-3t64 -Llibcppuhelpergcc3-3t64 -Llibuno-purpenvhelpergcc3-3t64 \
-			-l$(CURDIR)/debian/libuno-sal3t64/$(OODIR)/program:$(CURDIR)/debian/libuno-cppu3t64/$(OODIR)/program:$(CURDIR)/debian/libuno-salhelpergcc3-3t64/$(OODIR)/program:$(CURDIR)/debian/libuno-cppuhelpergcc3-3t64/$(OODIR)/program:$(CURDIR)/debian/libuno-purpenvhelpergcc3-3t64/$(OODIR)/program:$(CURDIR)/debian/ure/$(OODIR)/program \
+			-Llibuno-sal3 -Llibpuno-cppu3 -Llibuno-salhelpergcc3-3 -Llibcppuhelpergcc3-3 -Llibuno-purpenvhelpergcc3-3 \
+			-l$(CURDIR)/debian/libuno-sal3/$(OODIR)/program:$(CURDIR)/debian/libuno-cppu3/$(OODIR)/program:$(CURDIR)/debian/libuno-salhelpergcc3-3/$(OODIR)/program:$(CURDIR)/debian/libuno-cppuhelpergcc3-3/$(OODIR)/program:$(CURDIR)/debian/libuno-purpenvhelpergcc3-3/$(OODIR)/program:$(CURDIR)/debian/ure/$(OODIR)/program \
 			-- -xure
 ifeq "$(BUILD_NOGUI_PACKAGES)" "y"
 		dh_shlibdeps -plibreoffice-core-nogui \
-			-Lure -Llibuno-sal3t64 -Llibpuno-cppu3t64 -Llibuno-salhelpergcc3-3t64 -Llibcppuhelpergcc3-3t64 -Llibuno-purpenvhelpergcc3-3t64 \
-			-l$(CURDIR)/debian/libuno-sal3t64/$(OODIR)/program:$(CURDIR)/debian/libuno-cppu3t64/$(OODIR)/program:$(CURDIR)/debian/libuno-salhelpergcc3-3t64/$(OODIR)/program:$(CURDIR)/debian/libuno-cppuhelpergcc3-3t64/$(OODIR)/program:$(CURDIR)/debian/libuno-purpenvhelpergcc3-3t64/$(OODIR)/program:$(CURDIR)/debian/ure/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-core-nogui/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-base-core/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-base/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-writer/$(OODIR)/program \
+			-Lure -Llibuno-sal3 -Llibpuno-cppu3 -Llibuno-salhelpergcc3-3 -Llibcppuhelpergcc3-3 -Llibuno-purpenvhelpergcc3-3 \
+			-l$(CURDIR)/debian/libuno-sal3/$(OODIR)/program:$(CURDIR)/debian/libuno-cppu3/$(OODIR)/program:$(CURDIR)/debian/libuno-salhelpergcc3-3/$(OODIR)/program:$(CURDIR)/debian/libuno-cppuhelpergcc3-3/$(OODIR)/program:$(CURDIR)/debian/libuno-purpenvhelpergcc3-3/$(OODIR)/program:$(CURDIR)/debian/ure/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-core-nogui/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-base-core/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-base/$(OODIR)/program:$(CURDIR)/$(PKGDIR)-writer/$(OODIR)/program \
 			$(SHLIBS_OVERRIDE)
 endif
   ifneq (,$(filter coinmp, $(SYSTEM_STUFF)))
@@ -4174,7 +4174,7 @@ endif
 		-V'liberation-fonts-recommends=$(LIBERATION_FONTS_RECOMMENDS)' \
 		-v$(BINARY_VERSION)
 ifeq "$(BUILD_DBGSYM_PACKAGES)" "y"
-	for i in libuno-sal3t64 libuno-cppu3t64 libuno-salhelpergcc3-3t64 libuno-cppuhelpergcc3-3t64 libuno-purpenvhelpergcc3-3t64 \
+	for i in libuno-sal3 libuno-cppu3 libuno-salhelpergcc3-3 libuno-cppuhelpergcc3-3 libuno-purpenvhelpergcc3-3 \
 		libreoffice-core libreoffice-writer; do \
 		perl -pi -e 's/^(Depends:.*)/\1\nRecommends: gdb, python3-six/' \
 		debian/.debhelper/$$i/dbgsym-root/DEBIAN/control; \
diff --git a/debian/tests/control b/debian/tests/control
index d4de77c0a4..121d367d1e 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -108,7 +108,7 @@ Restrictions: allow-stderr, skippable
 
 #Tests: cppunit-subsequentcheck
 #Architecture: amd64 arm64 armhf
-#Depends: @builddeps@, libreoffice,libreoffice-core,libreoffice-common,libreoffice-java-common,libreoffice-writer,libreoffice-calc,libreoffice-impress,libreoffice-draw,libreoffice-math,libreoffice-base-core,libreoffice-base,libreoffice-style-breeze,libreoffice-style-colibre,libreoffice-style-sifr,libreoffice-style-elementary,libreoffice-style-karasa-jaga,libreoffice-style-sukapura,libreoffice-gnome,python3-uno,libreoffice-script-provider-python,libreoffice-script-provider-bsh,libreoffice-script-provider-js,libreoffice-sdbc-hsqldb,libreoffice-sdbc-mysql,libreoffice-base-drivers,python3-access2base,python3-scriptforge,libofficebean-java,libreoffice-uiconfig-common,libreoffice-uiconfig-base,libreoffice-uiconfig-calc,libreoffice-uiconfig-draw,libreoffice-uiconfig-impress,libreoffice-uiconfig-math,libreoffice-uiconfig-writer,uno-libs-private,libuno-sal3t64,libuno-cppu3t64,ure,ure-java,libunoloader-java,liblibreoffice-java,libreoffice-wiki-publisher,libreoffice-report-builder,libreoffice-report-builder-bin,libreoffice-uiconfig-report-builder,libreoffice-nlpsolver,fonts-opensymbol,libreoffice-dev,libreoffice-dev-gui,libreoffice-dev-common,libreofficekit-dev,libreoffice-gtk3,gir1.2-lokdocview-0.1,liblibreofficekitgtk,libreofficekit-data,libreoffice-gtk4,libreoffice-kf5,libreoffice-qt5,libreoffice-qt6,libreoffice-plasma,libreoffice-sdbc-postgresql,libreoffice-evolution,libreoffice-subsequentcheckbase,libreoffice-smoketest-data,libreoffice-librelogo,libreoffice-sdbc-firebird
+#Depends: @builddeps@, libreoffice,libreoffice-core,libreoffice-common,libreoffice-java-common,libreoffice-writer,libreoffice-calc,libreoffice-impress,libreoffice-draw,libreoffice-math,libreoffice-base-core,libreoffice-base,libreoffice-style-breeze,libreoffice-style-colibre,libreoffice-style-sifr,libreoffice-style-elementary,libreoffice-style-karasa-jaga,libreoffice-style-sukapura,libreoffice-gnome,python3-uno,libreoffice-script-provider-python,libreoffice-script-provider-bsh,libreoffice-script-provider-js,libreoffice-sdbc-hsqldb,libreoffice-sdbc-mysql,libreoffice-base-drivers,python3-access2base,python3-scriptforge,libofficebean-java,libreoffice-uiconfig-common,libreoffice-uiconfig-base,libreoffice-uiconfig-calc,libreoffice-uiconfig-draw,libreoffice-uiconfig-impress,libreoffice-uiconfig-math,libreoffice-uiconfig-writer,uno-libs-private,libuno-sal3,libuno-cppu3,ure,ure-java,libunoloader-java,liblibreoffice-java,libreoffice-wiki-publisher,libreoffice-report-builder,libreoffice-report-builder-bin,libreoffice-uiconfig-report-builder,libreoffice-nlpsolver,fonts-opensymbol,libreoffice-dev,libreoffice-dev-gui,libreoffice-dev-common,libreofficekit-dev,libreoffice-gtk3,gir1.2-lokdocview-0.1,liblibreofficekitgtk,libreofficekit-data,libreoffice-gtk4,libreoffice-kf5,libreoffice-qt5,libreoffice-qt6,libreoffice-plasma,libreoffice-sdbc-postgresql,libreoffice-evolution,libreoffice-subsequentcheckbase,libreoffice-smoketest-data,libreoffice-librelogo,libreoffice-sdbc-firebird
 #Restrictions: build-needed, rw-build-tree, allow-stderr
 #
 ## Those tests even work when there is no /usr/lib/libreoffice there in any way. @builddeps@ is enough.
@@ -116,12 +116,12 @@ Restrictions: allow-stderr, skippable
 ## or whatever update broke it we should know
 #Tests: slowcheck
 #Architecture: amd64 arm64 armhf
-##Depends: @builddeps@, libreoffice,libreoffice-core,libreoffice-common,libreoffice-java-common,libreoffice-writer,libreoffice-calc,libreoffice-impress,libreoffice-draw,libreoffice-math,libreoffice-base-core,libreoffice-base,libreoffice-style-breeze,libreoffice-style-colibre,libreoffice-style-sifr,libreoffice-style-elementary,libreoffice-style-karasa-jaga,libreoffice-style-sukapura,libreoffice-gnome,python3-uno,libreoffice-script-provider-python,libreoffice-script-provider-bsh,libreoffice-script-provider-js,libreoffice-sdbc-hsqldb,libreoffice-sdbc-mysql,libreoffice-base-drivers,python3-access2base,python3-scriptforge,libofficebean-java,libreoffice-uiconfig-common,libreoffice-uiconfig-base,libreoffice-uiconfig-calc,libreoffice-uiconfig-draw,libreoffice-uiconfig-impress,libreoffice-uiconfig-math,libreoffice-uiconfig-writer,uno-libs-private,libuno-sal3t64,libuno-cppu3t64,ure,ure-java,libunoloader-java,liblibreoffice-java,libreoffice-wiki-publisher,libreoffice-report-builder,libreoffice-report-builder-bin,libreoffice-uiconfig-report-builder,libreoffice-nlpsolver,fonts-opensymbol,libreoffice-dev,libreoffice-dev-gui,libreoffice-dev-common,libreofficekit-dev,libreoffice-gtk3,gir1.2-lokdocview-0.1,liblibreofficekitgtk,libreofficekit-data,libreoffice-gtk4,libreoffice-kf5,libreoffice-qt5,libreoffice-qt6,libreoffice-plasma,libreoffice-sdbc-postgresql,libreoffice-evolution,libreoffice-subsequentcheckbase,libreoffice-smoketest-data,libreoffice-librelogo,libreoffice-sdbc-firebird
+##Depends: @builddeps@, libreoffice,libreoffice-core,libreoffice-common,libreoffice-java-common,libreoffice-writer,libreoffice-calc,libreoffice-impress,libreoffice-draw,libreoffice-math,libreoffice-base-core,libreoffice-base,libreoffice-style-breeze,libreoffice-style-colibre,libreoffice-style-sifr,libreoffice-style-elementary,libreoffice-style-karasa-jaga,libreoffice-style-sukapura,libreoffice-gnome,python3-uno,libreoffice-script-provider-python,libreoffice-script-provider-bsh,libreoffice-script-provider-js,libreoffice-sdbc-hsqldb,libreoffice-sdbc-mysql,libreoffice-base-drivers,python3-access2base,python3-scriptforge,libofficebean-java,libreoffice-uiconfig-common,libreoffice-uiconfig-base,libreoffice-uiconfig-calc,libreoffice-uiconfig-draw,libreoffice-uiconfig-impress,libreoffice-uiconfig-math,libreoffice-uiconfig-writer,uno-libs-private,libuno-sal3,libuno-cppu3,ure,ure-java,libunoloader-java,liblibreoffice-java,libreoffice-wiki-publisher,libreoffice-report-builder,libreoffice-report-builder-bin,libreoffice-uiconfig-report-builder,libreoffice-nlpsolver,fonts-opensymbol,libreoffice-dev,libreoffice-dev-gui,libreoffice-dev-common,libreofficekit-dev,libreoffice-gtk3,gir1.2-lokdocview-0.1,liblibreofficekitgtk,libreofficekit-data,libreoffice-gtk4,libreoffice-kf5,libreoffice-qt5,libreoffice-qt6,libreoffice-plasma,libreoffice-sdbc-postgresql,libreoffice-evolution,libreoffice-subsequentcheckbase,libreoffice-smoketest-data,libreoffice-librelogo,libreoffice-sdbc-firebird
 #Restrictions: build-needed, rw-build-tree, allow-stderr, superficial
 #
 #Tests: unitcheck
 #Architecture: amd64 arm64 armhf
-#Depends: @builddeps@, libreoffice,libreoffice-core,libreoffice-common,libreoffice-java-common,libreoffice-writer,libreoffice-calc,libreoffice-impress,libreoffice-draw,libreoffice-math,libreoffice-base-core,libreoffice-base,libreoffice-style-breeze,libreoffice-style-colibre,libreoffice-style-sifr,libreoffice-style-elementary,libreoffice-style-karasa-jaga,libreoffice-style-sukapura,libreoffice-gnome,python3-uno,libreoffice-script-provider-python,libreoffice-script-provider-bsh,libreoffice-script-provider-js,libreoffice-sdbc-hsqldb,libreoffice-sdbc-mysql,libreoffice-base-drivers,python3-access2base,python3-scriptforge,libofficebean-java,libreoffice-uiconfig-common,libreoffice-uiconfig-base,libreoffice-uiconfig-calc,libreoffice-uiconfig-draw,libreoffice-uiconfig-impress,libreoffice-uiconfig-math,libreoffice-uiconfig-writer,uno-libs-private,libuno-sal3t64,libuno-cppu3t64,ure,ure-java,libunoloader-java,liblibreoffice-java,libreoffice-wiki-publisher,libreoffice-report-builder,libreoffice-report-builder-bin,libreoffice-uiconfig-report-builder,libreoffice-nlpsolver,fonts-opensymbol,libreoffice-dev,libreoffice-dev-gui,libreoffice-dev-common,libreofficekit-dev,libreoffice-gtk3,gir1.2-lokdocview-0.1,liblibreofficekitgtk,libreofficekit-data,libreoffice-gtk4,libreoffice-kf5,libreoffice-qt5,libreoffice-qt6,libreoffice-plasma,libreoffice-sdbc-postgresql,libreoffice-evolution,libreoffice-subsequentcheckbase,libreoffice-smoketest-data,libreoffice-librelogo,libreoffice-sdbc-firebird
+#Depends: @builddeps@, libreoffice,libreoffice-core,libreoffice-common,libreoffice-java-common,libreoffice-writer,libreoffice-calc,libreoffice-impress,libreoffice-draw,libreoffice-math,libreoffice-base-core,libreoffice-base,libreoffice-style-breeze,libreoffice-style-colibre,libreoffice-style-sifr,libreoffice-style-elementary,libreoffice-style-karasa-jaga,libreoffice-style-sukapura,libreoffice-gnome,python3-uno,libreoffice-script-provider-python,libreoffice-script-provider-bsh,libreoffice-script-provider-js,libreoffice-sdbc-hsqldb,libreoffice-sdbc-mysql,libreoffice-base-drivers,python3-access2base,python3-scriptforge,libofficebean-java,libreoffice-uiconfig-common,libreoffice-uiconfig-base,libreoffice-uiconfig-calc,libreoffice-uiconfig-draw,libreoffice-uiconfig-impress,libreoffice-uiconfig-math,libreoffice-uiconfig-writer,uno-libs-private,libuno-sal3,libuno-cppu3,ure,ure-java,libunoloader-java,liblibreoffice-java,libreoffice-wiki-publisher,libreoffice-report-builder,libreoffice-report-builder-bin,libreoffice-uiconfig-report-builder,libreoffice-nlpsolver,fonts-opensymbol,libreoffice-dev,libreoffice-dev-gui,libreoffice-dev-common,libreofficekit-dev,libreoffice-gtk3,gir1.2-lokdocview-0.1,liblibreofficekitgtk,libreofficekit-data,libreoffice-gtk4,libreoffice-kf5,libreoffice-qt5,libreoffice-qt6,libreoffice-plasma,libreoffice-sdbc-postgresql,libreoffice-evolution,libreoffice-subsequentcheckbase,libreoffice-smoketest-data,libreoffice-librelogo,libreoffice-sdbc-firebird
 #Restrictions: build-needed, rw-build-tree, allow-stderr, superficial, skippable
 
 Test-Command: for i in /etc/apparmor.d/usr.lib.libreoffice.program.*; do /sbin/apparmor_parser --add --skip-cache --skip-kernel-load $i; done