Merge branch 'master' into ubuntu-master

diff --combined lib/Packages/SrcPage.pm
index 433bb9da34eaca05f41e804b3b29309e4dcb482d,62e8f7f62d289fd4c9f34c2f92c302d53bc8a549..101d6f2635523e8bb85f29a486c6b4d2b80273d7
--- 1/lib/Packages/SrcPage.pm
--- 2/lib/Packages/SrcPage.pm
+++ b/lib/Packages/SrcPage.pm
@@@ -38,9 -38,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};
@@@ -53,6 -64,8 +53,8 @@@
  
        $self->{version} = $data->{version};
      }
+ 
+     return 1;
  }
  
  #FIXME: should be mergable with the Packages::Page version