Merging debian version 4:24.2.0-2.

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

1 files changed, 112 insertions, 94 deletions

diff --git a/debian/rules b/debian/rules
index 32c93ec2b2..606581d31b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -104,6 +104,7 @@ BUILD_DEPS=\
     bc,\
     bison,\
     bzip2,\
+    diffutils, \
     flex, \
     fontforge-nox | fontforge, \
     gperf,\
@@ -1940,23 +1941,27 @@ endif
 	# Files created in debian directory
 	$(MAKE) -f debian/rules clean-debdir
 
-	# we must not regenerate  this automatically per policy....
-	#$(MAKE) -f debian/rules control
+	$(MAKE) -f debian/rules control
 
 
 # Generate control files, because we have so many different languages
 # and need to run autopkgtests based on Architectures
-control: debian/control debian/tests/control
+control: debian/control.new debian/tests/control.new
 
 # Based on script by Martin Quinson <Martin.Quinson@tuxfamily.org>
-debian/control: $(wildcard debian/control*in) $(SOURCE_TREE)/bin/lo-xlate-lang  debian/rules
+debian/control.new: $(wildcard debian/control*in) $(SOURCE_TREE)/bin/lo-xlate-lang  debian/rules
+	echo "#" > debian/control.new
+	echo "# NOTE: This file is autogenerated. DO NOT manually edit it! " >> debian/control.new
+	echo "# Edit debian/control*in and rules (whatever applicable), run debian/rules control" >> debian/control.new
+	echo "# and move control.new to control if the difference is sane." >> debian/control.new
+	echo "#" >> debian/control.new
 	chmod 755 $(SOURCE_TREE)/bin/lo-xlate-lang
 	sed -e "s#%$(DEB_VENDOR)=\([^%]*\)%#, \1#g#" \
 	    -e "s#%[A-Za-z]*=[^%]*%##g#" \
 	    -e "s#%BUILD_DEPS_ARCH%#$(strip $(BUILD_DEPS_ARCH))#g" \
 	    -e "s#%BUILD_DEPS_INDEP%#$(strip $(BUILD_DEPS_INDEP))#g" \
 	    -e "s#@BUGS@#$(BUGS)#g" \
-	    < debian/control.in > debian/control
+	    < debian/control.in >> debian/control.new
 
 	for LNUM in $(filter-out en-US,$(LANGPACKISOS)) ; do \
 	    LNAME=`$(SOURCE_TREE)/bin/lo-xlate-lang -l $$LNUM | perl -e 'print ucfirst(<STDIN>);'`; \
@@ -2018,7 +2023,7 @@ debian/control: $(wildcard debian/control*in) $(SOURCE_TREE)/bin/lo-xlate-lang
 	        -e "s|@FONT_RECOMMENDS@|$$FONT_RECOMMENDS|g" \
 	        -e "s:@LOCALES_DEPENDS@:$$LOCALES_DEPENDS:g" \
 		-e "s|@LDAP_LIB@|$(LDAP_LIB)|g" \
-	        >> debian/control < debian/control.lang.in; \
+	        >> debian/control.new < debian/control.lang.in; \
 	done
 
 ifneq "$(ENABLE_HELP)" "n"
@@ -2029,152 +2034,169 @@ ifneq "$(ENABLE_HELP)" "n"
 	    CCODE=`echo $$LCODE | sed 's/-.*//'`; \
 	    sed -e "s|@LNAME@|$$LNAME|g" -e "s|@LCODE@|$$LCODE|g" \
 		-e "s|@CCODE@|$$CCODE|g" \
-	        >> debian/control < debian/control.help.in; \
+	        >> debian/control.new < debian/control.help.in; \
 	done
 	# en_US is in -common
 	perl -pi -e 's|(Depends: libreoffice-writer \| language-support-translations-en), libreoffice-l10n-en-us|\1|' \
-		debian/control
+		debian/control.new
 	perl -pi -e 's|(Depends: libreoffice-writer, libreoffice-l10n-en-us)|\1, fonts-deva|' \
-		debian/control
+		debian/control.new
 endif
-	cat debian/control.ure.in >> debian/control
+	cat debian/control.ure.in >> debian/control.new
 ifeq "$(ENABLE_JAVA)" "y"
   ifeq "$(ENABLE_MEDIAWIKI)" "y"
