[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.2+dfsg-10-11-g3a353ea

Timo Jyrinki timo at alioth.debian.org
Fri Feb 8 06:32:58 UTC 2013


Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=3a353ea

The following commit has been merged in the experimental branch:
commit 3a353ea19510774028776dd530611f2bc5205bb4
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Fri Feb 8 06:32:44 2013 +0000

    Add the symlinks with a for loop instead.
---
 debian/rules |   16 ++++------------
 1 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/debian/rules b/debian/rules
index f5f1dc8..475143e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -281,18 +281,10 @@ override_dh_auto_install:
 		-exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*//" {} \;
 
 	# Add symlinks for the -qt4 binaries still used by some
-	cat debian/libqt4-dev-bin.links.in > debian/libqt4-dev-bin.links
-	sed -i 's/MULTIARCH/$(DEB_HOST_MULTIARCH)/' debian/libqt4-dev-bin.links
-	cat debian/qt4-designer.links.in > debian/qt4-designer.links
-	sed -i 's/MULTIARCH/$(DEB_HOST_MULTIARCH)/' debian/qt4-designer.links
-	cat debian/qt4-dev-tools.links.in > debian/qt4-dev-tools.links
-	sed -i 's/MULTIARCH/$(DEB_HOST_MULTIARCH)/' debian/qt4-dev-tools.links
-	cat debian/qt4-linguist-tools.links.in > debian/qt4-linguist-tools.links
-	sed -i 's/MULTIARCH/$(DEB_HOST_MULTIARCH)/' debian/qt4-linguist-tools.links
-	cat debian/qt4-qmake.links.in > debian/qt4-qmake.links
-	sed -i 's/MULTIARCH/$(DEB_HOST_MULTIARCH)/' debian/qt4-qmake.links
-	cat debian/qt4-qtconfig.links.in > debian/qt4-qtconfig.links
-	sed -i 's/MULTIARCH/$(DEB_HOST_MULTIARCH)/' debian/qt4-qtconfig.links
+	for links_file in debian/libqt4-dev-bin.links debian/qt4-designer.links debian/qt4-dev-tools.links debian/qt4-linguist-tools.links debian/qt4-qmake.links debian/qt4-qtconfig.links ; do \
+		cat $$links_file.in > $$links_file ; \
+		sed -i 's/MULTIARCH/$(DEB_HOST_MULTIARCH)/' $$links_file ; \
+	done
 
 	install -D -p -m0644 debian/collection/qtdemo.qhc \
 		debian/qt4-demos/usr/lib/qt4/demos/qtdemo/qtdemo.qhc

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list