[e00compr] 04/08: Use minimal dh rules.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository e00compr.

commit 36e108441d04398e442748668d4483e8e74f08c0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri May 6 15:49:19 2016 +0200

    Use minimal dh rules.
    
    Changes:
    - Enable parallel builds
    - Enable all hardening buildflags
    - Override dh_install to use --list-missing
---
 debian/changelog               |  4 ++++
 debian/patches/hardening.patch | 16 ++++++++++++++
 debian/patches/series          |  1 +
 debian/rules                   | 50 +++++++-----------------------------------
 4 files changed, 29 insertions(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a377740..e81cc29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ e00compr (1.0.1-3) UNRELEASED; urgency=medium
     - Update Vcs-* URLs to use HTTPS
   * Bump debhelper compatibility to 9.
   * Update copyright file using copyright-format 1.0.
+  * Use minimal dh rules, changes:
+    - Enable parallel builds
+    - Enable all hardening buildflags
+    - Override dh_install to use --list-missing
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 06 May 2016 15:35:19 +0200
 
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
new file mode 100644
index 0000000..12d1dcc
--- /dev/null
+++ b/debian/patches/hardening.patch
@@ -0,0 +1,16 @@
+Description: Include hardening buildflags set in the environment.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/Makefile
++++ b/Makefile
+@@ -13,8 +13,8 @@
+ 
+ 
+ CC= gcc
+-CFLAGS= -Wall
+-LFLAGS= 
++CFLAGS+= $(CPPFLAGS)
++LFLAGS=$(LDFLAGS)
+ AR= ar
+ 
+ LIB_OBJS= e00read.o e00write.o cpl_error.o cpl_conv.o cpl_vsisimple.o
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..814900f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+hardening.patch
diff --git a/debian/rules b/debian/rules
index d50baed..aadf6da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,51 +3,17 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-CFLAGS = -Wall -W -pedantic -g -D_REENTRANT
+# Enable hardening build flags
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+CFLAGS += -W -pedantic -D_REENTRANT
 
-build:
-	dh_testdir
-	$(MAKE) CFLAGS="$(CFLAGS)"
+%:
+	dh $@ --parallel
 
-clean:
-	dh_testdir
-	dh_testroot
-	[ ! -f Makefile ] || $(MAKE) clean
-	dh_clean 
+override_dh_install:
+	dh_install --list-missing
 
-install:
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	dh_install
-
-binary-arch: install
-	dh_testdir
-	dh_testroot
+override_dh_installchangelogs:
 	dh_installchangelogs HISTORY.TXT
-	dh_installdocs
-	dh_installexamples
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress 
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# do nothing
-binary-indep:
 
-binary: binary-arch binary-indep
-.PHONY: build clean binary-arch binary install binary-indep

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/e00compr.git