From 25b1f60aeb26f8d14d7619b304f8aca0735c850f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 16 Feb 2009 21:49:26 -0500 Subject: [PATCH] need to pass PREFIX=/usr to avoid was lost in rules file rewrite I used debhelper 7.2 features too, shoot me :-) --- debian/changelog | 2 +- debian/control | 2 +- debian/rules | 17 +++++++++++------ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2492cc253..62374d2dc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ ikiwiki (3.05) UNRELEASED; urgency=low - * debhelper v7; rules file minimisation. + * debhelper v7.2; rules file minimisation. -- Joey Hess Sun, 15 Feb 2009 20:11:57 -0500 diff --git a/debian/control b/debian/control index 72ed77445..0506dec24 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: ikiwiki Section: web Priority: optional -Build-Depends: perl, debhelper (>= 7) +Build-Depends: perl, debhelper (>= 7.2) 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 Uploaders: Josh Triplett diff --git a/debian/rules b/debian/rules index da8249920..0a6571521 100755 --- a/debian/rules +++ b/debian/rules @@ -1,13 +1,18 @@ #!/usr/bin/make -f +%: + dh $@ + +# keeps it out if /usr/local +override_dh_auto_configure: + dh_auto_configure -- PREFIX=/usr -binary: binary-indep -binary-indep: - dh $@ --before dh_compress +# avoid compressing files in the doc wiki +override_dh_compress: dh_compress -Xhtml - dh $@ --after dh_compress -%: - dh $@ +# distclean moans about MANIFEST, this is quieter +override_dh_auto_clean: + $(MAKE) realclean # Not intended for use by anyone except the author. announcedir: -- 2.44.0