Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper

diff --git a/debian/changelog b/debian/changelog
index 6201505c406b3c03cfeaa46be9659875c834083e..be712d288715101c5b5a6a45414e184cf8c87e67 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (7.3.8) unstable; urgency=low
+
+  * Fix t/override_target to use ./run. Closes: #538315
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 25 Jul 2009 00:37:45 +0200
+
 debhelper (7.3.7) unstable; urgency=low
 
   * First upload of buildsystems support to unstable.

diff --git a/t/override_target b/t/override_target
index 995d032cb3093d59bbcccf17e929c284cfb2bb03..28ceda841c2dd24cd2256f005fa3475e62a3ab7e 100755 (executable)
--- a/t/override_target
+++ b/t/override_target
@@ -11,7 +11,7 @@ open (OUT, ">", "t/tmp/debian/rules") || die "$!";
 print OUT <<EOF;
 #!/usr/bin/make -f
 %:
-       dh \$@
+       PATH=../..:\$\$PATH PERL5LIB=../.. ../../dh \$@
 override_dh_auto_build:
        echo "override called"
 EOF