r23700 - in /trunk/dh-make-perl: debian/changelog dh-make-perl

[dmn at users.alioth.debian.org]

Author: dmn
Date: Thu Jul 31 06:02:44 2008
New Revision: 23700

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=23700
Log:
extract_base_copyright: look for files relative to $maindir, not the
current directory. Thanks to Matt Kraai for the patch. Closes:# 493058

Modified:
    trunk/dh-make-perl/debian/changelog
    trunk/dh-make-perl/dh-make-perl

Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=23700&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Thu Jul 31 06:02:44 2008
@@ -1,7 +1,12 @@
 dh-make-perl (0.48) UNRELEASED; urgency=low
 
+  [ gregor herrmann ]
   * Fix POD error, thanks to Fabian Pietsch for the bug report and the patch
     (closes: #489916).
+
+  [ Damyan Ivanov ]
+  * extract_base_copyright: look for files relative to $maindir, not the
+    current directory. Thanks to Matt Kraai for the patch. Closes:# 493058
 
  -- gregor herrmann <gregoa at debian.org>  Tue, 08 Jul 2008 19:53:23 +0200
 

Modified: trunk/dh-make-perl/dh-make-perl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/dh-make-perl?rev=23700&op=diff
==============================================================================
--- trunk/dh-make-perl/dh-make-perl (original)
+++ trunk/dh-make-perl/dh-make-perl Thu Jul 31 06:02:44 2008
@@ -445,7 +445,7 @@
 }
 
 sub extract_basic_copyright {
-	for my $f (qw(LICENSE LICENCE COPYING)) {
+	for my $f (map("$maindir/$_", qw(LICENSE LICENCE COPYING))) {
 		if (-f $f) {
 			return `cat $f`;
 		}