DEB tdelibs: Fix installation rules for tdecmshell with 't64' package.

Fix package name in lintian rules with 't64' package.

Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit 112489d76bc43d350a289759eefe86fc8f1cae1f)

3 files changed, 12 insertions, 9 deletions

diff --git a/debian/_base/core/tdelibs/debian/rules b/debian/_base/core/tdelibs/debian/rules
index 5ae26a03c..acafdc46e 100755
--- a/debian/_base/core/tdelibs/debian/rules
+++ b/debian/_base/core/tdelibs/debian/rules
@@ -110,10 +110,10 @@ ifeq (linux,$(DEB_HOST_ARCH_OS))
 	echo "libasound2-trinity-dev=libasound2-trinity-dev" >> debian/tdelibs14-trinity-dev.substvars
 endif
 
-binary-install/tdelibs14-trinity::
+binary-install/tdelibs14$(DEB_TIME64_SUFFIX)-trinity::
 	mv debian/tmp/opt/trinity/bin/tdecmshell debian/tmp/opt/trinity/bin/tdecmshell.real
-	install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs14-trinity/opt/trinity/bin/tdecmshell.real
-	install -p -D -m755 debian/tdecmshell debian/tdelibs14-trinity/opt/trinity/bin/tdecmshell
+	install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/opt/trinity/bin/tdecmshell.real
+	install -p -D -m755 debian/tdecmshell debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/opt/trinity/bin/tdecmshell
 
 post-patches::
 	dh_testdir
@@ -126,6 +126,7 @@ ifeq ($(DEB_TIME64_API),true)
 	    [ -d $$a ] || [ -f $$a.t64 ] || \
 	    (cp -a $$a debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity.$${a##*.} && mv $$a $$a.t64); \
 	done
+	sed -i -e "s/^tdelibs14-trinity /tdelibs14$(DEB_TIME64_SUFFIX)-trinity /" debian/tdelibs14t64-trinity.lintian
 	[ -f debian/control.t64 ] || \
 	sed -i.t64 \
 	    -e "s/^\\(Package: tdelibs14\\)-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \
diff --git a/dilos/core/tdelibs/debian/rules b/dilos/core/tdelibs/debian/rules
index 320ef61b0..c33f8ea52 100755
--- a/dilos/core/tdelibs/debian/rules
+++ b/dilos/core/tdelibs/debian/rules
@@ -183,10 +183,10 @@ ifeq (linux,$(DEB_HOST_ARCH_OS))
 	echo "libasound2-trinity-dev=libasound2-trinity-dev" >> debian/tdelibs14-trinity-dev.substvars
 endif
 
-binary-install/tdelibs14-trinity::
+binary-install/tdelibs14$(DEB_TIME64_SUFFIX)-trinity::
 	mv debian/tmp/usr/bin/tdecmshell debian/tmp/usr/bin/tdecmshell.real
-	install -p -D -m755 debian/tmp/usr/bin/tdecmshell.real debian/tdelibs14-trinity/usr/bin/tdecmshell.real
-	install -p -D -m755 debian/tdecmshell debian/tdelibs14-trinity/usr/bin/tdecmshell
+	install -p -D -m755 debian/tmp/usr/bin/tdecmshell.real debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/usr/bin/tdecmshell.real
+	install -p -D -m755 debian/tdecmshell debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/usr/bin/tdecmshell
 
 post-patches::
 	dh_testdir
@@ -199,6 +199,7 @@ ifeq ($(DEB_TIME64_API),true)
 	    [ -d $$a ] || [ -f $$a.t64 ] || \
 	    (cp -a $$a debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity.$${a##*.} && mv $$a $$a.t64); \
 	done
+	sed -i -e "s/^tdelibs14-trinity /tdelibs14$(DEB_TIME64_SUFFIX)-trinity /" debian/tdelibs14t64-trinity.lintian
 	[ -f debian/control.t64 ] || \
 	sed -i.t64 \
 	    -e "s/^\\(Package: tdelibs14\\)-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \
diff --git a/ubuntu/_base/core/tdelibs/debian/rules b/ubuntu/_base/core/tdelibs/debian/rules
index bcbeda4fc..b1e609845 100755
--- a/ubuntu/_base/core/tdelibs/debian/rules
+++ b/ubuntu/_base/core/tdelibs/debian/rules
@@ -110,10 +110,10 @@ ifeq (linux,$(DEB_HOST_ARCH_OS))
 	echo "libasound2-trinity-dev=libasound2-trinity-dev" >> debian/tdelibs14-trinity-dev.substvars
 endif
 
-binary-install/tdelibs14-trinity::
+binary-install/tdelibs14$(DEB_TIME64_SUFFIX)-trinity::
 	mv debian/tmp/opt/trinity/bin/tdecmshell debian/tmp/opt/trinity/bin/tdecmshell.real
-	install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs14-trinity/opt/trinity/bin/tdecmshell.real
-	install -p -D -m755 debian/tdecmshell debian/tdelibs14-trinity/opt/trinity/bin/tdecmshell
+	install -p -D -m755 debian/tmp/opt/trinity/bin/tdecmshell.real debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/opt/trinity/bin/tdecmshell.real
+	install -p -D -m755 debian/tdecmshell debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity/opt/trinity/bin/tdecmshell
 
 post-patches::
 	dh_testdir
@@ -126,6 +126,7 @@ ifeq ($(DEB_TIME64_API),true)
 	    [ -d $$a ] || [ -f $$a.t64 ] || \
 	    (cp -a $$a debian/tdelibs14$(DEB_TIME64_SUFFIX)-trinity.$${a##*.} && mv $$a $$a.t64); \
 	done
+	sed -i -e "s/^tdelibs14-trinity /tdelibs14$(DEB_TIME64_SUFFIX)-trinity /" debian/tdelibs14t64-trinity.lintian
 	[ -f debian/control.t64 ] || \
 	sed -i.t64 \
 	    -e "s/^\\(Package: tdelibs14\\)-trinity$$/\\1$(DEB_TIME64_SUFFIX)-trinity/" \