-	cat debian/control.mediawiki.in >> debian/control
+	cat debian/control.mediawiki.in >> debian/control.new
   endif
   ifeq "$(ENABLE_REPORTBUILDER)" "y"
-	cat debian/control.reportbuilder.in >> debian/control
+	cat debian/control.reportbuilder.in >> debian/control.new
   endif
   ifeq "$(ENABLE_NLPSOLVER)" "y"
-	cat debian/control.nlpsolver.in >> debian/control
+	cat debian/control.nlpsolver.in >> debian/control.new
   endif
 endif
-	cat debian/control.fonts.in >> debian/control
+	cat debian/control.fonts.in >> debian/control.new
 ifeq "$(PACKAGE_SDK)" "y"
-	cat debian/control.sdk.in >> debian/control
+	cat debian/control.sdk.in >> debian/control.new
 endif
 ifeq "$(PACKAGE_LOKIT)" "y"
-	cat debian/control.lokit.in >> debian/control
+	cat debian/control.lokit.in >> debian/control.new
 endif
 ifeq "$(BUILD_GTK3)" "y"
-	cat debian/control.gtk3.in >> debian/control
+	cat debian/control.gtk3.in >> debian/control.new
 endif
 ifeq "$(BUILD_GTK4)" "y"
-	cat debian/control.gtk4.in >> debian/control
+	cat debian/control.gtk4.in >> debian/control.new
 endif
 ifeq "$(ENABLE_KF5)" "y"
-	cat debian/control.kf5.in >> debian/control
+	cat debian/control.kf5.in >> debian/control.new
 endif
 ifeq "$(ENABLE_KF6)" "y"
-	cat debian/control.kf6.in >> debian/control
+	cat debian/control.kf6.in >> debian/control.new
 endif
 ifeq "$(ENABLE_QT5)" "y"
-	cat debian/control.qt5.in >> debian/control
+	cat debian/control.qt5.in >> debian/control.new
 endif
 ifeq "$(ENABLE_QT6)" "y"
-	cat debian/control.qt6.in >> debian/control
+	cat debian/control.qt6.in >> debian/control.new
 endif
 ifeq "$(BUILD_PLASMA)" "y"
-	cat debian/control.plasma.in >> debian/control
+	cat debian/control.plasma.in >> debian/control.new
 endif
-	cat debian/control.postgresql.in >> debian/control
+	cat debian/control.postgresql.in >> debian/control.new
 ifeq "$(ENABLE_EVO2)" "y"
-	cat debian/control.evolution.in >> debian/control
+	cat debian/control.evolution.in >> debian/control.new
 endif
-	cat debian/control.test-packages.in >> debian/control
+	cat debian/control.test-packages.in >> debian/control.new
 ifeq "$(PACKAGE_LIBRELOGO)" "y"
