Merge branch 'sid'

Conflicts:
	debian/changelog

debian/changelog

@@ -7,6 +7,10 @@ dpkg (1.16.6) UNRELEASED; urgency=low
     Thanks to Russell Coker <russell@coker.com.au>.
   * Add --control-list and --control-show to dpkg-query --help output.
 
+  [ Raphaël Hertzog ]
+  * Fix import of error functions in dpkg-buildflags. Regression introduced
+    in 1.16.5.
+
   [ Updated scripts translations ]
   * German (Helge Kreutzmann).
 

scripts/dpkg-buildflags.pl

@@ -22,7 +22,7 @@ use warnings;
 
 use Dpkg;
 use Dpkg::Gettext;
-use Dpkg::ErrorHandling qw(report);
+use Dpkg::ErrorHandling qw(:DEFAULT report);
 use Dpkg::BuildFlags;
 use Dpkg::Vendor qw(get_current_vendor);