r45030 - in /trunk/dh-make-perl: debian/changelog lib/DhMakePerl.pm

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Tue Sep 29 20:09:29 2009
New Revision: 45030

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=45030
Log:
Check if the possible examples directory is actually a directory before
adding "$directory/*" to <pkg>.examples; thanks to Slaven Rezic for the
bug report (closes: #548950).

Modified:
    trunk/dh-make-perl/debian/changelog
    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=45030&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Tue Sep 29 20:09:29 2009
@@ -17,6 +17,9 @@
     one in oldstable.
   * Documentation fix for Debian::Version::deb_ver_cmp.
   * Add perl-modules (>= 5.10) to libmodule-build-perl.
+  * Check if the possible examples directory is actually a directory before
+    adding "$directory/*" to <pkg>.examples; thanks to Slaven Rezic for the
+    bug report (closes: #548950).
 
   [ Damyan Ivanov ]
   * Drop support for debhelper compatibility levels other than 7

Modified: trunk/dh-make-perl/lib/DhMakePerl.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl.pm?rev=45030&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl.pm Tue Sep 29 20:09:29 2009
@@ -989,8 +989,9 @@
     $dir .= '/' unless $dir =~ m{/$};
     find(
         sub {
+            my $exampleguess = substr( $File::Find::name, length($dir) );
             push( @examples,
-                substr( $File::Find::name, length($dir) ) . '/*' )
+                ( -d $exampleguess ? $exampleguess . '/*' : $exampleguess ) )
                 if ( /^(examples?|eg|samples?)$/i
                 and ( !$self->cfg->exclude or $File::Find::name !~ $self->cfg->exclude )
                 );