[SCM] Debian native package for Config::Model::Dpkg branch, master, updated. debian/2.036-17-gdc3acc3

[Dominique Dumont]

The following commit has been merged in the master branch:
commit c31b291f32b70a3a909dbf1c7240a330162fbfe5
Author: Dominique Dumont <dod at debian.org>
Date:   Mon May 20 16:11:09 2013 +0200

    added test for dep with arch (for #707565)

diff --git a/t/debian-dependency-check.t b/t/debian-dependency-check.t
index c300c39..ceb4740 100644
--- a/t/debian-dependency-check.t
+++ b/t/debian-dependency-check.t
@@ -15,6 +15,8 @@ BEGIN {
         'lcdproc' => 'etch 0.4.5-1.1 lenny 0.4.5-1.1 squeeze 0.5.2-3 wheezy 0.5.2-3.1 sid 0.5.2-3.1',
         'libsdl1.2' => '', # only source
         'dpkg' => 'squeeze 1.15 wheezy 1.16 sid 1.16',
+        makedev => 'squeeze 2.3.1-89 wheezy 2.3.1-92 jessie 2.3.1-92 sid 2.3.1-93',
+        udev => 'squeeze 164-3 wheezy 175-7.2 jessie 175-7.2 sid 175-7.2',
     );
     my $t = time ;
     map { $_ = "$t $_"} values %Config::Model::Dpkg::Dependency::cache ;
@@ -23,9 +25,9 @@ BEGIN {
 use ExtUtils::testlib;
 use Test::More ;
 use Test::Memory::Cycle;
+use Test::Differences;
 use Config::Model ;
 use Config::Model::Value ;
-#use Config::Model::Dpkg::Dependency ;
 use Log::Log4perl qw(:easy) ;
 use File::Path ;
 use File::Copy ;
@@ -37,7 +39,7 @@ if ( $@ ) {
     plan skip_all => "AptPkg::Config is not installed";
 }
 elsif ( -r '/etc/debian_version' ) {
-    plan tests => 47;
+    plan tests => 53;
 }
 else {
     plan skip_all => "Not a Debian system";
@@ -265,6 +267,9 @@ ok( 1, "check_depend on xorg arch stuff rule");
 $control->load(q{binary:libdist-zilla-plugins-cjm-perl Depends:6="lcdproc (= ${binary:Version})"});
 ok( 1, "check_depend on lcdproc where version is a variable");
 
+$control->load(q{binary:libdist-zilla-plugins-cjm-perl Depends:7="udev [linux-any] | makedev [linux-any]"});
+ok( 1, "check_depend on lcdproc with 2 alternate deps with arch restriction");
+
 # reset change tracker
 $inst-> clear_changes ;
 
@@ -272,12 +277,16 @@ $inst-> clear_changes ;
 is($perl_dep->has_fixes,1, "test presence of fixes");
 $perl_dep->apply_fixes;
 is($perl_dep->fetch,'${perl:Depends}',"check fixed dependency value");
+is(
+    $control->grab_value("binary:libdist-zilla-plugins-cjm-perl Depends:7"),
+    'udev [linux-any] | makedev [linux-any]',
+    "test fixed alternate deps with arch restriction"
+);
 is($perl_dep->has_fixes,0, "test that fixes are gone");
 is($perl_dep->has_warning,0,"check that warnings are gone");
 
 is($inst->c_count, 2,"check that fixes are tracked with notify changes") ;
 print scalar $inst->list_changes,"\n" if $trace ;
- 
 
 my $perl_bdi = $control->grab("source Build-Depends-Indep:1");
 

-- 
Debian native package for Config::Model::Dpkg