Packages::Page: Don't support the old Url field anymore

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

diff --git a/lib/Packages/Page.pm b/lib/Packages/Page.pm
index e550fcc372556e7ffc7bb49ec63d1e437eaf77a4..b9c41ee35dde6fb90f6b398a92004474e2fedcc7 100644 (file)
--- a/lib/Packages/Page.pm
+++ b/lib/Packages/Page.pm
@@ -7,6 +7,7 @@ use Data::Dumper;
 use Exporter;
 use Deb::Versions;
 use Packages::CGI;
+use Packages::I18N::Locale;
 
 our @ISA = qw( Exporter );
 our @EXPORT_OK = qw( split_name_mail parse_deps );
@@ -33,7 +34,6 @@ sub new {
     return $self;
 }
 
-sub gettext { return $_[0]; }
 sub split_name_mail {
     my $string = shift;
     my ( $name, $email );
@@ -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;
@@ -88,16 +88,16 @@ sub add_provided_by {
     push @{$self->{provided_by}}, @$provided_by;
 }
 
-sub is_virutal {
+sub is_virtual {
     my ($self) = @_;
 
     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 );
@@ -107,10 +107,11 @@ sub merge_package {
     ($data->{package} && $data->{version} && $data->{architecture}) || return;
     $self->{package} ||= $data->{package};
     ($self->{package} eq $data->{package}) || return;
-    debug( "merge package $data->{package}/$data->{version}/$data->{architecture} into $self (".($self->{newest}||'').")", 2 );
+    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 );
+       debug( "package $data->{package}/$data->{version}/$data->{architecture} is first to merge", 3 ) if DEBUG;
        foreach my $key (@TAKE_NEWEST) {
            $self->{data}{$key} = $data->{$key};
        }
@@ -121,21 +122,24 @@ 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 );
+    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};
        }
     }
-    debug( "is_newest= ".($is_newest||0), 3 );
+    debug( "is_newest= ".($is_newest||0), 3 ) if DEBUG;
     if (!$self->{versions}{$data->{architecture}}
        || $is_newest
        || (version_cmp( $data->{version},
@@ -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 );
@@ -257,14 +261,14 @@ sub get_dep_field {
     foreach my $a ( @architectures ) {
        next unless exists $self->{dep_fields}{$a}{$dep_field};
        my ($a_deps_norm, $a_deps) = @{$self->{dep_fields}{$a}{$dep_field}};
-#      debug( "get_dep_field: $dep_field/$a: ".Dumper($a_deps_norm,$a_deps), 3 );
+#      debug( "get_dep_field: $dep_field/$a: ".Dumper($a_deps_norm,$a_deps), 3 ) if DEBUG;
        for ( my $i=0; $i < @$a_deps; $i++ ) { # splitted by ,      
            $dep_pkgs{$a_deps_norm->[$i]} = $a_deps->[$i];
            $arch_deps{$a}{$a_deps_norm->[$i]}++;
        }
     }
     @architectures = sort keys %arch_deps;
- #   debug( "get_dep_field called:\n ".Dumper( \%dep_pkgs, \%arch_deps ), 3 );
+ #   debug( "get_dep_field called:\n ".Dumper( \%dep_pkgs, \%arch_deps ), 3 ) if DEBUG;
     
     my @deps;
     if ( %dep_pkgs ) {