From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 24 Apr 2008 06:35:03 +0000 (-0400)
Subject: Use debhelper v7; rules file minimisation to 3 lines.
X-Git-Tag: 2.45~2
X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;h=9640714e44fe95fcd757b73eb6e8ef6eb93221b0;p=filters.git

Use debhelper v7; rules file minimisation to 3 lines.
---

diff --git a/Makefile b/Makefile
index a7d15ff..fe73898 100644
--- a/Makefile
+++ b/Makefile
@@ -16,15 +16,15 @@ ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
 CFLAGS += -g
 endif
 
-all:	$(OTHER) $(BUILD)
+all:	$(OTHER) $(BUILD) samples
 
 install:	$(BUILD) $(OTHER)
-	install -d $(PREFIX)/usr/games
-	$(INSTALL_PROGRAM) $(BUILD) $(PREFIX)/usr/games/
-	install $(OTHER) $(PREFIX)/usr/games/
-	install -d $(PREFIX)/usr/share/man/man6
-	install -m 0644 filters.6 $(PREFIX)/usr/share/man/man6
-	cd $(PREFIX)/usr/share/man/man6 && \
+	install -d $(DESTDIR)/usr/games
+	$(INSTALL_PROGRAM) $(BUILD) $(DESTDIR)/usr/games/
+	install $(OTHER) $(DESTDIR)/usr/games/
+	install -d $(DESTDIR)/usr/share/man/man6
+	install -m 0644 filters.6 $(DESTDIR)/usr/share/man/man6
+	cd $(DESTDIR)/usr/share/man/man6 && \
 		$(foreach prog,$(BUILD) $(OTHER),ln -s filters.6 $(prog).6;)
 
 samples:	$(BUILD) $(OTHER)
diff --git a/debian/changelog b/debian/changelog
index 5633698..8b0c9ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+filters (2.45) UNRELEASED; urgency=low
+
+  * Use debhelper v7; rules file minimisation to 3 lines.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 24 Apr 2008 02:34:34 -0400
+
 filters (2.44) unstable; urgency=low
 
   * Work around dpkg bug #476138. Closes: #475979
diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index e3fbbc0..e80fe32 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: filters
 Section: games
 Priority: optional
-Build-Depends: debhelper (>= 4), flex, bison | byacc | btyacc, dpkg-dev (>= 1.9.0)
+Build-Depends: debhelper (>= 7), flex, bison | byacc | btyacc, dpkg-dev (>= 1.9.0)
 Maintainer: Joey Hess <joeyh@debian.org>
 Standards-Version: 3.7.3
 Vcs-Git: git://git.kitenet.net/filters
diff --git a/debian/rules b/debian/rules
index b3effca..bda6f51 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,41 +1,7 @@
 #!/usr/bin/make -f
-
-build: build-stamp
-build-stamp:
-	dh_testdir
-	$(MAKE)
-	$(MAKE) samples
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	$(MAKE) clean
-	dh_clean
-
-binary-indep: build
-
-binary-arch: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	$(MAKE) PREFIX=debian/filters install
-	dh_installdocs README SAMPLES ky00te.dir/README.ky00te
-	dh_installchangelogs
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+%:
+	dh $@
 
 # Not intended for use by anyone except the author.
 announcedir:
 	@echo ${HOME}/src/joeywiki/code/filters/news
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary