Branch: master

c0bbb19c 2019-06-03 13:13:01 Slávek Banko
DEB: Resolve FTBFS in support for using the $(DEB_HOST_MULTIARCH) variable
if the package does not contain any install and links files.

Signed-off-by: Slávek Banko <slavek.banko@...>
M debian/_base/applications/abakus/debian/cdbs/debian-tde.mk
M debian/_base/applications/amarok/debian/cdbs/debian-tde.mk
M debian/_base/applications/bibletime/debian/cdbs/debian-tde.mk
M debian/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk
M debian/_base/applications/digikam/debian/cdbs/debian-tde.mk
M debian/_base/applications/dolphin/debian/cdbs/debian-tde.mk
M debian/_base/applications/filelight/debian/cdbs/debian-tde.mk
M debian/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk
M debian/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk
M debian/_base/applications/gwenview/debian/cdbs/debian-tde.mk
M debian/_base/applications/k3b/debian/cdbs/debian-tde.mk
M debian/_base/applications/k9copy/debian/cdbs/debian-tde.mk
M debian/_base/applications/kaffeine/debian/cdbs/debian-tde.mk
M debian/_base/applications/kasablanca/debian/cdbs/debian-tde.mk
M debian/_base/applications/katapult/debian/cdbs/debian-tde.mk
M debian/_base/applications/kbarcode/debian/cdbs/debian-tde.mk
M debian/_base/applications/kbfx/debian/cdbs/debian-tde.mk
M debian/_base/applications/kbibtex/debian/cdbs/debian-tde.mk
M debian/_base/applications/kbiff/debian/cdbs/debian-tde.mk
M debian/_base/applications/kbookreader/debian/cdbs/debian-tde.mk
M debian/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk
M debian/_base/applications/kcmautostart/debian/cdbs/debian-tde.mk
M debian/_base/applications/kcmldap/debian/cdbs/debian-tde.mk
M debian/_base/applications/kcmldapcontroller/debian/cdbs/debian-tde.mk
M debian/_base/applications/kcmldapmanager/debian/cdbs/debian-tde.mk
M debian/_base/applications/kcpuload/debian/cdbs/debian-tde.mk
M debian/_base/applications/kdbg/debian/cdbs/debian-tde.mk
M debian/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk
M debian/_base/applications/kdiff3/debian/cdbs/debian-tde.mk
M debian/_base/applications/kdirstat/debian/cdbs/debian-tde.mk
M debian/_base/applications/kdpkg/debian/cdbs/debian-tde.mk
M debian/_base/applications/keep/debian/cdbs/debian-tde.mk
M debian/_base/applications/kerry/debian/cdbs/debian-tde.mk
M debian/_base/applications/keximdb/debian/cdbs/debian-tde.mk
M debian/_base/applications/kftpgrabber/debian/cdbs/debian-tde.mk
M debian/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk
M debian/_base/applications/kile/debian/cdbs/debian-tde.mk
M debian/_base/applications/kima/debian/cdbs/debian-tde.mk
M debian/_base/applications/kiosktool/debian/cdbs/debian-tde.mk
M debian/_base/applications/kkbswitch/debian/cdbs/debian-tde.mk
M debian/_base/applications/klcddimmer/debian/cdbs/debian-tde.mk
M debian/_base/applications/kmplayer/debian/cdbs/debian-tde.mk
M debian/_base/applications/kmyfirewall/debian/cdbs/debian-tde.mk
M debian/_base/applications/kmymoney/debian/cdbs/debian-tde.mk
M debian/_base/applications/knemo/debian/cdbs/debian-tde.mk
M debian/_base/applications/knetload/debian/cdbs/debian-tde.mk
M debian/_base/applications/knetstats/debian/cdbs/debian-tde.mk
M debian/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk
M debian/_base/applications/knights/debian/cdbs/debian-tde.mk
M debian/_base/applications/knmap/debian/cdbs/debian-tde.mk
M debian/_base/applications/knowit/debian/cdbs/debian-tde.mk
M debian/_base/applications/knutclient/debian/cdbs/debian-tde.mk
M debian/_base/applications/koffice/debian/cdbs/debian-tde.mk
M debian/_base/applications/konversation/debian/cdbs/debian-tde.mk
M debian/_base/applications/kooldock/debian/cdbs/debian-tde.mk
M debian/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk
M debian/_base/applications/kpicosim/debian/cdbs/debian-tde.mk
M debian/_base/applications/kpilot/debian/cdbs/debian-tde.mk
M debian/_base/applications/kplayer/debian/cdbs/debian-tde.mk
M debian/_base/applications/kpowersave/debian/cdbs/debian-tde.mk
M debian/_base/applications/krecipes/debian/cdbs/debian-tde.mk
M debian/_base/applications/krename/debian/cdbs/debian-tde.mk
M debian/_base/applications/krusader/debian/cdbs/debian-tde.mk
M debian/_base/applications/kscope/debian/cdbs/debian-tde.mk
M debian/_base/applications/ksensors/debian/cdbs/debian-tde.mk
M debian/_base/applications/kshowmail/debian/cdbs/debian-tde.mk
M debian/_base/applications/kshutdown/debian/cdbs/debian-tde.mk
M debian/_base/applications/ksplash-engine-moodin/debian/cdbs/debian-tde.mk
M debian/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk
M debian/_base/applications/ktorrent/debian/cdbs/debian-tde.mk
M debian/_base/applications/kvkbd/debian/cdbs/debian-tde.mk
M debian/_base/applications/kvpnc/debian/cdbs/debian-tde.mk
M debian/_base/applications/kxmleditor/debian/cdbs/debian-tde.mk
M debian/_base/applications/mplayerthumbs/debian/cdbs/debian-tde.mk
M debian/_base/applications/piklab/debian/cdbs/debian-tde.mk
M debian/_base/applications/potracegui/debian/cdbs/debian-tde.mk
M debian/_base/applications/qalculate-tde/debian/cdbs/debian-tde.mk
M debian/_base/applications/rosegarden/debian/cdbs/debian-tde.mk
M debian/_base/applications/smb4k/debian/cdbs/debian-tde.mk
M debian/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk
M debian/_base/applications/tastymenu/debian/cdbs/debian-tde.mk
M debian/_base/applications/tde-style-baghira/debian/cdbs/debian-tde.mk
M debian/_base/applications/tde-style-domino/debian/cdbs/debian-tde.mk
M debian/_base/applications/tde-style-ia-ora/debian/cdbs/debian-tde.mk
M debian/_base/applications/tde-style-lipstik/debian/cdbs/debian-tde.mk
M debian/_base/applications/tde-style-qtcurve/debian/cdbs/debian-tde.mk
M debian/_base/applications/tde-systemsettings/debian/cdbs/debian-tde.mk
M debian/_base/applications/tdedocker/debian/cdbs/debian-tde.mk
M debian/_base/applications/tdeio-apt/debian/cdbs/debian-tde.mk
M debian/_base/applications/tdeio-ftps/debian/cdbs/debian-tde.mk
M debian/_base/applications/tdeio-gopher/debian/cdbs/debian-tde.mk
M debian/_base/applications/tdeio-locate/debian/cdbs/debian-tde.mk
M debian/_base/applications/tdeio-sword/debian/cdbs/debian-tde.mk
M debian/_base/applications/tdeio-umountwrapper/debian/cdbs/debian-tde.mk
M debian/_base/applications/tdenetworkmanager/debian/cdbs/debian-tde.mk
M debian/_base/applications/tdepowersave/debian/cdbs/debian-tde.mk
M debian/_base/applications/tdesudo/debian/cdbs/debian-tde.mk
M debian/_base/applications/tdesvn/debian/cdbs/debian-tde.mk
M debian/_base/applications/tdmtheme/debian/cdbs/debian-tde.mk
M debian/_base/applications/tellico/debian/cdbs/debian-tde.mk
M debian/_base/applications/tork/debian/cdbs/debian-tde.mk
M debian/_base/applications/twin-style-crystal/debian/cdbs/debian-tde.mk
M debian/_base/applications/wlassistant/debian/cdbs/debian-tde.mk
M debian/_base/applications/yakuake/debian/cdbs/debian-tde.mk
M debian/_base/dependencies/akode/debian/cdbs/debian-tde.mk
M debian/_base/dependencies/arts/debian/cdbs/debian-tde.mk
M debian/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk
M debian/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk
M debian/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk
M debian/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk
M debian/_base/libraries/libkipi/debian/cdbs/debian-tde.mk
M debian/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk
M debian/_base/tdeaccessibility/debian/cdbs/debian-tde.mk
M debian/_base/tdeaddons/debian/cdbs/debian-tde.mk
M debian/_base/tdeadmin/debian/cdbs/debian-tde.mk
M debian/_base/tdeartwork/debian/cdbs/debian-tde.mk
M debian/_base/tdebase/debian/cdbs/debian-tde.mk
M debian/_base/tdebindings/debian/cdbs/debian-tde.mk
M debian/_base/tdeedu/debian/cdbs/debian-tde.mk
M debian/_base/tdegames/debian/cdbs/debian-tde.mk
M debian/_base/tdegraphics/debian/cdbs/debian-tde.mk
M debian/_base/tdelibs/debian/cdbs/debian-tde.mk
M debian/_base/tdemultimedia/debian/cdbs/debian-tde.mk
M debian/_base/tdenetwork/debian/cdbs/debian-tde.mk
M debian/_base/tdepim/debian/cdbs/debian-tde.mk
M debian/_base/tdesdk/debian/cdbs/debian-tde.mk
M debian/_base/tdetoys/debian/cdbs/debian-tde.mk
M debian/_base/tdeutils/debian/cdbs/debian-tde.mk
M debian/_base/tdevelop/debian/cdbs/debian-tde.mk
M debian/_base/tdewebdev/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/abakus/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/amarok/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/bibletime/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/digikam/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/dolphin/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/filelight/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/gwenview/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/k3b/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/k9copy/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kaffeine/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kasablanca/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/katapult/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kbarcode/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kbfx/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kbibtex/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kbiff/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kbookreader/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kchmviewer/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kcmautostart/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kcmldap/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kcmldapcontroller/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kcmldapmanager/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kcpuload/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kdbg/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kdbusnotification/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kdiff3/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kdirstat/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kdpkg/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/keep/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kerry/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/keximdb/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kftpgrabber/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kgtk-qt3/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kile/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kima/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kiosktool/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kkbswitch/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/klcddimmer/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kmplayer/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kmyfirewall/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kmymoney/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/knemo/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/knetload/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/knetstats/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/knetworkmanager8/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/knights/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/knmap/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/knowit/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/knutclient/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/koffice/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/konversation/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kooldock/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kopete-otr/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kpicosim/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kpilot/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kplayer/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kpowersave/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/krecipes/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/krename/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/krusader/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kscope/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/ksensors/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kshowmail/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kshutdown/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/ksplash-engine-moodin/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/ksystemlog/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/ktorrent/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kvkbd/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kvpnc/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/kxmleditor/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/mplayerthumbs/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/piklab/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/potracegui/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/qalculate-tde/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/rosegarden/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/smb4k/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/soundkonverter/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/tastymenu/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/tde-style-baghira/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/tde-style-domino/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/tde-style-ia-ora/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/tde-style-lipstik/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/tde-style-qtcurve/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/tde-systemsettings/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/tdedocker/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/tdeio-apt/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/tdeio-ftps/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/tdeio-gopher/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/tdeio-locate/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/tdeio-sword/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/tdeio-umountwrapper/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/tdenetworkmanager/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/tdepowersave/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/tdesudo/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/tdesvn/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/tdmtheme/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/tellico/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/tork/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/twin-style-crystal/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/wlassistant/debian/cdbs/debian-tde.mk
M ubuntu/_base/applications/yakuake/debian/cdbs/debian-tde.mk
M ubuntu/_base/dependencies/akode/debian/cdbs/debian-tde.mk
M ubuntu/_base/dependencies/arts/debian/cdbs/debian-tde.mk
M ubuntu/_base/dependencies/dbus-1-tqt/debian/cdbs/debian-tde.mk
M ubuntu/_base/libraries/kipi-plugins/debian/cdbs/debian-tde.mk
M ubuntu/_base/libraries/libkdcraw/debian/cdbs/debian-tde.mk
M ubuntu/_base/libraries/libkexiv2/debian/cdbs/debian-tde.mk
M ubuntu/_base/libraries/libkipi/debian/cdbs/debian-tde.mk
M ubuntu/_base/libraries/libtdeldap/debian/cdbs/debian-tde.mk
M ubuntu/_base/tdeaccessibility/debian/cdbs/debian-tde.mk
M ubuntu/_base/tdeaddons/debian/cdbs/debian-tde.mk
M ubuntu/_base/tdeadmin/debian/cdbs/debian-tde.mk
M ubuntu/_base/tdeartwork/debian/cdbs/debian-tde.mk
M ubuntu/_base/tdebase/debian/cdbs/debian-tde.mk
M ubuntu/_base/tdebindings/debian/cdbs/debian-tde.mk
M ubuntu/_base/tdeedu/debian/cdbs/debian-tde.mk
M ubuntu/_base/tdegames/debian/cdbs/debian-tde.mk
M ubuntu/_base/tdegraphics/debian/cdbs/debian-tde.mk
M ubuntu/_base/tdelibs/debian/cdbs/debian-tde.mk
M ubuntu/_base/tdemultimedia/debian/cdbs/debian-tde.mk
M ubuntu/_base/tdenetwork/debian/cdbs/debian-tde.mk
M ubuntu/_base/tdepim/debian/cdbs/debian-tde.mk
M ubuntu/_base/tdesdk/debian/cdbs/debian-tde.mk
M ubuntu/_base/tdetoys/debian/cdbs/debian-tde.mk
M ubuntu/_base/tdeutils/debian/cdbs/debian-tde.mk
M ubuntu/_base/tdevelop/debian/cdbs/debian-tde.mk
M ubuntu/_base/tdewebdev/debian/cdbs/debian-tde.mk

