From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 24 Apr 2008 01:36:24 +0000 (-0400)
Subject: Use debhelper v7, rules file minimisation.
X-Git-Url: https://git.madduck.net/code/myrepos.git/commitdiff_plain/2ccb790eda1239207af9566efcf0a13d1139b682?hp=77afe6a454e2eefa6dd70285f4edb9e794615101

Use debhelper v7, rules file minimisation.

Add a Makefile.
---

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..ea439ec
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,7 @@
+build:
+	pod2man -c mr mr > mr.1
+
+test:
+	(echo "[]"; echo "checkout=") > mrconfig.tmp
+	./mr -c mrconfig.tmp ed | grep -q "horse"
+	rm -f mrconfig.tmp
diff --git a/debian/changelog b/debian/changelog
index bb57d3a..8781260 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mr (0.28) UNRELEASED; urgency=low
+
+  * Use debhelper v7, rules file minimisation.
+  * Add a Makefile.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 23 Apr 2008 21:06:08 -0400
+
 mr (0.27) unstable; urgency=low
 
   * Ignore exit code from darcs whatsnew, which can be nonzero if there
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..fa6cfb8
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+mr.1
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index e19e556..b1c606c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: mr
 Section: utils
 Priority: optional
-Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.9.0)
+Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.9.0)
 Maintainer: Joey Hess <joeyh@debian.org>
 Standards-Version: 3.7.3
 Homepage: http://kitenet.net/~joey/code/mr/
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..2a6769e
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+README TODO
diff --git a/debian/examples b/debian/examples
new file mode 100644
index 0000000..3e7cc29
--- /dev/null
+++ b/debian/examples
@@ -0,0 +1 @@
+mrconfig mrconfig.complex
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..5c29193
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,2 @@
+mr usr/bin
+lib/* usr/share/mr
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..f7e585b
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1 @@
+*.1
diff --git a/debian/rules b/debian/rules
index 1cc28db..d688d4b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,39 +1,7 @@
 #!/usr/bin/make -f
-
-build:
-	pod2man -c mr mr > mr.1
-	(echo "[]"; echo "checkout=") > mrconfig.tmp
-	./mr -c mrconfig.tmp ed | grep -q "horse"
-	rm -f mrconfig.tmp
-
-clean:
-	dh_testdir
-	dh_testroot
-	dh_clean mr.1
-
-binary-arch: build
-
-binary-indep: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_install mr usr/bin
-	dh_installdocs README TODO
-	dh_installexamples mrconfig mrconfig.complex
-	dh_install lib/* usr/share/mr
-	dh_installman *.1
-	dh_installchangelogs
-	dh_compress
-	dh_fixperms
-	dh_perl
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+%:
+	dh $@
 
 # Not intended for use by anyone except the author.
 announcedir:
 	@echo ${HOME}/src/joeywiki/code/mr/news
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary