X-Git-Url: https://git.deb.at/w?a=blobdiff_plain;f=lib%2FPackages%2FPage.pm;h=d57126ea4825674aba5c432f667fa90a0773f9e0;hb=f46c14dbc13274569f533b19e27c61960ea9bacd;hp=bc7fdc03f4faf54d4815ae6755ed5201af91818c;hpb=87124f967c3da82618899b3d2c114981b12ffb7f;p=deb%2Fpackages.git

diff --git a/lib/Packages/Page.pm b/lib/Packages/Page.pm
index bc7fdc0..d57126e 100644
--- a/lib/Packages/Page.pm
+++ b/lib/Packages/Page.pm
@@ -4,9 +4,13 @@ use strict;
 use warnings;
 
 use Data::Dumper;
+use Exporter;
 use Deb::Versions;
 use Packages::CGI;
-use IO::String;
+
+our @ISA = qw( Exporter );
+our @EXPORT_OK = qw( split_name_mail parse_deps );
+our %EXPORT_TAGS = ( all => [ @EXPORT_OK ] );
 
 our $ARCHIVE_DEFAULT = '';
 our $SECTION_DEFAULT = 'main';
@@ -33,8 +37,8 @@ sub merge_data {
     my ($self, $pkg, $version, $architecture, $data) = @_;
 
     my %data = ( package => $pkg,
-		     version => $version,
-		     architecture => $architecture );
+		 version => $version,
+		 architecture => $architecture );
     chomp($data);
     while ($data =~ /^(\S+):\s*(.*)\s*$/mg) {
 	my ($key, $value) = ($1, $2);
@@ -68,18 +72,19 @@ sub add_src_data {
 
     chomp($data);
     my %data = ();
-    while ($data =~ /^(\S+):\s*(.*)\s*$/mg) {
+    $data =~ s/\n\s+/\377/g;
+    while ($data =~ /^(\S+):\s*(.*)\s*$/mog) {
 	my ($key, $value) = ($1, $2);
 	$key =~ tr [A-Z] [a-z];
 	$data{$key} = $value;
     }
 
-    $self->{src}{name} = $src;
+    $self->{src}{package} = $src;
     $self->{src}{version} = $version;
     if ($data{files}) {
-	$data{files} =~ s/\A\s*//o; # remove leading spaces
 	$self->{src}{files} = [];
-        foreach my $sf ( split( /\n\s*/, $data{files} ) ) {
+        foreach my $sf ( split( /\377/, $data{files} ) ) {
+	    next unless $sf;
             # md5, size, name
             push @{$self->{src}{files}}, [ split( /\s+/, $sf) ];
         }
@@ -148,7 +153,7 @@ sub merge_package {
     if (!$self->{versions}{$data->{architecture}}
 	|| $is_newest
 	|| (version_cmp( $data->{version},
-			 $self->{versions}{$data->{architecture}} ) > 0)) {
+			 $self->{versions}{$data->{architecture}}{version} ) > 0)) {
 	foreach my $key (@STORE_ALL) {
 	    $self->{versions}{$data->{architecture}}{$key}
 	    = $data->{$key};