debian/_base/applications/abakus/debian/cdbs/debian-tde.mk

diff --git a/debian/_base/applications/abakus/debian/cdbs/debian-tde.mk b/debian/_base/applications/abakus/debian/cdbs/debian-tde.mk
index 7c67fc9..4eeb672 100644
--- a/debian/_base/applications/abakus/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/abakus/debian/cdbs/debian-tde.mk
@@ -141,8 +141,11 @@
 	done; \
 	rm -f $$tmpf )
 	# update multi-arch path in install files
-	for a in debian/*install debian/*links; do \
+	ls -d debian/* | \
+	grep -E "(install|links)$$" | \
+	while read a; do \
 	    [ -d $$a ] || [ -f $$a.arch ] || \
+	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
 	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
 	done
 
@@ -152,7 +155,9 @@
 	rm -f debian/stamp-man-pages
 	rm -rf debian/shlibs-check
 	# revert multi-arch path in install files
-	for a in debian/*install debian/*links; do \
+	ls -d debian/* | \
+	grep -E "(install|links)$$" | \
+	while read a; do \
 	    [ ! -f $$a.arch ] || \
 	    mv $$a.arch $$a; \
 	done

debian/_base/applications/amarok/debian/cdbs/debian-tde.mk

diff --git a/debian/_base/applications/amarok/debian/cdbs/debian-tde.mk b/debian/_base/applications/amarok/debian/cdbs/debian-tde.mk
index 7c67fc9..4eeb672 100644
--- a/debian/_base/applications/amarok/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/amarok/debian/cdbs/debian-tde.mk
@@ -141,8 +141,11 @@
 	done; \
 	rm -f $$tmpf )
 	# update multi-arch path in install files
-	for a in debian/*install debian/*links; do \
+	ls -d debian/* | \
+	grep -E "(install|links)$$" | \
+	while read a; do \
 	    [ -d $$a ] || [ -f $$a.arch ] || \
+	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
 	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
 	done
 
@@ -152,7 +155,9 @@
 	rm -f debian/stamp-man-pages
 	rm -rf debian/shlibs-check
 	# revert multi-arch path in install files
-	for a in debian/*install debian/*links; do \
+	ls -d debian/* | \
+	grep -E "(install|links)$$" | \
+	while read a; do \
 	    [ ! -f $$a.arch ] || \
 	    mv $$a.arch $$a; \
 	done

debian/_base/applications/bibletime/debian/cdbs/debian-tde.mk

diff --git a/debian/_base/applications/bibletime/debian/cdbs/debian-tde.mk b/debian/_base/applications/bibletime/debian/cdbs/debian-tde.mk
index 7c67fc9..4eeb672 100644
--- a/debian/_base/applications/bibletime/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/bibletime/debian/cdbs/debian-tde.mk
@@ -141,8 +141,11 @@
 	done; \
 	rm -f $$tmpf )
 	# update multi-arch path in install files
-	for a in debian/*install debian/*links; do \
+	ls -d debian/* | \
+	grep -E "(install|links)$$" | \
+	while read a; do \
 	    [ -d $$a ] || [ -f $$a.arch ] || \
+	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
 	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
 	done
 
@@ -152,7 +155,9 @@
 	rm -f debian/stamp-man-pages
 	rm -rf debian/shlibs-check
 	# revert multi-arch path in install files
-	for a in debian/*install debian/*links; do \
+	ls -d debian/* | \
+	grep -E "(install|links)$$" | \
+	while read a; do \
 	    [ ! -f $$a.arch ] || \
 	    mv $$a.arch $$a; \
 	done

debian/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk

diff --git a/debian/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk b/debian/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk
index 7c67fc9..4eeb672 100644
--- a/debian/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/compizconfig-backend-tdeconfig/debian/cdbs/debian-tde.mk
@@ -141,8 +141,11 @@
 	done; \
 	rm -f $$tmpf )
 	# update multi-arch path in install files
-	for a in debian/*install debian/*links; do \
+	ls -d debian/* | \
+	grep -E "(install|links)$$" | \
+	while read a; do \
 	    [ -d $$a ] || [ -f $$a.arch ] || \
+	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
 	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
 	done
 
@@ -152,7 +155,9 @@
 	rm -f debian/stamp-man-pages
 	rm -rf debian/shlibs-check
 	# revert multi-arch path in install files
-	for a in debian/*install debian/*links; do \
+	ls -d debian/* | \
+	grep -E "(install|links)$$" | \
+	while read a; do \
 	    [ ! -f $$a.arch ] || \
 	    mv $$a.arch $$a; \
 	done

debian/_base/applications/digikam/debian/cdbs/debian-tde.mk

diff --git a/debian/_base/applications/digikam/debian/cdbs/debian-tde.mk b/debian/_base/applications/digikam/debian/cdbs/debian-tde.mk
index 7c67fc9..4eeb672 100644
--- a/debian/_base/applications/digikam/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/digikam/debian/cdbs/debian-tde.mk
@@ -141,8 +141,11 @@
 	done; \
 	rm -f $$tmpf )
 	# update multi-arch path in install files
-	for a in debian/*install debian/*links; do \
+	ls -d debian/* | \
+	grep -E "(install|links)$$" | \
+	while read a; do \
 	    [ -d $$a ] || [ -f $$a.arch ] || \
+	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
 	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
 	done
 
@@ -152,7 +155,9 @@
 	rm -f debian/stamp-man-pages
 	rm -rf debian/shlibs-check
 	# revert multi-arch path in install files
-	for a in debian/*install debian/*links; do \
+	ls -d debian/* | \
+	grep -E "(install|links)$$" | \
+	while read a; do \
 	    [ ! -f $$a.arch ] || \
 	    mv $$a.arch $$a; \
 	done

debian/_base/applications/dolphin/debian/cdbs/debian-tde.mk

diff --git a/debian/_base/applications/dolphin/debian/cdbs/debian-tde.mk b/debian/_base/applications/dolphin/debian/cdbs/debian-tde.mk
index 7c67fc9..4eeb672 100644
--- a/debian/_base/applications/dolphin/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/dolphin/debian/cdbs/debian-tde.mk
@@ -141,8 +141,11 @@
 	done; \
 	rm -f $$tmpf )
 	# update multi-arch path in install files
-	for a in debian/*install debian/*links; do \
+	ls -d debian/* | \
+	grep -E "(install|links)$$" | \
+	while read a; do \
 	    [ -d $$a ] || [ -f $$a.arch ] || \
+	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
 	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
 	done
 
@@ -152,7 +155,9 @@
 	rm -f debian/stamp-man-pages
 	rm -rf debian/shlibs-check
 	# revert multi-arch path in install files
-	for a in debian/*install debian/*links; do \
+	ls -d debian/* | \
+	grep -E "(install|links)$$" | \
+	while read a; do \
 	    [ ! -f $$a.arch ] || \
 	    mv $$a.arch $$a; \
 	done

debian/_base/applications/filelight/debian/cdbs/debian-tde.mk

diff --git a/debian/_base/applications/filelight/debian/cdbs/debian-tde.mk b/debian/_base/applications/filelight/debian/cdbs/debian-tde.mk
index 7c67fc9..4eeb672 100644
--- a/debian/_base/applications/filelight/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/filelight/debian/cdbs/debian-tde.mk
@@ -141,8 +141,11 @@
 	done; \
 	rm -f $$tmpf )
 	# update multi-arch path in install files
-	for a in debian/*install debian/*links; do \
+	ls -d debian/* | \
+	grep -E "(install|links)$$" | \
+	while read a; do \
 	    [ -d $$a ] || [ -f $$a.arch ] || \
+	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
 	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
 	done
 
@@ -152,7 +155,9 @@
 	rm -f debian/stamp-man-pages
 	rm -rf debian/shlibs-check
 	# revert multi-arch path in install files
-	for a in debian/*install debian/*links; do \
+	ls -d debian/* | \
+	grep -E "(install|links)$$" | \
+	while read a; do \
 	    [ ! -f $$a.arch ] || \
 	    mv $$a.arch $$a; \
 	done

debian/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk

diff --git a/debian/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk b/debian/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk
index 7c67fc9..4eeb672 100644
--- a/debian/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/gtk-qt-engine/debian/cdbs/debian-tde.mk
@@ -141,8 +141,11 @@
 	done; \
 	rm -f $$tmpf )
 	# update multi-arch path in install files
-	for a in debian/*install debian/*links; do \
+	ls -d debian/* | \
+	grep -E "(install|links)$$" | \
+	while read a; do \
 	    [ -d $$a ] || [ -f $$a.arch ] || \
+	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
 	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
 	done
 
@@ -152,7 +155,9 @@
 	rm -f debian/stamp-man-pages
 	rm -rf debian/shlibs-check
 	# revert multi-arch path in install files
-	for a in debian/*install debian/*links; do \
+	ls -d debian/* | \
+	grep -E "(install|links)$$" | \
+	while read a; do \
 	    [ ! -f $$a.arch ] || \
 	    mv $$a.arch $$a; \
 	done

debian/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk

diff --git a/debian/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk b/debian/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk
index 7c67fc9..4eeb672 100644
--- a/debian/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk
+++ b/debian/_base/applications/gwenview-i18n/debian/cdbs/debian-tde.mk
@@ -141,8 +141,11 @@
 	done; \
 	rm -f $$tmpf )
 	# update multi-arch path in install files
-	for a in debian/*install debian/*links; do \
+	ls -d debian/* | \
+	grep -E "(install|links)$$" | \
+	while read a; do \
 	    [ -d $$a ] || [ -f $$a.arch ] || \
+	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
 	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
 	done
 
@@ -152,7 +155,9 @@
 	rm -f debian/stamp-man-pages
 	rm -rf debian/shlibs-check
 	# revert multi-arch path in install files
-	for a in debian/*install debian/*links; do \
+	ls -d debian/* | \
+	grep -E "(install|links)$$" | \
+	while read a; do \
 	    [ ! -f $$a.arch ] || \
** Diff limit reached (max: 250 lines) **