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

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 5a0b794759add819a02738d371524480d8499d13..325c7fc3823e895e2cd483cc8085d9cea00281a6 100644 (file)
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -608,7 +608,7 @@ sub excludefile {
 
 sub dpkg_architecture_value {
        my $var = shift;
-       my $value=`dpkg-architecture -q$var 2>/dev/null` || error("dpkg-architecture failed");
+       my $value=`dpkg-architecture -q$var` || error("dpkg-architecture failed");
        chomp $value;
        return $value;
 }

diff --git a/debian/changelog b/debian/changelog
index 02b0c5f96109716f84da6ba993d6ffeb26269784..314561067d9c86fe51a9539e65fd2c69b27e4d29 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,11 +3,14 @@ debhelper (7.4.3) UNRELEASED; urgency=low
   [ Valery Perrin ]
   * update french translation. Closes: #494300, #477703
   * add --previous at po4a command into Makefile
-  * add dh, dh_auto_install, dh_auto_clean, dh_auto_configure, dh_auto_install, dh_auto_test, dh_bugfiles, dh_icons, dh_installifupdown, dh_installudev, dh_lintian, dh_prep into po4a.cfg manpages list
+  * add dh, dh_auto_install, dh_auto_clean, dh_auto_configure,
+    dh_auto_install, dh_auto_test, dh_bugfiles, dh_icons, dh_installifupdown,
+    dh_installudev, dh_lintian, dh_prep into po4a.cfg manpages list
   
   [ Joey Hess ]
   * dh_perl: Do not look at perl scripts under /usr/share/doc.
     Closes: #546683
+  * Allow dpkg-architecture to print errors to stderr. Closes: #548636
 
  -- Joey Hess <joeyh@debian.org>  Tue, 15 Sep 2009 13:18:35 -0400