[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.3-1-7-g0470728

Fathi Boudra fabo at alioth.debian.org
Sat Jun 11 11:42:58 UTC 2011


The following commit has been merged in the experimental-snapshots branch:
commit 0a1c585f53d2ccfb705166b2ea1fd4a269e94e04
Author: Modestas Vainius <modax at debian.org>
Date:   Sat May 7 01:51:35 2011 +0300

    Build with system compiler on s390.
    
    s390 uses gcc 4.6 as system default now. However, in order to avoid #606079,
    still build depend >= g++ 4:4.5 [s390].
---
 debian/changelog |    4 ++++
 debian/control   |    2 +-
 debian/rules     |    5 -----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 61aebfa..a3be338 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ qt4-x11 (4:4.7.3-1) UNRELEASED; urgency=low
   [ Pino Toscano ]
   * Build depend on libssl-dev. (Closes: #623596)
 
+  [ Modestas Vainius ]
+  * Build with system compiler on s390 (which is 4.6 now). However, in order to
+    avoid #606079, build depend >= g++ 4:4.5 on s390.
+
  -- Fathi Boudra <fabo at debian.org>  Wed, 04 May 2011 13:08:38 +0300
 
 qt4-x11 (4:4.7.2-4) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 1b878ea..4c7bb14 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 7.4.13), pkg-kde-tools (>= 0.6.4), flex,
  libxext-dev, libxft-dev, libxi-dev, libxinerama-dev, libxmu-dev,
  libxrandr-dev, libxrender-dev, libxslt1-dev, libxt-dev, libxtst-dev,
  libxv-dev, zlib1g-dev, freetds-dev, libssl-dev,
- gcc-4.5 [s390], g++-4.5 [s390]
+ g++ (>= 4:4.5) [s390]
 Standards-Version: 3.9.1
 Homepage: http://qt.nokia.com/
 Vcs-Git: git://git.debian.org/pkg-kde/qt/qt4-x11.git
diff --git a/debian/rules b/debian/rules
index e941012..986ac81 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,11 +11,6 @@ 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)))

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list