[SCM] Qt Assistant compatibility version packaging branch, master, updated. debian/4.6.3-3-6-gbe09ff6

[Felix Geyer]

The following commit has been merged in the master branch:
commit be09ff6e0a68707042ce7fb473871708c789e336
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Fri Mar 9 11:57:56 2012 +0100

    Convert for multiarch.
    
    Build-depend on libqt4-dev 4:4.8.0.
---
 debian/changelog                        |    2 ++
 debian/control                          |    4 +++-
 debian/libqtassistantclient-dev.install |    6 +++---
 debian/libqtassistantclient4.install    |    2 +-
 debian/rules                            |    2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 668e14c..6ef39dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ qt-assistant-compat (4.6.3-4) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.9.3, no changes needed.
   * Append -Wl,--as-needed to LDFLAGS.
   * Remove lib/lib/ when cleaning the package.
+  * Convert for multiarch.
+    - Build-depend on libqt4-dev 4:4.8.0.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 09 Mar 2012 11:32:59 +0100
 
diff --git a/debian/control b/debian/control
index 019eda3..f6162a5 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: qt-assistant-compat
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>, Modestas Vainius <modax at debian.org>
-Build-Depends: debhelper (>= 9), libqt4-dev (>= 4:4.7.0~), pkg-kde-tools (>= 0.6)
+Build-Depends: debhelper (>= 9), libqt4-dev (>= 4:4.8.0~), pkg-kde-tools (>= 0.6)
 Standards-Version: 3.9.3
 Section: devel
 Homepage: http://doc.qt.nokia.com/4.6/qassistantclient.html
@@ -47,6 +47,8 @@ Description: Qt Assistant client library (development)
 Package: libqtassistantclient4
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Breaks: libqt4-assistant (<< 4:4.7.0~)
 Replaces: libqt4-assistant (<< 4:4.7.0~)
diff --git a/debian/libqtassistantclient-dev.install b/debian/libqtassistantclient-dev.install
index df6b72d..4c9b49d 100644
--- a/debian/libqtassistantclient-dev.install
+++ b/debian/libqtassistantclient-dev.install
@@ -2,7 +2,7 @@ usr/include/qt4/QtAssistant/QAssistantClient
 usr/include/qt4/QtAssistant/QtAssistant
 usr/include/qt4/QtAssistant/qassistantclient.h
 usr/include/qt4/QtAssistant/qassistantclient_global.h
-usr/lib/libQtAssistantClient.prl
-usr/lib/libQtAssistantClient.so
-usr/lib/pkgconfig/QtAssistantClient.pc
+usr/lib/*/libQtAssistantClient.prl
+usr/lib/*/libQtAssistantClient.so
+usr/lib/*/pkgconfig/QtAssistantClient.pc
 usr/share/qt4/mkspecs/features/assistant.prf
diff --git a/debian/libqtassistantclient4.install b/debian/libqtassistantclient4.install
index 1505c24..cf090a6 100644
--- a/debian/libqtassistantclient4.install
+++ b/debian/libqtassistantclient4.install
@@ -1 +1 @@
-usr/lib/libQtAssistantClient.so.*
+usr/lib/*/libQtAssistantClient.so.*
diff --git a/debian/rules b/debian/rules
index 107439b..8f5ab6e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ override_dh_auto_install:
 
 	# Fix wrong path in prl file
 	sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" \
-	    $(CURDIR)/debian/tmp/usr/lib/libQtAssistantClient.prl
+	    $(CURDIR)/debian/tmp/usr/lib/*/libQtAssistantClient.prl
 
 	# Install translations
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/qt4/translations/

-- 
Qt Assistant compatibility version packaging