Merge remote branch 'alioth/master' into debian-master

diff --combined bin/extract_files
index 79b99467ac39f6dc659521fd7f8e131474f72c2d,5c57bab417108d227d82aefd7c10de83572e6d0e..a94fba06bd87d5a3161fdde213935392cb6d086f
--- 1/bin/extract_files
--- 2/bin/extract_files
+++ b/bin/extract_files
@@@ -564,10 -564,6 +564,10 @@@ sub read_deb 
        }
      }
      $cache{$debname} ||= qx/dpkg-deb --info "$debname" control/;
 +    unless ( $cache{$debname} ) {
 +      do_warning( "extracting control information of file $debname failed" );
 +      return;
 +    }
      my $control = $cache{$debname};
  
      unless ( $raw_data = $parser->parse_mem( $control,
@@@ -611,7 -607,7 +611,7 @@@ sub collect_deb 
      return unless $pkg_data;
  
      if (exists $bin_packages{$pkg_data->{bin_name}}{$pkg_data->{bin_version}}{$pkg_data->{bin_arch}}) {
-       do_warning( "duplicated package $pkg_data->{bin_name}, version {$pkg_data->{bin_version}{$pkg_data->{bin_arch}}" );
+       do_warning( "duplicated package $pkg_data->{bin_name}, version $pkg_data->{bin_version}, arch $pkg_data->{bin_arch}" );
        return;
      } else {
        $bin_packages{$pkg_data->{bin_name}}{$pkg_data->{bin_version}}{$pkg_data->{bin_arch}} = $pkg_data;