[SCM] Qt 4 packaging branch, master, updated. debian/4.7.3-5-5-g786242a

Pino Toscano pino at alioth.debian.org
Tue Aug 9 16:20:32 UTC 2011


The following commit has been merged in the master branch:
commit 786242ab5294b647dec28cd866ed2f64c87a35b5
Author: Pino Toscano <pino at debian.org>
Date:   Tue Aug 9 18:20:13 2011 +0200

    compile using the linux-g++-64 mkspec on s390x
---
 debian/changelog |    1 +
 debian/rules     |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 41d0ee3..a2a0580 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qt4-x11 (4:4.7.3-6~0) UNRELEASED; urgency=low
     run. (Closes: #635724)
   * Add patch s390x_jscore.diff to add s390/s390x support in JavaScriptCore.
     (Closes: #636544)
+  * Compile using the linux-g++-64 mkspec on s390x.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 09 Aug 2011 11:01:35 +0200
 
diff --git a/debian/rules b/debian/rules
index d3a3e18..0794935 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,7 +53,7 @@ else
 endif
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-  architectures_64bits := amd64 sparc64
+  architectures_64bits := amd64 sparc64 s390x
   ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(architectures_64bits)))
 	platform_arg = linux-g++-64
   else

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list