X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FPage.pm;h=b9c41ee35dde6fb90f6b398a92004474e2fedcc7;hb=e9e5399ad699b724ed7d236b43f76b3ff85050bd;hp=3eb31985843d04af7c69ad3f45e87656424ab0ab;hpb=33c3adfb631d4c1fb6690a02117674a984d0e6ee;p=deb%2Fpackages.git

diff --git a/lib/Packages/Page.pm b/lib/Packages/Page.pm
index 3eb3198..b9c41ee 100644
--- a/lib/Packages/Page.pm
+++ b/lib/Packages/Page.pm
@@ -5,9 +5,9 @@ use warnings;
 
 use Data::Dumper;
 use Exporter;
-use Locale::gettext;
 use Deb::Versions;
 use Packages::CGI;
+use Packages::I18N::Locale;
 
 our @ISA = qw( Exporter );
 our @EXPORT_OK = qw( split_name_mail parse_deps );
@@ -44,7 +44,7 @@ sub split_name_mail {
         $name =  $string;
         $email = $string;
     } else {
-        $name = gettext( 'package has bad maintainer field' );
+        $name = N_( 'package has bad maintainer field' );
         $email = '';
     }
     $name =~ s/\s+$//o;
@@ -94,10 +94,10 @@ sub is_virtual {
     return (exists($self->{provided_by}) && !exists($self->{versions}));
 }
 
-our @TAKE_NEWEST = qw( description essential priority section subsection tag
-		       archive source source-version );
+our @TAKE_NEWEST = qw( description description-md5 essential priority section subsection tag
+		       archive source source-version homepage );
 our @STORE_ALL = qw( version source source-version installed-size size
-		     filename md5sum
+		     filename md5sum sha1 sha256 task
 		     origin bugs suite archive section );
 our @DEP_FIELDS = qw( depends pre-depends recommends suggests enhances
 		      provides conflicts );
@@ -109,6 +109,7 @@ sub merge_package {
     ($self->{package} eq $data->{package}) || return;
     debug( "merge package $data->{package}/$data->{version}/$data->{architecture} into $self (".($self->{newest}||'').")", 2 ) if DEBUG;
 
+    (my $version = $data->{version}) =~ s/\+b\d+$//o; # strip binNMU number
     unless ($self->{newest}) {
 	debug( "package $data->{package}/$data->{version}/$data->{architecture} is first to merge", 3 ) if DEBUG;
 	foreach my $key (@TAKE_NEWEST) {
@@ -121,16 +122,19 @@ sub merge_package {
 	foreach my $key (@DEP_FIELDS) {
 	    $self->normalize_dependencies($key, $data);
 	}
-	$self->{newest} = $data->{version};
+	$self->{newest} = $version;
 	
         return 1;
     }
 
     debug( "package $data->{package}/$data->{version}/$data->{architecture} is subsequent merge", 3 ) if DEBUG;
     my $is_newest;
-    my $cmp = version_cmp( $data->{version}, $self->{newest} );
-    if ($is_newest = ($cmp > 0)) {
-	$self->{newest} = $data->{version};
+    my $cmp = version_cmp( $version, $self->{newest} );
+    # packages from the central archive are preferred over all
+    # others with the same version number but from other archives
+    if ($is_newest = ($cmp > 0)
+    		|| (!$cmp && ($data->{archive} eq 'us') && ($self->{data}{archive} ne 'us'))) {
+	$self->{newest} = $version;
 	foreach my $key (@TAKE_NEWEST) {
 	    $self->{data}{$key} = $data->{$key};
 	}
@@ -239,7 +243,7 @@ sub get_version_string {
 	my @v_str_arch;
 	foreach ( @versions ) {
 	    push @v_str, [ $_, $versions->{$_} ];
-	    push @v_str_arch, "$_ [".join(', ', @{$versions->{$_}})."]";
+	    push @v_str_arch, "$_ [".join(', ', sort @{$versions->{$_}})."]";
 	}
 	$v_str_arch = join( ", ", @v_str_arch );
 	$v_str = join( ", ",  @versions );