[SCM] qtcreator packaging branch, master, updated. 76f2337656e805f850fa439eb96512c58792a6eb

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtcreator.git;a=commitdiff;h=76f2337

The following commit has been merged in the master branch:
commit 76f2337656e805f850fa439eb96512c58792a6eb
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed May 22 17:07:30 2013 -0300

    Export CFLAGS, CXXFLAGS, LDFLAGS for hardening and QT_SELECT to choose qt5.
---
 debian/changelog |    1 +
 debian/rules     |    7 ++++++-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0ca5bd4..8757977 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ qtcreator (2.7.0-1) UNRELEASED; urgency=low
   * Remove posix_rt_nonlinux.diff. It applies against 3rd party botan, but we
     are now using the system botan.
   * Start using Qt5 to compile.
+  * Export CFLAGS, CXXFLAGS, LDFLAGS for hardening and QT_SELECT to choose qt5.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 22 May 2013 15:40:28 -0300
 
diff --git a/debian/rules b/debian/rules
index f6e6855..f7bb225 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,11 +5,16 @@
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
+export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
+export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
+export QT_SELECT := qt5
+
 # Upstream changelog
 upstream_changes := $(wildcard dist/changes-*)
 
 %:
-	dh $@ --parallel --list-missing --dbg-package=qtcreator-dbg --buildsystem=qmake_qt4 --builddirectory=builddir
+	dh $@ --parallel --list-missing --dbg-package=qtcreator-dbg --builddirectory=builddir
 
 override_dh_auto_configure:
 	dh_auto_configure -- IDE_LIBRARY_BASENAME=lib/$(DEB_HOST_MULTIARCH) $(extra_configure_opts)

-- 
qtcreator packaging