r45259 - in /packages/texmaker/trunk/debian: changelog rules

[tille at users.alioth.debian.org]

Author: tille
Date: Thu Jul 19 07:45:33 2012
New Revision: 45259

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45259
Log:
Get rid of outdated --before/--after magic in debian/rules; enable hardening

Modified:
    packages/texmaker/trunk/debian/changelog
    packages/texmaker/trunk/debian/rules

Modified: packages/texmaker/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/texmaker/trunk/debian/changelog?rev=45259&op=diff
==============================================================================
--- packages/texmaker/trunk/debian/changelog (original)
+++ packages/texmaker/trunk/debian/changelog Thu Jul 19 07:45:33 2012
@@ -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
 

Modified: packages/texmaker/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/texmaker/trunk/debian/rules?rev=45259&op=diff
==============================================================================
--- packages/texmaker/trunk/debian/rules (original)
+++ packages/texmaker/trunk/debian/rules Thu Jul 19 07:45:33 2012
@@ -6,18 +6,16 @@
 %:
 	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