debhelper v7; rules file minimisation.

diff --git a/Makefile.PL b/Makefile.PL
index 5c450e619e766223a7e0304573d950d22498a7ea..93f9e89e2ab3314e6cc4ed85321c7168a3f1f67d 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -42,7 +42,7 @@ extra_build: ikiwiki.out ikiwiki.setup docwiki
        ./mdwn2man ikiwiki-makerepo 1 doc/ikiwiki-makerepo.mdwn > ikiwiki-makerepo.man
        ./mdwn2man ikiwiki-transition 1 doc/ikiwiki-transition.mdwn > ikiwiki-transition.man
        ./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man
-       $(MAKE) -C po mo
+       $(MAKE) -C po
        
 docwiki: ikiwiki.out
        $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh

diff --git a/debian/changelog b/debian/changelog
index 87fc347e5d8776537244e3567c87bbb31e09e80f..2492cc253f34c413eaced8e4485f10120fdecfa3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.05) UNRELEASED; urgency=low
+
+  * debhelper v7; rules file minimisation.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 15 Feb 2009 20:11:57 -0500
+
 ikiwiki (3.04) unstable; urgency=low
 
   * 404: New plugin which lets you use the IkiWiki CGI script as

diff --git a/debian/control b/debian/control
index 8622362bfa4f8d59ea2ef8bf9dace219433a08f2..72ed77445dcd7a65b76e70c13f28b6a0b6c33cdd 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: ikiwiki
 Section: web
 Priority: optional
-Build-Depends: perl, debhelper (>= 5)
+Build-Depends: perl, debhelper (>= 7)
 Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, libtext-markdown-perl | markdown, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator, libhtml-parser-perl, liburi-perl, perlmagick
 Maintainer: Joey Hess <joeyh@debian.org>
 Uploaders: Josh Triplett <josh@freedesktop.org>

diff --git a/debian/docs b/debian/docs
new file mode 100644 (file)
index 0000000..1936cc1
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+html

diff --git a/debian/link b/debian/link
new file mode 100644 (file)
index 0000000..cb37931
--- /dev/null
+++ b/debian/link
@@ -0,0 +1,2 @@
+usr/share/ikiwiki/examples usr/share/doc/ikiwiki/examples
+usr/share/common-licenses/GPL-2 usr/share/doc/ikiwiki/html/GPL

diff --git a/debian/rules b/debian/rules
index 2434d92c8e069ecdf5d67da4388ed3ceab3fc5d2..115b3f0c20fae4ecd26c9747d8f9790988a7d71b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,45 +1,7 @@
 #!/usr/bin/make -f
-
-build: build-stamp
-build-stamp:
-       dh_testdir
-       perl Makefile.PL PREFIX=/usr INSTALLDIRS=vendor
-       $(MAKE) -C po
-       $(MAKE)
-       $(MAKE) test
-       touch build-stamp
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp
-       perl Makefile.PL
-       if [ -e Makefile ]; then $(MAKE) realclean; fi
-       dh_clean
-
-binary-arch: build
-
-binary-indep: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k
-       $(MAKE) pure_install DESTDIR=$(shell pwd)/debian/ikiwiki
-       dh_installdocs html
-       dh_link usr/share/ikiwiki/examples usr/share/doc/ikiwiki/examples
-       dh_link usr/share/common-licenses/GPL-2 usr/share/doc/ikiwiki/html/GPL
-       dh_installexamples
-       dh_installchangelogs
-       dh_compress -X html
-       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/ikiwiki/doc/news
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary