X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FPage.pm;h=7c3ed677d27632e492a291c763cce8a0a890ce79;hb=c40b1514a9289273df1ae785fd938b8fa0f31183;hp=000f1a0c24bfcaaad9a33236b5f08fb024fd2371;hpb=b21dd56695db580574c998f2f9ca59e18d168c06;p=deb%2Fpackages.git

diff --git a/lib/Packages/Page.pm b/lib/Packages/Page.pm
index 000f1a0..7c3ed67 100644
--- a/lib/Packages/Page.pm
+++ b/lib/Packages/Page.pm
@@ -95,9 +95,9 @@ sub is_virtual {
 }
 
 our @TAKE_NEWEST = qw( description essential priority section subsection tag
-		       archive source source-version );
+		       archive source source-version url );
 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;
-    if ($is_newest =
-	(version_cmp( $data->{version}, $self->{newest} ) > 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};
 	}