[SCM] Qt 4 packaging branch, master, updated. debian/4.7.3-7-2-g15e9c6b

Pino Toscano pino at alioth.debian.org
Sat Sep 10 10:33:49 UTC 2011


The following commit has been merged in the master branch:
commit 15e9c6ba05dcc4531c435b434019ee89b30a4e72
Author: Pino Toscano <pino at debian.org>
Date:   Sat Sep 10 12:27:52 2011 +0200

    use the linux-g++ mkspec on alpha and ia64 (#640981)
---
 debian/changelog |    2 ++
 debian/rules     |    4 +++-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b0476ff..6c9bd53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qt4-x11 (4:4.7.3-7) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Use the linux-g++ mkspec on alpha and ia64. (Closes: #640981)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 10 Aug 2011 14:00:11 +0200
 
diff --git a/debian/rules b/debian/rules
index 47e5efb..7e862a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,7 +53,9 @@ else
 endif
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-  ifeq ($(DEB_HOST_ARCH_BITS),64)
+  ifneq (,$(filter $(DEB_HOST_ARCH),alpha ia64))
+	platform_arg = linux-g++
+  else ifeq ($(DEB_HOST_ARCH_BITS),64)
 	platform_arg = linux-g++-64
   else
 	platform_arg = linux-g++

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list