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

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Mon Sep  8 18:18:05 2008
New Revision: 24917

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=24917
Log:
Complete creation of debian/copyright skeletion even if no license is
found.

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=24917&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Mon Sep  8 18:18:05 2008
@@ -11,6 +11,8 @@
   * "--refresh" also re-creates debian/copyright and makes backups of both
     debian/rules and debian/copyright.
   * Look for 'example' as well as for 'examples'.
+  * Complete creation of debian/copyright skeletion even if no license is
+    found.
 
  -- Gunnar Wolf <gwolf at debian.org>  Thu, 07 Aug 2008 15:49:12 -0500
 

Modified: trunk/dh-make-perl/dh-make-perl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/dh-make-perl?rev=24917&op=diff
==============================================================================
--- trunk/dh-make-perl/dh-make-perl (original)
+++ trunk/dh-make-perl/dh-make-perl Mon Sep  8 18:18:05 2008
@@ -1082,9 +1082,9 @@
     # boilerplate-generated modules.
     #
     # We go over the most common combinations only
-    if ($meta->{license} or $copyright) {
-	my (%texts, %licenses, $mangle_cprt);
-	%texts = ('Artistic' => 
+
+    my (%texts, %licenses);
+        %texts = ('Artistic' => 
 "    This program is free software; you can redistribute it and/or modify\n".
 "    it under the terms of the Artistic License, which comes with Perl.\n".
 "    On Debian GNU/Linux systems, the complete text of the Artistic License\n".
@@ -1127,8 +1127,10 @@
 "    If this module conforms to a commonly used license, please report this\n".
 "    as a bug in dh-make-perl. In any case, please find the proper license\n".
 "    and fix this file!"
-	    );
-
+	);
+
+    if ($meta->{license} or $copyright) {
+	my $mangle_cprt;
 	# Pre-mangle the copyright information for the common similar cases
 	$mangle_cprt = $copyright || ''; # avoid warning
 	$mangle_cprt =~ s/GENERAL PUBLIC LICENSE/GPL/g;
@@ -1183,6 +1185,16 @@
 	map {$texts{$_} && push(@res, '', "License: $_", $texts{$_})} 
 	keys %licenses;
     } else {
+	push @res, "License: ";
+
+	# debian/* again
+	$licenses{'Artistic'} = $licenses{'GPL-1+'} = 1;
+	$year = (localtime)[5]+1900;
+	push(@res, "", "Files: debian/*", "Copyright: $year, $maintainer");
+	push @res, "License: ". join(' | ', keys %licenses);
+	map {$texts{$_} && push(@res, '', "License: $_", $texts{$_})} 
+	keys %licenses;
+
 	push @incomplete, 'No licensing information found'; 
     }