-	cat debian/control.librelogo.in >> debian/control
-endif
-	cat debian/control.firebird.in >> debian/control
-
-	perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control
-	perl -pi -e "s,%OOO_NOGUI_ARCHS%,$(OOO_NOGUI_ARCHS),g" debian/control
-	perl -pi -e "s,%OOO_64BIT_ARCHS%,$(OOO_64BIT_ARCHS),g" debian/control
-	perl -pi -e "s,%OOO_BE_ARCHS%,$(OOO_BE_ARCHS),g" debian/control
-	perl -pi -e "s,%OOO_LE_ARCHS%,$(OOO_LE_ARCHS),g" debian/control
-	perl -pi -e "s,%OOO_BASE_ARCHS%,$(OOO_BASE_ARCHS),g" debian/control
-	perl -pi -e "s,%OOO_NO_BASE_ARCHS%,$(OOO_NO_BASE_ARCHS),"g debian/control
-	perl -pi -e "s,%OOO_JAVA_ARCHS%,$(OOO_JAVA_ARCHS),g" debian/control
-	perl -pi -e "s,%OOO_ARCH_DEP_EXTENSIONS_ARCHS%,$(OOO_ARCH_DEP_EXTENSIONS_ARCHS),g" debian/control
-	perl -pi -e "s,%OOO_REPORTBUILDER_ARCHS%,$(OOO_REPORTBUILDER_ARCHS),g" debian/control
-	perl -pi -e "s,%OOO_NO_REPORTBUILDER_ARCHS%,$(OOO_NO_REPORTBUILDER_ARCHS),g" debian/control
-	perl -pi -e "s,%OOO_FIREBIRD_ARCHS%,$(OOO_FIREBIRD_ARCHS),g" debian/control
-	perl -pi -e "s,%OOO_NO_FIREBIRD_ARCHS%,$(OOO_NO_FIREBIRD_ARCHS),g" debian/control
-	perl -pi -e "s#%BUILD_DEPS%#$(strip $(BUILD_DEPS))#g" debian/control
-	perl -pi -e "s#%JUNIT_MIN_VER%#$(JUNIT_MIN_VER)#g" debian/control
+	cat debian/control.librelogo.in >> debian/control.new
+endif
+	cat debian/control.firebird.in >> debian/control.new
+
+	perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control.new
+	perl -pi -e "s,%OOO_NOGUI_ARCHS%,$(OOO_NOGUI_ARCHS),g" debian/control.new
+	perl -pi -e "s,%OOO_64BIT_ARCHS%,$(OOO_64BIT_ARCHS),g" debian/control.new
+	perl -pi -e "s,%OOO_BE_ARCHS%,$(OOO_BE_ARCHS),g" debian/control.new
+	perl -pi -e "s,%OOO_LE_ARCHS%,$(OOO_LE_ARCHS),g" debian/control.new
+	perl -pi -e "s,%OOO_BASE_ARCHS%,$(OOO_BASE_ARCHS),g" debian/control.new
+	perl -pi -e "s,%OOO_NO_BASE_ARCHS%,$(OOO_NO_BASE_ARCHS),"g debian/control.new
+	perl -pi -e "s,%OOO_JAVA_ARCHS%,$(OOO_JAVA_ARCHS),g" debian/control.new
+	perl -pi -e "s,%OOO_ARCH_DEP_EXTENSIONS_ARCHS%,$(OOO_ARCH_DEP_EXTENSIONS_ARCHS),g" debian/control.new
+	perl -pi -e "s,%OOO_REPORTBUILDER_ARCHS%,$(OOO_REPORTBUILDER_ARCHS),g" debian/control.new
+	perl -pi -e "s,%OOO_NO_REPORTBUILDER_ARCHS%,$(OOO_NO_REPORTBUILDER_ARCHS),g" debian/control.new
+	perl -pi -e "s,%OOO_FIREBIRD_ARCHS%,$(OOO_FIREBIRD_ARCHS),g" debian/control.new
+	perl -pi -e "s,%OOO_NO_FIREBIRD_ARCHS%,$(OOO_NO_FIREBIRD_ARCHS),g" debian/control.new
+	perl -pi -e "s#%BUILD_DEPS%#$(strip $(BUILD_DEPS))#g" debian/control.new
+	perl -pi -e "s#%JUNIT_MIN_VER%#$(JUNIT_MIN_VER)#g" debian/control.new
 ifeq "$(BUILD_PLASMA)" "y"
-	perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice-gnome | libreoffice-plasma/' debian/control
+	perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice-gnome | libreoffice-plasma/' debian/control.new
 else
-	perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice-gnome/' debian/control
+	perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice-gnome/' debian/control.new
 endif
 
 ifeq (sk,$(findstring sk,$(HELPISOS)))
-	perl -pi -e 's/(Depends:.*)libreoffice-l10n-sk(.*)$$/\1libreoffice-l10n-sk, libreoffice-help-cs\2/' debian/control
+	perl -pi -e 's/(Depends:.*)libreoffice-l10n-sk(.*)$$/\1libreoffice-l10n-sk, libreoffice-help-cs\2/' debian/control.new
 endif
 ifeq (pt-BR,$(findstring pt-BR,$(LANGPACKISOS)))
-	perl -pi -e 's/libreoffice2-l10n-pt-br$$/libreoffice2-l10n-pt-br, broffice/' debian/control
-	perl -pi -e 's/libreoffice2-l10n-pt-br$$/libreoffice2-l10n-pt-br, broffice/' debian/control
-	perl -pi -e 's/libreoffice2-l10n-pt-br$$/libreoffice2-l10n-pt-br, broffice/' debian/control
+	perl -pi -e 's/libreoffice2-l10n-pt-br$$/libreoffice2-l10n-pt-br, broffice/' debian/control.new
+	perl -pi -e 's/libreoffice2-l10n-pt-br$$/libreoffice2-l10n-pt-br, broffice/' debian/control.new
+	perl -pi -e 's/libreoffice2-l10n-pt-br$$/libreoffice2-l10n-pt-br, broffice/' debian/control.new
 endif
 
 ifeq "$(MYSQL_FLAVOUR)" "mysql"
