*** popularity-contest.orig	2011-05-17 13:27:25.439953116 +0200
--- popularity-contest	2011-05-23 18:39:20.305189918 +0200
***************
*** 93,105 ****
  }
  
  # Read dpkg database of installed packages
! open PACKAGES, "dpkg-query --show --showformat='\${status} \${package}\\n'|";
  while (<PACKAGES>)
  {
!   /^.*installed *(.+)$/ or next;
    my $pkg=$1;
    $popcon{$pkg}=[0,0,$pkg,"<NOFILES>"];
!   open FILES, "$dpkg_db/$pkg.list";
    my $bestatime = undef;
    while (<FILES>)
    {
--- 93,116 ----
  }
  
  # Read dpkg database of installed packages
! open PACKAGES, "dpkg-query --show --showformat='\${status} \${package} \${package}:\${architecture}\\n'|";
  while (<PACKAGES>)
  {
!   /^.*installed *(\S+) (\S+)$/ or next;
    my $pkg=$1;
+   my $arch_pkg=$2;
    $popcon{$pkg}=[0,0,$pkg,"<NOFILES>"];
!   if (!open FILES, "<", $dpkg_db."/".$pkg.".list") {
!       if (open FILES, "<", $dpkg_db."/".$arch_pkg.".list") {
!           $pkg = $arch_pkg;
!       } else {
!           printf STDERR "WARN: unable to open file list for package: '%s', tried filenames: '%s' and '%s'\n",
!                  $pkg,
!                  $dpkg_db."/".$pkg.".list",
!                  $dpkg_db."/".$arch_pkg.".list";
!           next;
!       }
!   };
    my $bestatime = undef;
    while (<FILES>)
    {