r55731 - in /trunk/dh-make-perl: debian/changelog lib/Debian/AptContents.pm t/contents/test_debian_dists_sid_Contents

[dmn at users.alioth.debian.org]

Author: dmn
Date: Thu Apr  8 14:03:38 2010
New Revision: 55731

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=55731
Log:
AptContents/find_file_packages: strip the full section off the package name

non-free/$section/$package or universe/perl/libconfig-any-perl didn't
work before. Thanks to Nicolas Mendoza for reporting
Closes RT#56100

Modified:
    trunk/dh-make-perl/debian/changelog
    trunk/dh-make-perl/lib/Debian/AptContents.pm
    trunk/dh-make-perl/t/contents/test_debian_dists_sid_Contents

Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=55731&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Thu Apr  8 14:03:38 2010
@@ -2,6 +2,8 @@
 
   * when detecting dependencies, use Module::Depends::Intrusive only if
     --intrusive is given
+  * AptContents/find_file_packages: strip the full section off the package name
+    Closes RT#56100. Thanks to Nicolas Mendoza
 
  -- Damyan Ivanov <dmn at debian.org>  Tue, 09 Mar 2010 08:46:09 +0200
 

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=55731&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/Debian/AptContents.pm (original)
+++ trunk/dh-make-perl/lib/Debian/AptContents.pm Thu Apr  8 14:03:38 2010
@@ -384,7 +384,9 @@
                                                # comma-delimitted list
                                                # of packages
 
-    s{[^/]+/}{} for @packages;                 # remove section
+    s{.+/}{} for @packages;                    # remove section. Greedy on purpose
+                                               # otherwise it won't strip enough off Ubuntu's
+                                               # usr/share/perl5/Config/Any.pm  universe/perl/libconfig-any-perl
 
     return @packages;
 }

Modified: trunk/dh-make-perl/t/contents/test_debian_dists_sid_Contents
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/contents/test_debian_dists_sid_Contents?rev=55731&op=diff
==============================================================================
--- trunk/dh-make-perl/t/contents/test_debian_dists_sid_Contents (original)
+++ trunk/dh-make-perl/t/contents/test_debian_dists_sid_Contents Thu Apr  8 14:03:38 2010
@@ -193,7 +193,8 @@
 usr/share/man/man3/MooseX::StrictConstructor::Role::Meta::Method::Constructor.3pm.gz perl/libmoosex-strictconstructor-perl
 usr/share/man/man3/MooseX::StrictConstructor::Role::Object.3pm.gz perl/libmoosex-strictconstructor-perl
 usr/share/man/man3/Test::Moose.3pm.gz			    perl/libmoose-perl
-usr/share/perl5/Moose.pm				    perl/libmoose-perl
+# the following line is mangled on purpose in order to test stripping
+usr/share/perl5/Moose.pm				    moose/perl/libmoose-perl
 usr/share/perl5/Moose/Cookbook.pod			    perl/libmoose-perl
 usr/share/perl5/Moose/Cookbook/Basics/Recipe1.pod	    perl/libmoose-perl
 usr/share/perl5/Moose/Cookbook/Basics/Recipe10.pod	    perl/libmoose-perl