need to pass PREFIX=/usr to avoid

was lost in rules file rewrite

I used debhelper 7.2 features too, shoot me :-)

diff --git a/debian/changelog b/debian/changelog
index 2492cc253f34c413eaced8e4485f10120fdecfa3..62374d2dc6aa1737509b3671e1e59e441ddc2009 100644 (file)
--- 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 <joeyh@debian.org>  Sun, 15 Feb 2009 20:11:57 -0500
 

diff --git a/debian/control b/debian/control
index 72ed77445dcd7a65b76e70c13f28b6a0b6c33cdd..0506dec24ea3bf1d8b8d39894b68411957f91aa0 100644 (file)
--- 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 <joeyh@debian.org>
 Uploaders: Josh Triplett <josh@freedesktop.org>

diff --git a/debian/rules b/debian/rules
index da8249920a4daa0208c3e9cf7098ba7b1b5a00fa..0a65715214cf2464dc021bc820de3f5bf049a1f6 100755 (executable)
--- 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: