r57431 - in /trunk/dh-make-perl: Changes debian/changelog t/DpkgLists.t

[dmn at users.alioth.debian.org]

Author: dmn
Date: Tue May  4 05:49:25 2010
New Revision: 57431

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=57431
Log:
DpkgLists.t: fix with perl-debug installed

do not insist that '/bin/perl' (or the corresponding regex) is only in
perl-base. Instead, ensure that 'perl-base' is present in the returned list.
Closes: #580025 -- FTBFS with perl-debug installed

Modified:
    trunk/dh-make-perl/Changes
    trunk/dh-make-perl/debian/changelog
    trunk/dh-make-perl/t/DpkgLists.t

Modified: trunk/dh-make-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/Changes?rev=57431&op=diff
==============================================================================
--- trunk/dh-make-perl/Changes (original)
+++ trunk/dh-make-perl/Changes Tue May  4 05:49:25 2010
@@ -15,6 +15,10 @@
     modules_already_packaged: fix ModuleInfo instantiation
 
     Config: honour values given to the constructor
+
+    DpkgLists.t: do not insist that '/bin/perl' (or the corresponding regex) is
+        only in perl-base. Instead, ensure that 'perl-base' is present in the
+        returned list. Debian bug #580025
 
 0.67
     POD: drop "--" in front of the commands.

Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=57431&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Tue May  4 05:49:25 2010
@@ -3,6 +3,9 @@
   * make: fix a typo (DpkgList -> DpkgLists). Thanks to Dominic Hargreaves
     Closes: #580101
   * make: fix problems with --refresh
+  * DpkgLists.t: do not insist that '/bin/perl' (or the corresponding regex) is
+    only in perl-base. Instead, ensure that 'perl-base' is present in the
+    returned list. Closes: #580025 -- FTBFS with perl-debug installed
 
  -- Damyan Ivanov <dmn at debian.org>  Mon, 03 May 2010 23:43:15 +0300
 

Modified: trunk/dh-make-perl/t/DpkgLists.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/DpkgLists.t?rev=57431&op=diff
==============================================================================
--- trunk/dh-make-perl/t/DpkgLists.t (original)
+++ trunk/dh-make-perl/t/DpkgLists.t Tue May  4 05:49:25 2010
@@ -14,11 +14,11 @@
 is_deeply( [ $m->scan_full_path('/usr/bin/perl') ],
     ['perl-base'], '/usr/bin/perl is in perl-base' );
 
-is_deeply( [ $m->scan_partial_path('/bin/perl') ],
-    ['perl-base'], 'partial /bin/perl is in perl-base' );
+my @found = $m->scan_partial_path('/bin/perl');
+ok( grep( 'perl-base', @found ), 'partial /bin/perl is in perl-base' );
 
-is_deeply( [ $m->scan_pattern(qr{/bin/perl$}) ],
-    ['perl-base'], 'qr{/bin/perl$} is in perl-base' );
+ at found = $m->scan_pattern(qr{/bin/perl$});
+ok( grep( 'perl-base', @found ), 'qr{/bin/perl$} is in perl-base' );
 
 is_deeply( [ $m->scan_perl_mod('Errno') ],
     ['perl-base'], 'Errno is in perl-base' );