Use hardening build flags

Add build-dependency on dpkg-dev >= 1.16.1~

diff --git a/debian/changelog b/debian/changelog
index 95945ff72ac0821288661d4aa55e31e86486dfa6..6100705c80f16cb1d8449c44a896d60e53092bf8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ mmv (1.01b-16) UNRELEASED; urgency=low
   * Switch to source format "3.0 (quilt)"
   * Add patch to fix FTBFS with -Werror=format-security
   * Use debhelper (v9) in many places, add build-dependency
+  * Use hardening build flags
+    + Add build-dependency on dpkg-dev >= 1.16.1~
   * Add lintian overrides for no-upstream-changelog and no-homepage-field.
 
  -- Axel Beckert <abe@debian.org>  Sun, 16 Sep 2012 16:31:08 +0200

diff --git a/debian/control b/debian/control
index c891e9df2a368c81021a30c6a68abbc33da6a67b..0ba79af8c03673bd309fe003a937ea983b770aa6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Uploaders: Axel Beckert <abe@debian.org>
 Section: utils
 Priority: optional
 Standards-Version: 3.9.3
-Build-Depends: debhelper (>= 9~)
+Build-Depends: debhelper (>= 9~), dpkg-dev (>= 1.16.1~)
 
 Package: mmv
 Architecture: any

diff --git a/debian/rules b/debian/rules
index e2f6fba0d75c167ecc86ecf8e7a04820aacad2d8..fdfc5c45dc885f3fbe8fba56625d257af82e4802 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,7 @@
 #! /usr/bin/make -f
 
-LDFLAGS =
-CFLAGS = -g -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-
-
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-    CFLAGS += -O0
-else
-    CFLAGS += -O2
-endif
-
-ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-    LDFLAGS += -s
-endif
-
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-    NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-    MAKEFLAGS += -j$(NUMJOBS)
-endif
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
 
 build:
 # Builds the binary package.