[SCM] Qt 4 packaging branch, master, updated. debian/4.7.2-2-3-g3ab2fa7

Pino Toscano pino-guest at alioth.debian.org
Tue Mar 22 09:33:12 UTC 2011


The following commit has been merged in the master branch:
commit 3ab2fa7cf5cc24e28b3df79f1c36c25c7f3006c2
Author: Pino Toscano <pino at kde.org>
Date:   Tue Mar 22 10:30:38 2011 +0100

    s390: set earlier the compiler
---
 debian/changelog |    1 +
 debian/rules     |    9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0582386..9239b1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ qt4-x11 (4:4.7.2-3) UNRELEASED; urgency=low
   [ Pino Toscano ]
   * Change the directory used for the hppa readdir test from doc/html (which
     gets removed in clean) to doc/src/images.
+  * Set earlier the compiler for s390. (really closes: #606079)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 22 Mar 2011 10:21:55 +0100
 
diff --git a/debian/rules b/debian/rules
index 52bf5f6..cf2417f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,11 @@ export LD_LIBRARY_PATH := $(QTDIR)/lib:$(LD_LIBRARY_PATH)
 # workaround to use qhelpgenerator.
 export QT_PLUGIN_PATH := $(QTDIR)/plugins
 
+ifeq ($(DEB_HOST_ARCH),s390)
+export CC=gcc-4.5
+export CXX=g++-4.5
+endif
+
 pkgs_dbg := $(shell dh_listpackages | grep dbg | sed -e '/libqt4-dbg/d; s|-dbg||')
 # Library package list for override_dh_makeshlibs, excludes libqt4-phonon
 pkgs_lib := $(filter-out %-dev %-dbg libqt4-phonon,$(filter lib%,$(shell dh_listpackages)))
@@ -71,10 +76,6 @@ ifeq ($(DEB_HOST_ARCH),hppa)
 		exit 5 ; \
 	fi
 endif
-ifeq ($(DEB_HOST_ARCH),s390)
-	export CC=gcc-4.5
-	export CXX=g++-4.5
-endif
 
 	# Create mkspecs/glibc-g++ from mkspecs/linux-g++, needed by GNU/kFreeBSD
 	# we cannot use directly linux-g++ due to src/corelib/io/io.pri

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list