r51672 - in /trunk/dh-make-perl: TODO debian/changelog lib/DhMakePerl.pm t/dists/Strange-0.1/eg/ t/dists/Strange-0.1/eg/decoy.xs

[dmn at users.alioth.debian.org]

Author: dmn
Date: Wed Jan 27 22:20:58 2010
New Revision: 51672

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=51672
Log:
ignore examples&co when checking for XS

Added:
    trunk/dh-make-perl/t/dists/Strange-0.1/eg/
    trunk/dh-make-perl/t/dists/Strange-0.1/eg/decoy.xs
Modified:
    trunk/dh-make-perl/TODO
    trunk/dh-make-perl/debian/changelog
    trunk/dh-make-perl/lib/DhMakePerl.pm

Modified: trunk/dh-make-perl/TODO
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/TODO?rev=51672&op=diff
==============================================================================
--- trunk/dh-make-perl/TODO (original)
+++ trunk/dh-make-perl/TODO Wed Jan 27 22:20:58 2010
@@ -37,4 +37,3 @@
   Foo-Bar-v1.2.0.
 * cleanup lib/DhMakePerl.pm: Changes is extracted and never used, fix_rules
   doesn't fix rules anymore but only writes examples and docs, ...
-* check_for_xs() also triggers on a .xs file in examples (Module-Install-XSUtil)

Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=51672&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Wed Jan 27 22:20:58 2010
@@ -6,6 +6,8 @@
   [ Damyan Ivanov ]
   * Create packages with Standards-Version: 3.8.4
   * control: Standards-Version: 3.8.4 (no changes needed)
+  * when checking for XS presence, ignore example/test/documentation
+    directories
 
  -- Brian Cassidy <brian.cassidy at gmail.com>  Fri, 22 Jan 2010 08:24:47 -0400
 

Modified: trunk/dh-make-perl/lib/DhMakePerl.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl.pm?rev=51672&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl.pm Wed Jan 27 22:20:58 2010
@@ -1276,6 +1276,11 @@
 sub check_for_xs {
     my ($self) = @_;
 
+    # we need the relative path here. Otherwise the check will give bogus
+    # results if the working dir matches the pattern
+    my $rel_path = substr( $File::Find::name, length( $self->main_dir ) );
+    ( $rel_path !~ m{/(?:examples?|samples|eg|t|docs?)/} )
+            and
     ( !$self->cfg->exclude or $File::Find::name !~ $self->cfg->exclude )
         && /\.(xs|c|cpp|cxx)$/i
         && do {

Added: trunk/dh-make-perl/t/dists/Strange-0.1/eg/decoy.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists/Strange-0.1/eg/decoy.xs?rev=51672&op=file
==============================================================================
--- trunk/dh-make-perl/t/dists/Strange-0.1/eg/decoy.xs (added)
+++ trunk/dh-make-perl/t/dists/Strange-0.1/eg/decoy.xs Wed Jan 27 22:20:58 2010
@@ -1,0 +1,1 @@
+a dummy