[SCM] Qt 4 Debian packaging branch, experimental-snapshots, updated. debian/4.6.0-1-8-g5aa9b9e

[Fathi Boudra]

The following commit has been merged in the experimental-snapshots branch:
commit 5aa9b9e681b8a61fe590a39f3cf19cb52db62b63
Author: Fathi Boudra <fabo at kde.org>
Date:   Wed Jan 6 17:30:59 2010 +0100

    Use linux-g++-64 as platform_arg on required architectures (amd64, ia64 and
    kfreebsd-amd64). sparc 64 is still missing.
---
 debian/changelog |    3 +++
 debian/rules     |    6 ++++++
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 384398b..d7dbcb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ qt4-x11 (4:4.6.0-2) UNRELEASED; urgency=low
   * Add 94_fix_crash_in_qdbuspendingreply_qdbusreply.diff patch to fix a crash
     in QDBusPendingReply/QDBusReply in case of unconnected calls.
     (Closes: #560838)
+  * Update debian/rules:
+    - Use linux-g++-64 as platform_arg on required architectures (amd64, ia64
+      and kfreebsd-amd64).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 13 Dec 2009 18:43:29 +0200
 
diff --git a/debian/rules b/debian/rules
index 2e7adf0..5d3864d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,8 +30,14 @@ ifeq ($(DEB_HOST_ARCH),arm)
 	extra_configure_opts += -DQT_QLOCALE_USES_FCVT
 endif
 
+# TODO: add sparc 64
+64bits_architectures := amd64 ia64 kfreebsd-amd64
 ifeq ($(DEB_HOST_ARCH_OS),linux)
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(64bits_architectures)))
+	platform_arg = linux-g++-64
+else
 	platform_arg = linux-g++
+endif
 else
 	platform_arg = glibc-g++
 endif

-- 
Qt 4 Debian packaging