r36193 - in /trunk/dh-make-perl: TODO lib/Debian/Control/FromCPAN.pm

[dmn at users.alioth.debian.org]

Author: dmn
Date: Sat May 23 06:56:43 2009
New Revision: 36193

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=36193
Log:
FromCPAN: fix detection of arch-indep packages

fixes wrong population of B-D for arch-indep packages

Modified:
    trunk/dh-make-perl/TODO
    trunk/dh-make-perl/lib/Debian/Control/FromCPAN.pm

Modified: trunk/dh-make-perl/TODO
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/TODO?rev=36193&op=diff
==============================================================================
--- trunk/dh-make-perl/TODO (original)
+++ trunk/dh-make-perl/TODO Sat May 23 06:56:43 2009
@@ -1,9 +1,4 @@
-* --refresh failures:
-  02:12 gregoa dam: --refresh again: in libnet-imap-client-perl suddenly some 
-               build dependencies, which were already in B-D-I, were added to
-               B-D
-  02:17 gregoa dam: and "perl" is missing from B-D-I
-
+* --refresh on libnet-imap-client-perl drops "perl" from B-D-I
 
 * --refresh: add --[no-]backups option (on by default)
   used for controlling creation of backup files of things that are rewritten

Modified: trunk/dh-make-perl/lib/Debian/Control/FromCPAN.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/Debian/Control/FromCPAN.pm?rev=36193&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/Debian/Control/FromCPAN.pm (original)
+++ trunk/dh-make-perl/lib/Debian/Control/FromCPAN.pm Sat May 23 06:56:43 2009
@@ -152,11 +152,19 @@
     $bin->Recommends->add($recommends);
     $bin->Conflicts->add($conflicts);
 
-    if( $self->source->Architecture eq 'all' ) {
+    my $arch_dep = 0;
+    for( $self->binary->Values ) {
+        if( $_->Architecture ne 'all' ) {
+            $arch_dep = 1;
+            last;
+        }
+    }
+
+    if( $arch_dep ) {
+        $self->source->Build_Depends->add($build_depends);
+    }
+    else {
         $self->source->Build_Depends_Indep->add($build_depends);
-    }
-    else {
-        $self->source->Build_Depends->add($build_depends);
     }
 
     if ($opt_verbose) {