Merge branch 'master' into ubuntu-master

[deb/packages.git] / lib / Packages / SrcPage.pm

diff --git a/lib/Packages/SrcPage.pm b/lib/Packages/SrcPage.pm
index e3e6f575c7820ec1e5d4dccc252359322f9dbef1..101d6f2635523e8bb85f29a486c6b4d2b80273d7 100644 (file)
--- a/lib/Packages/SrcPage.pm
+++ b/lib/Packages/SrcPage.pm
@@ -22,8 +22,6 @@ sub merge_data {
     return $self->merge_package( \%data );
 }
 
-sub gettext { return $_[0]; }
-
 our @DEP_FIELDS = qw( build-depends build-depends-indep
                      build-conflicts build-conflicts-indep);
 sub merge_package {
@@ -32,28 +30,17 @@ sub merge_package {
     ($data->{package} && $data->{suite} && $data->{archive}) || return;
     $self->{package} ||= $data->{package};
     ($self->{package} eq $data->{package}) || return;
-    debug( "merge package $data->{package}/$data->{version} into $self (".($self->{version}||'').")", 2 );
+    debug( "merge package $data->{package}/$data->{version} into $self (".($self->{version}||'').")", 2 ) if DEBUG;
 
     if (!$self->{version}
        || (version_cmp( $data->{version}, $self->{version} ) > 0)) {
-       debug( "added package is newer, replacing old information" );
+       debug( "added package is newer, replacing old information" ) if DEBUG;
 
        $self->{data} = $data;
 
-       my @uploaders;
-       if ($data->{maintainer} ||= '') {
-           push @uploaders, [ split_name_mail( $data->{maintainer} ) ];
-       }
-       if ($data->{uploaders}) {
-           my @up_tmp = split( /\s*,\s*/,
-                               $data->{uploaders} );
-           foreach my $up (@up_tmp) {
-               if ($up ne $data->{maintainer}) { # weed out duplicates
-                   push @uploaders, [ split_name_mail( $up ) ];
-               }
-           }
-       }
-       $self->{uploaders} = \@uploaders;
+       my ($uploaders, $orig_uploaders) = $self->handle_maintainer_fields($data);
+       $self->{uploaders} = $uploaders;
+       $self->{orig_uploaders} = $orig_uploaders if @$orig_uploaders;
 
        if ($data->{files}) {
            my @files = split /\01/so, $data->{files};
@@ -66,6 +53,8 @@ sub merge_package {
 
        $self->{version} = $data->{version};
     }
+
+    return 1;
 }
 
 #FIXME: should be mergable with the Packages::Page version
@@ -111,7 +100,31 @@ sub get_version_string {
 sub get_dep_field {
     my ($self, $dep_field) = @_;
 
-    return $self->{dep_fields}{$dep_field}[1];
+    my @deps;
+    foreach my $dep (@{$self->{dep_fields}{$dep_field}[1]}) {
+       my @or_deps;
+       foreach my $or_dep ( @$dep ) {
+           my $p_name = $or_dep->[0];
+           my $p_version = $or_dep->[1] ? "$or_dep->[1] $or_dep->[2]" : undef;
+           my $arch_neg;
+           my $arch_str = '';
+           if ($or_dep->[3] && @{$or_dep->[3]}) {
+               # as either all or no archs have to be prepended with
+               # exlamation marks, use the first and delete the others
+               if ($or_dep->[3][0] =~ /^!/) {
+                   $arch_neg = 1;
+                   foreach (@{$or_dep->[3]}) {
+                       $_ =~ s/^!//go;
+                   }
+               }
+               $arch_str = join(" ",sort(@{$or_dep->[3]}));
+           }
+
+           push @or_deps, [ $p_name, $p_version, $arch_neg, $arch_str ];
+       }
+       push @deps, [ 0, @or_deps ];
+    }
+    return \@deps;
 }
 
 1;