[SCM] Qt 4 Debian packaging branch, master, updated. debian/4.6.2-1-3-g9faac02

[Fathi Boudra]

The following commit has been merged in the master branch:
commit 9faac02c10cd80b254e9766ea1445d579c987c7c
Author: Fathi Boudra <fabo at debian.org>
Date:   Thu Mar 25 17:16:16 2010 +0100

    Fix FTBFS on ia64: -m64 option isn't recognized by gcc.
    set platform_arg to linux-g++ on this architecture.
---
 debian/changelog |    2 ++
 debian/rules     |    8 ++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5a8d7db..c0479c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ qt4-x11 (4:4.6.2-2) UNRELEASED; urgency=low
       Fixed QPixmap::load() to not modify referenced copies.
   * Fix FTBFS on sparc caused by a wrong platform_arg value:
     check for exact string match (instead of findstring usage).
+  * Fix FTBFS on ia64: -m64 option isn't recognized by gcc.
+    set platform_arg to linux-g++ on this architecture.
 
  -- Fathi Boudra <fabo at debian.org>  Fri, 19 Mar 2010 16:28:34 +0100
 
diff --git a/debian/rules b/debian/rules
index 9e137e8..8a9574a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,15 +38,11 @@ ifeq ($(DEB_HOST_ARCH_OS),linux)
   ifeq ($(DEB_HOST_ARCH),amd64)
 	platform_arg = linux-g++-64
   else
-    ifeq ($(DEB_HOST_ARCH),ia64)
+    ifeq ($(DEB_HOST_ARCH),sparc64)
 	platform_arg = linux-g++-64
     else
-      ifeq ($(DEB_HOST_ARCH),sparc64)
-	platform_arg = linux-g++-64
-      else
 	platform_arg = linux-g++
-      endif # sparc64
-    endif # ia64
+    endif # sparc64
   endif # amd64
 else
 	platform_arg = glibc-g++

-- 
Qt 4 Debian packaging