[SCM] Debian package checker branch, master, updated. 2.5.0-rc2-122-g12888e8

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit ba482ed0d38ffa92a2e8f83d26ebab0e43ef45f9
Author: Niels Thykier <niels@thykier.net>
Date:   Tue Feb 22 21:06:14 2011 +0100

    Made the prototype support binaries from multiple architectures

diff --git a/private/processable-prototype.pl b/private/processable-prototype.pl
index 2ebdfc0..dc2a029 100755
--- a/private/processable-prototype.pl
+++ b/private/processable-prototype.pl
@@ -43,8 +43,13 @@ foreach my $file (@ARGV) {
         # get_processables
         foreach my $gmember (@{$group->get_processables()}){
             my $mtype = $gmember->pkg_type();
-            my $mname = gen_proc_key($gmember);
+            my $mname;
             my $tmap = $type_map{$mtype};
+            if ($mtype eq 'binary' or $mtype eq 'udeb'){
+                $mname = gen_proc_key($gmember);
+            } else {
+                $mname = gen_src_proc_key($gmember);
+            }
             if (exists $tmap->{$mname}){
                 if ($mtype eq 'changes'){
                     # Skip this changes file - we have seen it before
@@ -146,6 +151,10 @@ sub stringify_proc {
     my $pkg_name = $proc->pkg_name();
     my $pkg_type = $proc->pkg_type();
     my $pkg_version = $proc->pkg_version();
+    if ($pkg_type eq 'binary' or $pkg_type eq 'udeb'){
+        my $pkg_arch = $proc->pkg_arch();
+        return "${pkg_name} $pkg_version ($pkg_type:$pkg_arch)";
+    }
     return "${pkg_name} $pkg_version ($pkg_type)";
 }
 
@@ -162,7 +171,8 @@ sub warning {
 
 sub gen_proc_key{
     my ($proc) = @_;
-    return $proc->pkg_name() . '_' . $proc->pkg_version();
+    return $proc->pkg_name() . '_' . $proc->pkg_version() .
+        '_' . $proc->pkg_arch();
 }
 
 sub gen_src_proc_key{

-- 
Debian package checker