-	perl -pi -e "s/(Build-Conflicts: .*)/\1,libmariadbclient-dev,/" debian/control
+	perl -pi -e "s/(Build-Conflicts: .*)/\1,libmariadbclient-dev,/" debian/control.new
 endif
 ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	# be sure to use our rebuilt font
-	perl -pi -e "s/(Build-Conflicts: .*)/\1,fonts-opensymbol <!nocheck>,/" debian/control
+	perl -pi -e "s/(Build-Conflicts: .*)/\1,fonts-opensymbol <!nocheck>,/" debian/control.new
 endif
 
 ifneq "$(ALLOW_CLANG)" "y"
-	perl -pi -e "s/(Build-Conflicts: .*)/\1,clang,/" debian/control
+	perl -pi -e "s/(Build-Conflicts: .*)/\1,clang,/" debian/control.new
 else
-	perl -pi -e "s/(Build-Conflicts: .*)/\1,clang [$(filter-out $(OOO_CLANG_ARCHS),$(OOO_ARCHS))],/" debian/control
+	perl -pi -e "s/(Build-Conflicts: .*)/\1,clang [$(filter-out $(OOO_CLANG_ARCHS),$(OOO_ARCHS))],/" debian/control.new
 endif
 ifeq "$(USE_SYSTEMD)" "n"
-	perl -pi -e "s/(Build-Conflicts: .*)/\1,systemd-coredump <!nocheck>,/" debian/control
+	perl -pi -e "s/(Build-Conflicts: .*)/\1,systemd-coredump <!nocheck>,/" debian/control.new
 endif
 
-	$(PYTHON) debian/scripts/joinctrl.py < debian/control > debian/control.tmp
-	mv debian/control.tmp debian/control
+	$(PYTHON) debian/scripts/joinctrl.py < debian/control.new > debian/control.tmp
+	mv debian/control.tmp debian/control.new
 
 	# make -l10n-fi suggest libreoffice-spellcheck-fi to
 	# match myspell-fi and libreoffice-soikko/-voikko
-	perl -pi -e 's/myspell-dictionary-fi/myspell-dictionary-fi | libreoffice-spellcheck-fi/' debian/control
-	perl -pi -e 's/hyphen-fi/hyphen-fi | libreoffice-hyphenation-fi/' debian/control
+	perl -pi -e 's/myspell-dictionary-fi/myspell-dictionary-fi | libreoffice-spellcheck-fi/' debian/control.new
+	perl -pi -e 's/hyphen-fi/hyphen-fi | libreoffice-hyphenation-fi/' debian/control.new
 
 ifeq "$(USE_DBUS)" "y"
   ifeq "$(ENABLE_BLUETOOTH)" "y"
-	perl -pi -e 's/paperconf$$/paperconf\n  * bluez: Bluetooth support for Impress (slideshow remote control)/' debian/control
+	perl -pi -e 's/paperconf$$/paperconf\n  * bluez: Bluetooth support for Impress (slideshow remote control)/' debian/control.new
   endif
-	perl -pi -e 's/Description: office productivity suite -- presentation/Suggests: bluez\nDescription: office productivity suite -- presentation/' debian/control
+	perl -pi -e 's/Description: office productivity suite -- presentation/Suggests: bluez\nDescription: office productivity suite -- presentation/' debian/control.new
 endif
 
 ifneq "$(DICT_DIR)" "/usr/share/hunspell"
-	perl -pi -e 's/^Breaks:.*myspell.*\n//' debian/control
+	perl -pi -e 's/^Breaks:.*myspell.*\n//' debian/control.new
 endif
 
 ifeq "$(ENABLE_APPARMOR_PROFILES)" "y"
-	perl -pi -e 's/ttf-mscorefonts-installer/ttf-mscorefonts-installer, apparmor/' debian/control
+	perl -pi -e 's/ttf-mscorefonts-installer/ttf-mscorefonts-installer, apparmor/' debian/control.new
 endif
 
