[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.3-1-7-g0470728

[Fathi Boudra]

The following commit has been merged in the experimental-snapshots branch:
commit dd4b63ab23849a13c07451077e35591f40c84685
Author: Pino Toscano <pino at kde.org>
Date:   Wed Apr 27 17:06:33 2011 +0200

    firebird/ibase build: enable depending on the existance of libqt4-sql-ibase for the current arch
    
    this allows to get rid of an hardcoded list of architectures in rules
---
 debian/changelog |    6 ++++++
 debian/rules     |    3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 60b7c7d..e3ddeb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,12 @@ qt4-x11 (4:4.7.2-4) UNRELEASED; urgency=low
     cve_2010_3170_ssl_certificates_wildcard.diff. This problem affects the Arora
     web browser.
 
+  [ Pino Toscano ]
+  * FireBird/ibase:
+    - rules: enable the ibase plugin only if the libqt4-sql-ibase package is
+      enabled for the current architecture (this allows to get rid of an
+      hardcoded list of architectures in rules).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 15 Apr 2011 22:42:35 +0200
 
 qt4-x11 (4:4.7.2-3) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index cf2417f..e941012 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,8 +29,7 @@ shlibs_version := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | cut -
 # Qt upstream release
 libqt4phonon_shlibs := libphonon4 (>= 4:4.6.0) | libqt4-phonon (= $(current_version))
 
-ibase_architectures := i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(ibase_architectures)))
+ifneq (,$(filter %-sql-ibase,$(shell dh_listpackages)))
 	extra_configure_opts += -plugin-sql-ibase
 else
 	extra_configure_opts += -no-sql-ibase

-- 
Qt 4 packaging