Merge branch 'dh_overrides'

Conflicts:
	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 257a547657982735ae972796deebb16d6e95b779..b1199feb713501d9d254f2ac6cfd353bff10717c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (7.2.1) experimental; urgency=low
+
+  * Merged debhelper 7.0.52.
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 28 Feb 2009 20:01:22 -0500
+
 debhelper (7.2.0) experimental; urgency=low
 
   * Merged debhelper 7.0.50.
@@ -56,6 +62,13 @@ debhelper (7.1.0) experimental; urgency=low
 
  -- Joey Hess <joeyh@debian.org>  Wed, 10 Sep 2008 13:58:00 -0400
 
+debhelper (7.0.52) unstable; urgency=low
+
+  * dh: Fix make parsing to not be broken by locale settings.
+    Closes: #517617
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 28 Feb 2009 19:52:34 -0500
+
 debhelper (7.0.51) unstable; urgency=low
 
   * dh: Man page typos. Closes: #517549, #517550

diff --git a/dh b/dh
index 81160b8437d2ea7e5b4d878ece36ff4260617b81..7cba15610e39fd806187c0934cbe34b3d04bce9d 100755 (executable)
--- a/dh
+++ b/dh
@@ -515,7 +515,7 @@ sub rules_explicit_target {
        if (! $rules_parsed) {  
                my $processing_targets = 0;
                my $not_a_target = 0;
-               open(MAKE, "make -Rrnpsf debian/rules debhelper-fail-me 2>/dev/null |");
+               open(MAKE, "LANG=C make -Rrnpsf debian/rules debhelper-fail-me 2>/dev/null |");
                while (<MAKE>) {
                        if ($processing_targets) {
                                if (/^# Not a target:/) {