-.DELETE_ON_ERROR: debian/control
+	diff -u debian/control debian/control.new && rm -f debian/control.new || (\
+		echo "Generated control file differs! Check the result!"; \
+		echo "Note: Edit control*.in and rules instead of control!"; \
+		echo "If the difference is correct move control.new to control"; \
+		exit 1)
 
-debian/tests/control: debian/tests/control.in debian/rules
+#.DELETE_ON_ERROR: debian/control.new
+
+debian/tests/control.new: debian/tests/control.in debian/rules
+	echo "#" > debian/tests/control.new
+	echo "# NOTE: This file is autogenerated. DO NOT manually edit it! " >> debian/tests/control.new
+	echo "# Edit debian/control*in and rules (whatever applicable), run debian/rules control" >> debian/tests/control.new
+	echo "# and move control.new to control if the difference is sane." >> debian/tests/control.new
+	echo "#" >> debian/tests/control.new
 	sed -e "s|%OOO_JAVA_ARCHS%|$(OOO_JAVA_ARCHS)|g" \
 	    -e "s|%OOO_JUNIT_ARCHS%|$(OOO_JUNIT_ARCHS)|g" \
 	    -e "s|%OOO_NOGUI_ARCHS%|$(OOO_NOGUI_ARCHS)|g" \
 	    -e "s|%OOO_JAVA_AND_NOGUI_ARCHS%|$(filter $(OOO_JAVA_ARCHS),$(OOO_NOGUI_ARCHS))|g" \
 	    -e "s|%OOO_CHECK_FATAL_ARCHS%|$(OOO_CHECK_FATAL_ARCHS)|g" \
 	    -e "s|%AUTOPKGTEST_CPPUNIT_PACKAGES%|$(shell echo $(AUTOPKGTEST_CPPUNIT_PACKAGES) | sed -e "s/\ /,/g")|g" \
-	    > debian/tests/control < debian/tests/control.in
+	    >> debian/tests/control.new < debian/tests/control.in
 	# otherwise Architecture: is empty (and empty means "any" in autopgktest,
 	# cf. https://salsa.debian.org/ci-team/autopkgtest/-/blob/master/lib/testdesc.py#L546)
 ifneq (,$(OOO_JUNIT_ARCHS))
 	sed -e "s|%OOO_JUNIT_ARCHS%|$(OOO_JUNIT_ARCHS)|g" \
-		>> debian/tests/control < debian/tests/control.junit.in
+		>> debian/tests/control.new < debian/tests/control.junit.in
 endif	    
 
-.DELETE_ON_ERROR: debian/tests/control
+	diff -u debian/tests/control debian/tests/control.new && rm -f debian/tests/control.new || (\
+		echo "Generated control file differs! Check the result!"; \
+		echo "Note: Edit control*.in and rules instead of control!"; \
+		echo "If the difference is correct move control.new to control"; \
+		exit 1)
+
+#.DELETE_ON_ERROR: debian/tests/control.new
 
 # All 'important' targets have 2 lines.  The one that is run by
 # dpkg-buildpackage or the user, and the one that does the actual work.  This
@@ -3145,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}3/$(OODIR)/program; \
-		mkdir -p debian/libuno-$${i}3/usr/lib/$(DEB_HOST_MULTIARCH); \
+		mkdir -p debian/libuno-$${i}3t64/$(OODIR)/program; \
+		mkdir -p debian/libuno-$${i}3t64/usr/lib/$(DEB_HOST_MULTIARCH); \
 		mv debian/ure/$(OODIR)/program/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`; \
+			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`; \
 	done
 	for i in salhelpergcc3 cppuhelpergcc3 purpenvhelpergcc3; do \
-		mkdir -p debian/libuno-$${i}-3/$(OODIR)/program; \
-		mkdir -p debian/libuno-$${i}-3/usr/lib/$(DEB_HOST_MULTIARCH); \
+		mkdir -p debian/libuno-$${i}-3t64/$(OODIR)/program; \
+		mkdir -p debian/libuno-$${i}-3t64/usr/lib/$(DEB_HOST_MULTIARCH); \
 		mv debian/ure/$(OODIR)/program/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`; \
+			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`; \
 	done
 	# we also need libxmlreaderlo.so, libreglo.so and libunoidllo.so (libuno_cppuhelpergcc3.so.3
         # needs it) and libstorelo.so (libreglo.so needs it)
