r46925 - /scripts/examples/gen-itp

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Sun Nov  8 17:14:37 2009
New Revision: 46925

URL: http://svn.debian.org/wsvn/?sc=1&rev=46925
Log:
improved handling of Upstream info from d/copyright, cater for various field names

Modified:
    scripts/examples/gen-itp

Modified: scripts/examples/gen-itp
URL: http://svn.debian.org/wsvn/scripts/examples/gen-itp?rev=46925&op=diff
==============================================================================
--- scripts/examples/gen-itp (original)
+++ scripts/examples/gen-itp Sun Nov  8 17:14:37 2009
@@ -85,6 +85,7 @@
 p "Package: wnpp";
 p "Owner: " . $owner;
 p "Severity: wishlist";
+
 if(!$ENV{SECRETLY_ITP}) {
 if($lang eq "Perl") {
     p "X-Debbugs-CC: debian-devel\@lists.debian.org,debian-perl\@lists.debian.org";
@@ -92,21 +93,40 @@
     p "X-Debbugs-CC: debian-devel\@lists.debian.org";
 }
 }
+
 p;
 p "* Package name    : " . $source->{Source};
+
 my $version = $changelog->{Version};
 $version =~ s/-1$//;
 p "  Version         : " . $version;
-p "  Upstream Author : " . $upstream->{'Upstream-Maintainer'};
+
+my $maintainer;
+if($upstream->{'Upstream-Maintainer'}) {
+    $maintainer = $upstream->{'Upstream-Maintainer'};
+} elsif($upstream->{'Maintainer'}) {
+    $maintainer = $upstream->{'Maintainer'};
+} else {
+    $maintainer = 'FIXME';
+}
+p "  Upstream Author : " . $maintainer;
+
 my $homepage;
 if($source->{Homepage}) {
     $homepage = $source->{Homepage};
+} elsif($upstream->{'Upstream-Source'}) {
+    $homepage = $upstream->{'Upstream-Source'};
+} elsif($upstream->{'Source'}) {
+    $homepage = $upstream->{'Source'};
 } else {
-    $homepage = $upstream->{'Upstream-Source'};
+    $homepage= 'FIXME';
 }
+
 p "* URL             : " . $homepage;
 p "* License         : " . $main_files->{'License'};
 p "  Programming Lang: " . $lang;
+
 my ($short, $long) = split(/\n/, $pkg->{Description}, 2);
 p "  Description     : " . $short;
-p "\n" . $long;
+p;
+p $long;