diff -Nru --exclude '*.pot' --exclude '*.po' ikiwiki-3.09ubuntu1/debian/changelog ikiwiki-3.09ubuntu2/debian/changelog
--- ikiwiki-3.09ubuntu1/debian/changelog	2009-04-05 23:04:45.000000000 +0100
+++ ikiwiki-3.09ubuntu2/debian/changelog	2009-04-29 12:17:39.000000000 +0100
@@ -1,3 +1,11 @@
+ikiwiki (3.09ubuntu2) jaunty; urgency=low
+
+  * Revert to older debian/rules due to older version of debhelper.
+  * Remove dependency on ${misc:Depends} due to older version of
+    debhelper.
+
+ -- David Edmondson <dme@dme.org>  Wed, 29 Apr 2009 12:09:31 +0100
+
 ikiwiki (3.09ubuntu1) jaunty; urgency=low
 
   * Merge from debian unstable, Ubuntu remaining changes:
diff -Nru --exclude '*.pot' --exclude '*.po' ikiwiki-3.09ubuntu1/debian/control ikiwiki-3.09ubuntu2/debian/control
--- ikiwiki-3.09ubuntu1/debian/control	2009-04-05 23:00:03.000000000 +0100
+++ ikiwiki-3.09ubuntu2/debian/control	2009-04-29 12:12:39.000000000 +0100
@@ -13,7 +13,7 @@
 
 Package: ikiwiki
 Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends}, libtext-markdown-perl | markdown, libhtml-scrubber-perl, libhtml-template-perl, libhtml-parser-perl, liburi-perl
+Depends: ${perl:Depends}, libtext-markdown-perl | markdown, libhtml-scrubber-perl, libhtml-template-perl, libhtml-parser-perl, liburi-perl
 Recommends: gcc | c-compiler, libc6-dev | libc-dev, subversion | git-core (>= 1:1.5.0) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38), libxml-simple-perl, libnet-openid-consumer-perl, liblwpx-paranoidagent-perl, libtimedate-perl, libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1), libmail-sendmail-perl, libauthen-passphrase-perl, libterm-readline-gnu-perl
 Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl, xapian-omega (>= 1.0.5), librpc-xml-perl, libtext-wikiformat-perl, python, python-docutils, polygen, tidy, libhtml-tree-perl, libxml-feed-perl, libmailtools-perl, perlmagick, libfile-mimeinfo-perl, libcrypt-ssleay-perl, liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl, libtext-csv-perl, libdigest-sha1-perl, graphviz, libnet-amazon-s3-perl, sparkline-php, texlive, dvipng, libtext-wikicreole-perl, libsort-naturally-perl, libtext-textile-perl
 Conflicts: ikiwiki-plugin-table
diff -Nru --exclude '*.pot' --exclude '*.po' ikiwiki-3.09ubuntu1/debian/rules ikiwiki-3.09ubuntu2/debian/rules
--- ikiwiki-3.09ubuntu1/debian/rules	2009-03-27 19:08:11.000000000 +0000
+++ ikiwiki-3.09ubuntu2/debian/rules	2009-04-29 12:10:13.000000000 +0100
@@ -1,19 +1,45 @@
 #!/usr/bin/make -f
-%:
-	dh $@
 
-override_dh_auto_configure:
-	# keeps it out of /usr/local
-	dh_auto_configure -- PREFIX=/usr
-
-override_dh_compress:
-	# avoid compressing files in the doc wiki
-	dh_compress -Xhtml
+build: build-stamp
+build-stamp:
+	dh_testdir
+	perl Makefile.PL PREFIX=/usr INSTALLDIRS=vendor
+	$(MAKE) -C po
+	$(MAKE)
+	$(MAKE) test
+	touch build-stamp
 
-override_dh_auto_clean:
-	# distclean moans about MANIFEST, this is quieter
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+	perl Makefile.PL
 	if [ -e Makefile ]; then $(MAKE) realclean; fi
+	dh_clean
 
-# Not intended for use by anyone except the author.
+binary-arch: build
+
+binary-indep: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	$(MAKE) pure_install DESTDIR=$(shell pwd)/debian/ikiwiki
+	dh_install wikilist etc/ikiwiki
+	dh_installdocs html
+	dh_installexamples doc/examples/*
+	dh_link usr/share/common-licenses/GPL-2 usr/share/doc/ikiwiki/html/GPL
+	dh_installchangelogs
+	dh_compress -X html
+	dh_fixperms
+	dh_perl
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Not intended for use by anyone except the author.	
 announcedir:
 	@echo ${HOME}/src/ikiwiki/doc/news
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary