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 );
$name = $string;
$email = $string;
} else {
- $name = gettext( 'package has bad maintainer field' );
+ $name = N_( 'package has bad maintainer field' );
$email = '';
}
$name =~ s/\s+$//o;
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 url 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 );
($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) {
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};
}
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 );