Switch from hardening-wrapper to buildflags.mk

diff --git a/debian/changelog b/debian/changelog
index 81ad4e5056c55367406f7668e00b1bb69c549772..d209d2da4558ef149383090c2d3df676ff1aa28e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 minitube (2.0-1) UNRELEASED; urgency=low
 
   * New upstream version
+  * Switch from hardening-wrapper to buildflags.mk
 
  -- Jakob Haufe <sur5r@sur5r.net>  Fri, 17 May 2013 16:35:41 +0200
 

diff --git a/debian/control b/debian/control
index 07d213b802c5aefa5419ae3acd9ecfd71fb96c0d..8dd636136b4278ac3e04f866b824c0128e210888 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: minitube
 Section: video
 Priority: extra
 Maintainer: Jakob Haufe <sur5r@sur5r.net>
-Build-Depends: cdbs, debhelper (>= 9), libqt4-dev (>= 4:4.5), libphonon-dev, hardening-wrapper
+Build-Depends: cdbs, debhelper (>= 9), libqt4-dev (>= 4:4.5), libphonon-dev
 Standards-Version: 3.9.3
 Homepage: http://flavio.tordini.org/minitube
 

diff --git a/debian/rules b/debian/rules
index 26315b5dae6d8a7a48da55df1d65219b611e8454..f7e5b70007cef6b56db5f9ea99119b9ac79e8add 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,8 @@
 #!/usr/bin/make -f
 
-export DEB_BUILD_HARDENING=1
-
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_CFLAGS_MAINT_APPEND = -Wall
+include /usr/share/dpkg/buildflags.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/qmake.mk