[SCM] Debian packaging of dh-make-perl branch, master, updated. debian/0.74-1-31-ge6011d5

gregor herrmann gregoa at debian.org
Thu Dec 8 00:12:56 UTC 2011


The following commit has been merged in the master branch:
commit 6216859e8b7c67296fd30c1e746256b7e9cd1bbd
Author: Dima Kogan <dima at secretsauce.net>
Date:   Sat Oct 15 14:00:14 2011 -0700

    when installing a package, $arch now comes from the control file

diff --git a/lib/DhMakePerl/Command/make.pm b/lib/DhMakePerl/Command/make.pm
index 258d5ec..622305a 100644
--- a/lib/DhMakePerl/Command/make.pm
+++ b/lib/DhMakePerl/Command/make.pm
@@ -348,12 +348,14 @@ sub install_package {
 
     my ( $archspec, $debname );
 
-    if ( $self->arch eq 'any' ) {
+    my $arch = $self->control->binary->Values(0)->Architecture;
+
+    if ( !defined $arch || $arch eq 'any' ) {
         $archspec = `dpkg --print-architecture`;
         chomp($archspec);
     }
     else {
-        $archspec = $self->arch;
+        $archspec = $arch;
     }
 
     $debname = sprintf( "%s_%s-1_%s.deb", $self->pkgname, $self->version,

-- 
Debian packaging of dh-make-perl



More information about the Pkg-perl-cvs-commits mailing list