@@ -3958,7 +3980,7 @@ endif
 	dh_bugfiles -a -A
 	dh_link -a
 ifeq "$(BUILD_DBGSYM_PACKAGES)" "y"
-	for i in libuno-cppu3 libuno-sal3 libreoffice-core libreoffice-writer; do \
+	for i in libuno-cppu3t64 libuno-sal3t64 libreoffice-core libreoffice-writer; do \
 		rm -rf debian/.debhelper/$$i/dbgsym-root; \
 	done
   ifeq "$(BUILD_NOGUI_PACKAGES)" "y"
@@ -3984,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}3/dbgsym-root/usr/share/gdb/auto-load/$(OODIR)/program; \
-		mkdir -p debian/.debhelper/libuno-$${i}3/dbgsym-root/usr/share/libreoffice/gdb/libreoffice; \
+		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; \
 		mv debian/.debhelper/libreoffice-core/dbgsym-root/usr/share/gdb/auto-load/$(OODIR)/program/libuno_$$i.so.3-gdb.py \
-			debian/.debhelper/libuno-$${i}3/dbgsym-root/usr/share/gdb/auto-load/$(OODIR)/program; \
+			debian/.debhelper/libuno-$${i}3t64/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}3/dbgsym-root/usr/share/libreoffice/gdb/libreoffice; \
+			debian/.debhelper/libuno-$${i}3t64/dbgsym-root/usr/share/libreoffice/gdb/libreoffice; \
 	done
 
 	# move sw and writerfilter gdb helpers to writer-dbgsym
@@ -4040,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 -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); \
+		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); \
 	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
@@ -4095,17 +4117,17 @@ endif
 endif
 
 		dh_shlibdeps -a -Nlibreoffice-core-nogui -Nure \
-			-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 \
+			-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 \
 			$(SHLIBS_OVERRIDE)
 		dh_shlibdeps -pure \
-			-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 \
+			-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 \
 			-- -xure
 ifeq "$(BUILD_NOGUI_PACKAGES)" "y"
 		dh_shlibdeps -plibreoffice-core-nogui \
-			-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 \
+			-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 \
 			$(SHLIBS_OVERRIDE)
 endif
   ifneq (,$(filter coinmp, $(SYSTEM_STUFF)))
@@ -4114,10 +4136,6 @@ endif
 	perl -pi -e "s/coinor-libcoinmp1v5/coinor-libcoinmp1v5 $(COINMP_MINVER)/" \
 		debian/libreoffice-calc.substvars
   endif
-  	# FIXME. Otherwise the unoEditGlossary openDialog test crashes and hangs. go sure to make sure it doesn't
-	# happen on runtime. No idea whether alpha1 would suffice but it doesn't really matter in practice anyway :)
-	perl -pi -e "s/, libuno-sal3 \(>= 1:7.3.0~beta1\),/, libuno-sal3 \(>= 1:7.4.0~beta1\),/" \
-			debian/libreoffice-core.substvars
 ifeq "$(ENABLE_JAVA)" "y"
 	for p in $(ARCH_DEP_PACKAGES); do \
 		jh_depends -p$$p -Xure -Xbase-files; \
@@ -4156,7 +4174,7 @@ endif
 		-V'liberation-fonts-recommends=$(LIBERATION_FONTS_RECOMMENDS)' \
 		-v$(BINARY_VERSION)
 ifeq "$(BUILD_DBGSYM_PACKAGES)" "y"
-	for i in libuno-sal3 libuno-cppu3 libuno-salhelpergcc3-3 libuno-cppuhelpergcc3-3 libuno-purpenvhelpergcc3-3 \
+	for i in libuno-sal3t64 libuno-cppu3t64 libuno-salhelpergcc3-3t64 libuno-cppuhelpergcc3-3t64 libuno-purpenvhelpergcc3-3t64 \
 		libreoffice-core libreoffice-writer; do \
 		perl -pi -e 's/^(Depends:.*)/\1\nRecommends: gdb, python3-six/' \
 		debian/.debhelper/$$i/dbgsym-root/DEBIAN/control; \