From b8df07d8cffde2dda7a5cde6783505ff68e3fd26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Tarl=C3=A1=20Cardoso=20Lemos?=
 <fernandotcl@gmail.com>
Date: Fri, 21 Oct 2011 22:50:09 -0200
Subject: [PATCH] Bump dh compat to 7, simplify debian/rules.

Also added hardening flags. We can't enable PIE because i3bar seems
to have problems with that. We also shouldn't enable bindnow, as it
the startup performance penalty (though probably not too bad) might
not be acceptable for i3-msg and i3-input.
---
 debian/compat |  2 +-
 debian/rules  | 91 +++++++++++++++------------------------------------
 2 files changed, 27 insertions(+), 66 deletions(-)

diff --git a/debian/compat b/debian/compat
index 1e8b3149..7f8f011e 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-6
+7
diff --git a/debian/rules b/debian/rules
index 4ef9801b..02a8fca6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,76 +1,37 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
+# vi: ts=8 sw=8 noet
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-config.status: configure
-	dh_testdir
-	touch $@
-
-build: build-arch build-indep
-
-build-arch: build-stamp
-build-indep: build-stamp
+DPKG_EXPORT_BUILDFLAGS = 1
+-include /usr/share/dpkg/buildflags.mk
 
+build: build-stamp
 build-stamp:
-	dh_testdir
+	dh build
+	touch build-stamp
 
-	# Add here commands to compile the package.
-	$(MAKE) TERM_EMU=x-terminal-emulator
+clean:
+	dh clean
+
+install: build install-stamp
+install-stamp:
+	dh install
+	touch install-stamp
+
+binary-arch: install
+	dh binary-arch
+
+binary-indep: install
+	dh binary-indep
+
+binary: binary-arch binary-indep
+
+override_dh_auto_build:
+	$(MAKE) TERM_EMNU=x-terminal-emulator
 	$(MAKE) -C man
 	$(MAKE) -C docs
 
-	touch $@
-
-clean: 
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Add here commands to install the package into debian/i3-wm
+override_dh_install:
 	$(MAKE) DESTDIR=$(CURDIR)/debian/i3-wm/ install
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-	dh_installexamples
-	dh_installdebconf	
-	dh_installinit
-	dh_installman
-	dh_installwm
-	dh_link
+override_dh_strip:
 	dh_strip --dbg-package=i3-wm-dbg
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install