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

Fathi Boudra fabo at alioth.debian.org
Wed Jan 6 21:43:51 UTC 2010


The following commit has been merged in the experimental-snapshots branch:
commit acbed1e3fc74d25a85507dfe9ad55403bbeea8e5
Author: Fathi Boudra <fabo at kde.org>
Date:   Wed Jan 6 22:43:08 2010 +0100

    Add sparc64 to linux64_architectures
---
 debian/changelog |    2 +-
 debian/rules     |    9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d7dbcb0..27f4db7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,7 +13,7 @@ qt4-x11 (4:4.6.0-2) UNRELEASED; urgency=low
     (Closes: #560838)
   * Update debian/rules:
     - Use linux-g++-64 as platform_arg on required architectures (amd64, ia64
-      and kfreebsd-amd64).
+      kfreebsd-amd64 and sparc64).
 
  -- 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 5d3864d..5a2d51f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,14 +30,13 @@ ifeq ($(DEB_HOST_ARCH),arm)
 	extra_configure_opts += -DQT_QLOCALE_USES_FCVT
 endif
 
-# TODO: add sparc 64
-64bits_architectures := amd64 ia64 kfreebsd-amd64
+linux64_architectures := amd64 ia64 kfreebsd-amd64 sparc64
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(64bits_architectures)))
+  ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(linux64_architectures)))
 	platform_arg = linux-g++-64
-else
+  else
 	platform_arg = linux-g++
-endif
+  endif
 else
 	platform_arg = glibc-g++
 endif

-- 
Qt 4 Debian packaging



More information about the pkg-kde-commits mailing list