r43295 - /trunk/libcatalyst-modules-perl/tarballs/check-upstream-versions

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

Author: jawnsy-guest
Date: Sun Aug 30 13:40:54 2009
New Revision: 43295

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=43295
Log:
Apply changes to check-upstream-versions script from libcatalyst-modules-extra-perl. This will break this bundle until I update the corresponding packages.cfg

Modified:
    trunk/libcatalyst-modules-perl/tarballs/check-upstream-versions

Modified: trunk/libcatalyst-modules-perl/tarballs/check-upstream-versions
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-modules-perl/tarballs/check-upstream-versions?rev=43295&op=diff
==============================================================================
--- trunk/libcatalyst-modules-perl/tarballs/check-upstream-versions (original)
+++ trunk/libcatalyst-modules-perl/tarballs/check-upstream-versions Sun Aug 30 13:40:54 2009
@@ -58,37 +58,53 @@
 					print "$key not exist in config file or has not defined 'description' section\n";					
 					exit(1);
 				}
-				if (defined $config->{$key}->{'author'})
-				{
-					$coutput .= qq{\n* $base\n};
-					if (ref($config->{$key}->{'author'}) eq 'ARRAY')
-					{
-						$coutput .= qq{\nAuthors:\n};
-						foreach  my $author (@{$config->{$key}->{'author'}})
+				if (defined $config->{$key}->{'copyright'})
+				{
+					$coutput .= qq{\nFiles: tarballs/$file\n};
+					$coutput .= qq{Copyright:};
+					if (ref $config->{$key}->{'copyright'} eq 'ARRAY')
+					{
+						foreach my $copyright (@{$config->{$key}->{'copyright'}})
 						{
-							$coutput .= qq{\t$author\n};
+							$coutput .= qq{ $copyright\n};
 						}
 					}
 					else
 					{
-						$coutput .= qq{\nAuthor:\n\t$config->{$key}->{'author'}\n};
-					}
-					$coutput .= "\n ".wrap("", "", $config->{'debcopyinfo'})."\n";
+						$coutput .= qq{ $config->{$key}->{'copyright'}\n};
+					}
 				}
 				else
 				{
-					print "$key not exist in config file or has not defined 'author' section\n";					
+					print "$key not exist in config file or has not defined 'copyright' section\n";					
 					exit(1);
 				}
-				if (defined $config->{$key}->{'copyright'})
-				{
-					$coutput .= "\n ".wrap("", "", $config->{$key}->{'copyright'})."\n";
-				}
+				if (defined $config->{$key}->{'maintainer'})
+				{
+					$coutput .= qq{X-Upstream-Maintainers:};
+					if (ref $config->{$key}->{'maintainer'} eq 'ARRAY')
+					{
+						foreach my $maintainer (@{$config->{$key}->{'maintainer'}})
+						{
+							$coutput .= qq{ $maintainer\n};
+						}
+					}
+					else
+					{
+						$coutput .= qq{ $config->{$key}->{'maintainer'}\n};
+					}
+				}
+				else
+				{
+					print "$key not exist in config file or has not defined 'maintainer' section\n";					
+					exit(1);
+				}
+				$coutput .= qq{License: Artistic | GPL-1+\n};
 			}
 			last;
 		}				
 	}
-	$coutput .= "\n".$config->{'debcopyright'};
+	$coutput .= "\n".$config->{'debcopyright'}."\n";
 	open( FD, '>', $control.".new" ) or die "Cannot open $control.new\n";
 	print FD $output;
 	close( FD );
@@ -108,7 +124,7 @@
 	my @urls = ();
 	my %seen;
 
-	my $table = Text::SimpleTable->new([3, 'Dir'], [50, 'Module'], [10, 'Debian'], [10, 'Upstream'], [20, 'Comment']);
+	my $table = Text::SimpleTable->new([3, 'Dir'], [50, 'Module'], [10, 'Debian'], [10, 'Upstream'], [30, 'Comment']);
 
 	for my $file (@$files)
 	{
@@ -132,9 +148,7 @@
 			unless (defined($indexes{$u_dir}))
 			{
 				#--- cache result
-				print "Getting $u_dir...";
 				$indexes{$u_dir} = get($u_dir);
-				print "Done\n";
 			}
 							
 			my @found = $indexes{$u_dir} =~ m!$u_file!g;
@@ -191,3 +205,4 @@
 	my @f = bsd_glob('??/*.tar.gz');
 	check( \@f, \%cfg );
 }
+