[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.2+dfsg-9-7-gb3655f2

[Timo Jyrinki]

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

The following commit has been merged in the experimental branch:
commit b3655f20a480b2ca540e1b0165a19a41c960ebba
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Sat Jan 19 11:44:15 2013 +0200

    Fix the -qt4 symlink creation.
    
    Make it actually work. Possibly could be done more elegantly.
---
 debian/libqt4-dev-bin.links        |    5 -----
 debian/libqt4-dev-bin.links.in     |    5 +++++
 debian/qt4-designer.links          |    2 --
 debian/qt4-designer.links.in       |    2 ++
 debian/qt4-dev-tools.links         |    2 --
 debian/qt4-dev-tools.links.in      |    2 ++
 debian/qt4-linguist-tools.links    |    4 ----
 debian/qt4-linguist-tools.links.in |    4 ++++
 debian/qt4-qmake.links             |    2 --
 debian/qt4-qmake.links.in          |    2 ++
 debian/qt4-qtconfig.links          |    1 -
 debian/qt4-qtconfig.links.in       |    1 +
 debian/rules                       |   14 ++++++++++++++
 13 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/debian/libqt4-dev-bin.links b/debian/libqt4-dev-bin.links
deleted file mode 100644
index fe462dc..0000000
--- a/debian/libqt4-dev-bin.links
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib/*/qt4/bin/moc         usr/share/qt4/bin/moc
-usr/lib/*/qt4/bin/uic         usr/share/qt4/bin/uic
-usr/lib/*/qt4/bin/rcc             usr/share/qt4/bin/rcc
-usr/lib/*/qt4/bin/moc         usr/bin/moc-qt4
-usr/lib/*/qt4/bin/uic         usr/bin/uic-qt4
diff --git a/debian/libqt4-dev-bin.links.in b/debian/libqt4-dev-bin.links.in
new file mode 100644
index 0000000..bbf72ce
--- /dev/null
+++ b/debian/libqt4-dev-bin.links.in
@@ -0,0 +1,5 @@
+usr/lib/MULTIARCH/qt4/bin/moc         usr/share/qt4/bin/moc
+usr/lib/MULTIARCH/qt4/bin/uic         usr/share/qt4/bin/uic
+usr/lib/MULTIARCH/qt4/bin/rcc             usr/share/qt4/bin/rcc
+usr/lib/MULTIARCH/qt4/bin/moc         usr/bin/moc-qt4
+usr/lib/MULTIARCH/qt4/bin/uic         usr/bin/uic-qt4
diff --git a/debian/qt4-designer.links b/debian/qt4-designer.links
deleted file mode 100644
index 2bb19cf..0000000
--- a/debian/qt4-designer.links
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/qt4/bin/designer             usr/share/qt4/bin/designer
-usr/lib/*/qt4/bin/designer             usr/bin/designer-qt4
diff --git a/debian/qt4-designer.links.in b/debian/qt4-designer.links.in
new file mode 100644
index 0000000..189f352
--- /dev/null
+++ b/debian/qt4-designer.links.in
@@ -0,0 +1,2 @@
+usr/lib/MULTIARCH/qt4/bin/designer             usr/share/qt4/bin/designer
+usr/lib/MULTIARCH/qt4/bin/designer             usr/bin/designer-qt4
diff --git a/debian/qt4-dev-tools.links b/debian/qt4-dev-tools.links
deleted file mode 100644
index 10ecd41..0000000
--- a/debian/qt4-dev-tools.links
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/qt4/bin/assistant usr/bin/assistant-qt4
-usr/lib/*/qt4/bin/linguist usr/bin/linguist-qt4
diff --git a/debian/qt4-dev-tools.links.in b/debian/qt4-dev-tools.links.in
new file mode 100644
index 0000000..b4795e3
--- /dev/null
+++ b/debian/qt4-dev-tools.links.in
@@ -0,0 +1,2 @@
+usr/lib/MULTIARCH/qt4/bin/assistant usr/bin/assistant-qt4
+usr/lib/MULTIARCH/qt4/bin/linguist usr/bin/linguist-qt4
diff --git a/debian/qt4-linguist-tools.links b/debian/qt4-linguist-tools.links
deleted file mode 100644
index d58b13a..0000000
--- a/debian/qt4-linguist-tools.links
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/lib/*/qt4/bin/lrelease    usr/share/qt4/bin/lrelease
-usr/lib/*/qt4/bin/lupdate     usr/share/qt4/bin/lupdate
-usr/lib/*/qt4/bin/lrelease    usr/bin/lrelease-qt4
-usr/lib/*/qt4/bin/lupdate     usr/bin/lupdate-qt4
diff --git a/debian/qt4-linguist-tools.links.in b/debian/qt4-linguist-tools.links.in
new file mode 100644
index 0000000..74e88e3
--- /dev/null
+++ b/debian/qt4-linguist-tools.links.in
@@ -0,0 +1,4 @@
+usr/lib/MULTIARCH/qt4/bin/lrelease    usr/share/qt4/bin/lrelease
+usr/lib/MULTIARCH/qt4/bin/lupdate     usr/share/qt4/bin/lupdate
+usr/lib/MULTIARCH/qt4/bin/lrelease    usr/bin/lrelease-qt4
+usr/lib/MULTIARCH/qt4/bin/lupdate     usr/bin/lupdate-qt4
diff --git a/debian/qt4-qmake.links b/debian/qt4-qmake.links
deleted file mode 100644
index 67b1c78..0000000
--- a/debian/qt4-qmake.links
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/qt4/bin/qmake       usr/share/qt4/bin/qmake
-usr/lib/*/qt4/bin/qmake       usr/bin/qmake-qt4
diff --git a/debian/qt4-qmake.links.in b/debian/qt4-qmake.links.in
new file mode 100644
index 0000000..c782f1f
--- /dev/null
+++ b/debian/qt4-qmake.links.in
@@ -0,0 +1,2 @@
+usr/lib/MULTIARCH/qt4/bin/qmake       usr/share/qt4/bin/qmake
+usr/lib/MULTIARCH/qt4/bin/qmake       usr/bin/qmake-qt4
diff --git a/debian/qt4-qtconfig.links b/debian/qt4-qtconfig.links
deleted file mode 100644
index e4ad07a..0000000
--- a/debian/qt4-qtconfig.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/qt4/bin/qtconfig usr/bin/qtconfig-qt4
diff --git a/debian/qt4-qtconfig.links.in b/debian/qt4-qtconfig.links.in
new file mode 100644
index 0000000..34b29c0
--- /dev/null
+++ b/debian/qt4-qtconfig.links.in
@@ -0,0 +1 @@
+usr/lib/MULTIARCH/qt4/bin/qtconfig usr/bin/qtconfig-qt4
diff --git a/debian/rules b/debian/rules
index fa83f42..f5f1dc8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -280,6 +280,20 @@ override_dh_auto_install:
 	find $(CURDIR)/debian/tmp/usr/lib -type f -name '*.prl' \
 		-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
+
 	install -D -p -m0644 debian/collection/qtdemo.qhc \
 		debian/qt4-demos/usr/lib/qt4/demos/qtdemo/qtdemo.qhc
 

-- 
Qt 4 packaging