[texmaker] 60/103: Get rid of outdated --before/--after magic in debian/rules; enable hardening

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository texmaker.

commit 43b27a2cfdcfe096ad34a807b597dafd79f460b2
Author: Andreas Tille <tille at debian.org>
Date:   Thu Jul 19 07:45:33 2012 +0000

    Get rid of outdated --before/--after magic in debian/rules; enable hardening
---
 debian/changelog |  3 +++
 debian/rules     | 18 ++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 61155d3..68013d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 texmaker (3.4-1) UNRELEASED; urgency=low
 
   * New upstream version
+  * debian/rules:
+     - replace the --before/--after magic by override_*
+     - enable hardening
 
  -- Andreas Tille <tille at debian.org>  Thu, 19 Jul 2012 08:56:48 +0200
 
diff --git a/debian/rules b/debian/rules
index 4257921..262c6f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,18 +6,16 @@ data=$(pkg)-data
 %:
 	dh $@
 
-clean:
-	dh clean --before dh_auto_clean
+override_dh_auto_clean:
 	[ ! -f Makefile ] || $(MAKE) distclean
 	$(RM) .obj/* .moc/* .ui/* 
-	dh clean --after  dh_auto_clean
-build:
-	dh build --before dh_auto_build
-	# qmake-qt4 -unix PREFIX=/usr CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" texmaker.pro
-	# this simple means does not help to propagate hardening :-(
-	qmake-qt4 -unix PREFIX=/usr texmaker.pro
-	dh build --after dh_auto_build --before dh_auto_test
-	dh build --after dh_auto_test
+	dh_auto_clean
+
+override_dh_auto_build:
+	qmake-qt4 -unix PREFIX=/usr QMAKE_CFLAGS="$(CPPFLAGS)" QMAKE_CXXFLAGS="$(CXXFLAGS)" QMAKE_LDFLAGS="$(LDFLAGS)" texmaker.pro
+
+override_dh_auto_test:
+	# do not try testing
 
 override_dh_installchangelogs:
 	dh_installchangelogs utilities/CHANGELOG.txt

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/texmaker.git