r6011 - in /tools/dh-make-perl/trunk: debian/changelog dh-make-perl

[gregoa-guest at users.alioth.debian.org]

Author: gregoa-guest
Date: Sat Jul 28 14:02:03 2007
New Revision: 6011

URL: http://svn.debian.org/wsvn/?sc=1&rev=6011
Log:
* Add "It was downloaded from ..." to debian/copyright if called with
  "--cpan $modulename".

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

Modified: tools/dh-make-perl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/tools/dh-make-perl/trunk/debian/changelog?rev=6011&op=diff
==============================================================================
--- tools/dh-make-perl/trunk/debian/changelog (original)
+++ tools/dh-make-perl/trunk/debian/changelog Sat Jul 28 14:02:03 2007
@@ -1,12 +1,17 @@
 dh-make-perl (0.27) unstable; urgency=low
 
+  [ Gunnar Wolf ]
   * Moved all the options received from the user to %opts, for better
     code readability
   * When the module to be packaged declares a dependency on a specific
     Perl version, reflect it in the output dependency/build dependency
     information, rather than complaining that no such module exists
 
- -- Gunnar Wolf <gwolf at debian.org>  Tue, 03 Jul 2007 20:38:45 -0500
+  [ gregor herrmann ]
+  * Add "It was downloaded from ..." to debian/copyright if called with
+    "--cpan $modulename".
+
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Sat, 28 Jul 2007 15:59:01 +0200
 
 dh-make-perl (0.26) unstable; urgency=low
 

Modified: tools/dh-make-perl/trunk/dh-make-perl
URL: http://svn.debian.org/wsvn/tools/dh-make-perl/trunk/dh-make-perl?rev=6011&op=diff
==============================================================================
--- tools/dh-make-perl/trunk/dh-make-perl (original)
+++ tools/dh-make-perl/trunk/dh-make-perl Sat Jul 28 14:02:03 2007
@@ -171,7 +171,7 @@
     # $pkgversion is the resulting version of the package: User's
     # --version=s or "$version-1"
     $pkgversion, 
-    $desc, $longdesc, $copyright, $author);
+    $desc, $longdesc, $copyright, $author, $upsurl);
 my ($extrasfields, $extrapfields);
 my (@docs, $changelog, @args);
 
@@ -306,14 +306,16 @@
 		if ($cpanversion < 1.59) { # wild guess on the version number
 			$dist = $CPAN::META->instance('CPAN::Distribution', $mod->{CPAN_FILE});
 			$dist->get || die "Cannot get $mod->{CPAN_FILE}\n";
-                        $tarball .= $mod->{CPAN_FILE};
+			$tarball .= $mod->{CPAN_FILE};
 			$maindir = $dist->{'build_dir'};
+			$upsurl = "http://www.cpan.org/authors/id/" . $mod->{CPAN_FILE};
 		} else {
 			# CPAN internals changed
 			$dist = $CPAN::META->instance('CPAN::Distribution', $mod->cpan_file);
 			$dist->get || die "Cannot get ", $mod->cpan_file, "\n";
-                        $tarball .= $mod->cpan_file;
-                        $maindir = $dist->dir;
+			$tarball .= $mod->cpan_file;
+			$maindir = $dist->dir;
+			$upsurl = "http://www.cpan.org/authors/id/" . $mod->cpan_file;
 		}
 
 		copy ($tarball, $ENV{'PWD'});
@@ -864,7 +866,12 @@
 "This is the debian package for the $perlname module.
 It was created by $maintainer using dh-make-perl.
 
-This copyright info was automatically extracted from the perl module.
+");
+        if (defined $upsurl) {
+                $fh->print("It was downloaded from $upsurl\n\n");
+        }
+	$fh->print(
+"This copyright info was automatically extracted from the perl module.
 It may not be accurate, so you better check the module sources
 if don\'t want to get into legal troubles.
 
@@ -1226,6 +1233,7 @@
   Fermin Galan E<lt>galan at dit.upm.esE<gt>
   Geoff Richards E<lt>qef at ungwe.orgE<gt>
   Gergely Nagy E<lt>algernon at bonehunter.rulez.orgE<gt>
+  gregor herrmann E<lt>gregor+debian at comodo.priv.atE<gt>
   Hilko Bengen E<lt>bengen at debian.orgE<gt>
   Kees Cook E<lt>keex at outflux.netE<gt>
   Jesper Krogh E<lt>jesper at krogh.ccE<gt>