r31484 - in /trunk/dh-make-perl: debian/changelog lib/Debian/AptContents.pm lib/DhMakePerl.pm

npf-guest at users.alioth.debian.org npf-guest at users.alioth.debian.org
Thu Mar 5 23:35:18 UTC 2009


Author: npf-guest
Date: Thu Mar  5 23:35:12 2009
New Revision: 31484

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=31484
Log:
Fix apt-file dependency lookup if --dist is set to list of distribution,
e.g. "{stable,testing}", or if no --dist is given, hence defaulting to 
"{sid,unstable}".

Updating version to 0.53 .


Modified:
    trunk/dh-make-perl/debian/changelog
    trunk/dh-make-perl/lib/Debian/AptContents.pm
    trunk/dh-make-perl/lib/DhMakePerl.pm

Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=31484&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Thu Mar  5 23:35:12 2009
@@ -1,3 +1,12 @@
+dh-make-perl (0.53) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Fix apt-file dependency lookup if --dist is set to list of distribution,
+    e.g. "{stable,testing}", or if no --dist is given, hence defaulting to 
+    "{sid,unstable}". 
+
+ -- Pierre Neyron <pierre.neyron at free.fr>  Fri, 06 Mar 2009 00:29:48 +0100
+
 dh-make-perl (0.52) unstable; urgency=low
 
   [ Damyan Ivanov ]

Modified: trunk/dh-make-perl/lib/Debian/AptContents.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/Debian/AptContents.pm?rev=31484&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/Debian/AptContents.pm (original)
+++ trunk/dh-make-perl/lib/Debian/AptContents.pm Thu Mar  5 23:35:12 2009
@@ -175,7 +175,13 @@
 
     return undef unless $schema eq 'deb';
 
-    return undef if $self->dist and $dist ne $self->dist;
+    if ( $self->dist ) {
+        if ( $self->dist =~ /^\s*{\s*(.+)\s*}\s*$/ ) {
+            return undef unless grep { /^$dist$/ } split(/\s*,\s*/, $1);
+        } else {
+            return undef if $dist ne $self->dist;
+        }
+    }
 
     $dir ||= '';    # deb http://there sid main
 

Modified: trunk/dh-make-perl/lib/DhMakePerl.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl.pm?rev=31484&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl.pm Thu Mar  5 23:35:12 2009
@@ -18,7 +18,7 @@
 
 =cut
 
-our $VERSION = '0.52';
+our $VERSION = '0.53';
 
 =head1 SYNOPSIS
 




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