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 a10a2c2364cf2b7d54b28d9771935dd85d192664..101d6f2635523e8bb85f29a486c6b4d2b80273d7 100644 (file)
--- a/lib/Packages/SrcPage.pm
+++ b/lib/Packages/SrcPage.pm
@@ -4,7 +4,6 @@ use strict;
 use warnings;
 
 use Data::Dumper;
-use Locale::gettext;
 use Deb::Versions;
 use Packages::CGI;
 use Packages::Page qw( :all );
@@ -39,20 +38,9 @@ sub merge_package {
 
        $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};
@@ -65,6 +53,8 @@ sub merge_package {
 
        $self->{version} = $data->{version};
     }
+
+    return 1;
 }
 
 #FIXME: should be mergable with the Packages::Page version
@@ -93,6 +83,20 @@ sub get_arch_field {
     return $self->{data}{$field};
 }
 
+sub get_versions {
+    my ($self) = @_;
+
+    return [ $self->{version} ];
+}
+
+sub get_version_string {
+    my ($self) = @_;
+
+    my $versions = $self->get_versions;
+
+    return ($self->{version}, $versions);
+}
+
 sub get_dep_field {
     my ($self, $dep_field) = @_;