summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-02-28 20:02:00 -0500
committerJoey Hess <joey@gnu.kitenet.net>2009-02-28 20:02:00 -0500
commite7ab4dca7d240f48a51960a6978c05d2f5aa7a97 (patch)
tree3ab2c39109276812d6c3550a94d1072ae6839911
parentbf969c1ca026433477c3578123b28e9829ba4e25 (diff)
parente7cb5caaf2e33147fcab83655a6d244b7636b65a (diff)
Merge branch 'dh_overrides'
Conflicts: debian/changelog
-rw-r--r--debian/changelog13
-rwxr-xr-xdh2
2 files changed, 14 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 257a547..b1199fe 100644
--- 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 81160b8..7cba156 100755
--- 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:/) {