[SCM] QtCurve packaging branch, master, updated. debian/1.8.18+git20160112-0cd6aae-1-3-gd921cea

[Boris Pek]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/qtcurve.git;a=commitdiff;h=be05f00

The following commit has been merged in the master branch:
commit be05f0093a12e0e08520f4064c508f40e83eb52c
Author: Boris Pek <tehnick-8 at yandex.ru>
Date:   Tue Apr 26 00:16:43 2016 +0300

    Update debian/rules:
    - enable all hardening flags
    - delete override_dh_builddeb target
---
 debian/rules | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/debian/rules b/debian/rules
index 294d81e..4564228 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,22 +7,24 @@ USCAN_REPORT = $(shell uscan --noconf --report --dehs "$(DEBIAN_PATH)")
 CUR_VER = $(shell echo "$(USCAN_REPORT)" | sed -n 's/.*<upstream-version>\(.*\)<\/upstream-version>.*/
/p')
 CUR_URL = $(shell echo "$(USCAN_REPORT)" | sed -n 's/.*<upstream-url>\(.*\)<\/upstream-url>.*/
/p')
 
+export DEB_CXXFLAGS_MAINT_APPEND = $(shell dpkg-buildflags --get CPPFLAGS)
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+CMAKEOPTS = -DLIB_INSTALL_DIR="/usr/lib/$(DEB_HOST_MULTIARCH)" \
+            -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4 \
+            -DQTC_QT5_ENABLE_KDE=On \
+            -DQTC_QT4_ENABLE_KDE=Off \
+            -DQTC_QT4_ENABLE_KWIN=Off \
+            -DENABLE_TEST=Off
+
 %:
 	dh $@ --parallel --list-missing --with=kf5
 
 override_dh_auto_configure:
-	dh_auto_configure -- \
-		-DLIB_INSTALL_DIR="/usr/lib/$(DEB_HOST_MULTIARCH)" \
-		-DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4 \
-		-DQTC_QT5_ENABLE_KDE=On \
-		-DQTC_QT4_ENABLE_KDE=Off \
-		-DQTC_QT4_ENABLE_KWIN=Off \
-		-DENABLE_TEST=Off
-
-override_dh_builddeb:
-	dh_builddeb -- -Zxz
+	dh_auto_configure -- $(CMAKEOPTS)
 
 get-orig-source:
 	wget -c "$(CUR_URL)" -O "$(PACKAGE)_$(CUR_VER).orig.tar.gz"

-- 
QtCurve packaging