dh is now working

And debian/rules uses it.

Sweet!

2 files changed, 6 insertions, 33 deletions

diff --git a/debian/changelog b/debian/changelog
index 692b4ea7..eb654ceb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,10 @@ debhelper (7.0.0) UNRELEASED; urgency=low
     debian/tmp, and then will look in the current directory. This allows
     dh_install to interoperate with dh_auto_install without needing any
     special parameters.
+  * dh: New program that runs a series of debhelper commands in a sequence.
+    This can be used to construct very short rules files (as short as 3
+    lines), while still exposing the full power of debhelper when it's
+    needed.
   * Add a Makefile and simplify this package's own rules file using
     all the new toys.
 
diff --git a/debian/rules b/debian/rules
index 9a90b2d6..5b8fd17c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,40 +2,9 @@
 # Each debhelper command in this rules file has to be run using ./run,
 # to ensure that the commands and libraries in the source tree are used,
 # rather than the installed ones.
-
-build:
-	./run dh_auto_configure
-	./run dh_auto_build
-	./run dh_auto_test
-
-clean:
-	./run dh_testdir
-	./run dh_testroot
-	./run dh_auto_clean
-	./run dh_clean
-
-binary-indep: build
-	./run dh_testdir
-	./run dh_testroot
-	./run dh_clean -k
-	./run dh_auto_install
-	./run dh_installdocs
-	./run dh_installexamples
-	./run dh_installman
-	./run dh_installchangelogs
-	./run dh_link
-	./run dh_compress
-	./run dh_fixperms
-	./run dh_perl
-	./run dh_installdeb
-	./run dh_gencontrol
-	./run dh_md5sums
-	./run dh_builddeb
+%:
+	./run dh $@
 
 # Not intended for use by anyone except the author.
 announcedir:
 	@echo ${HOME}/src/joeywiki/code/debhelper/news
-
-binary-arch:
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary