Merge branch 'master' into dpkg-shlibdeps-buxy

Conflicts:

	scripts/dpkg-shlibdeps.pl

diff --cc configure.ac
Simple merge

diff --cc man/Makefile.am
Simple merge

diff --cc scripts/Makefile.am
Simple merge

diff --cc scripts/dpkg-shlibdeps.pl
index a31bdc57bec4d34da518273af161e8dc74fa71fc,95795fd2c935aacbacd330299ec31c0593d46d9c..7fa7e99009bccbba283ff29969e1f73c5b6446f5
--- 1/scripts/dpkg-shlibdeps.pl
--- 2/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@@ -3,32 -6,10 +3,25 @@@
  use strict;
  use warnings;
  
- our $progname;
- our $version;
- our $dpkglibdir;
- my $admindir = "/var/lib/dpkg";
- 
- BEGIN {
-     $version="1.14.4"; # This line modified by Makefile
-     $dpkglibdir="."; # This line modified by Makefile
-     push(@INC,$dpkglibdir);
- }
- 
+ use English;
+ use POSIX qw(:errno_h :signal_h);
+ use Dpkg;
+ use Dpkg::Gettext;
 +use Dpkg::Version qw(vercmp);
 +use Dpkg::Shlibs qw(find_library);
 +use Dpkg::Shlibs::Objdump;
 +use Dpkg::Shlibs::SymbolFile;
 +
 +our $host_arch= `dpkg-architecture -qDEB_HOST_ARCH`;
 +chomp $host_arch;
 +
 +# By increasing importance
 +my @depfields= qw(Suggests Recommends Depends Pre-Depends);
 +my $i=0; my %depstrength = map { $_ => $i++ } @depfields;
 +
++push(@INC, $dpkglibdir);
 +require 'controllib.pl';
- require 'dpkg-gettext.pl';
 +textdomain("dpkg-dev");
  
  my $shlibsoverride= '/etc/dpkg/shlibs.override';
  my $shlibsdefault= '/etc/dpkg/shlibs.default';