This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
commit 94728ead2cc22af5043b16483aab1e4f5a50223c Author: Guillem Jover <[email protected]> Date: Sun Apr 29 01:26:10 2018 +0200 Revert "Dpkg::Deps: Accept $archqual for add_provided_package() method" This reverts commit 83272497c5be8c4e703ab179906cf904465fe775. This commit introduced a regression in the author test suite. And there's a patch by Johannes 'josch' Schauer <[email protected]> which should be fixing this and other problems. If this is needed after all, we will need to refactor the functions first to take a hash instead of a long list of arguments. --- debian/changelog | 1 - scripts/Dpkg/Deps.pm | 14 ++++---------- scripts/dpkg-checkbuilddeps.pl | 2 +- scripts/dpkg-genbuildinfo.pl | 3 +-- scripts/dpkg-gencontrol.pl | 3 +-- 5 files changed, 7 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3d59b42..59d2cff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -74,7 +74,6 @@ dpkg (1.19.1) UNRELEASED; urgency=medium - Dpkg::Source::Package: Print building lines for upstream tarball signatures. Closes: #888787 - Dpkg::Deps: Turn virtualpkg tracking from an arrayyref into a hashref. - - Dpkg::Deps: Accept $archqual for add_provided_package() method. - Dpkg::Vendor::Debian: Mark riscv64 as having gcc builtin PIE. * Documentation: - Update gettext minimal version in README. diff --git a/scripts/Dpkg/Deps.pm b/scripts/Dpkg/Deps.pm index 3612eb3..df8d9f4 100644 --- a/scripts/Dpkg/Deps.pm +++ b/scripts/Dpkg/Deps.pm @@ -49,7 +49,7 @@ All the deps_* functions are exported by default. use strict; use warnings; -our $VERSION = '1.07'; +our $VERSION = '1.06'; our @EXPORT = qw( deps_concat deps_parse @@ -1413,20 +1413,18 @@ sub add_installed_package { push @{$self->{pkg}{$pkg}}, $p; } -=item $facts->add_provided_package($virtual, $relation, $version, $by, $archqual) +=item $facts->add_provided_package($virtual, $relation, $version, $by) Records that the "$by" package provides the $virtual package. $relation and $version correspond to the associated relation given in the Provides -field (if present). $archqual corresponds to the package arch qualifier -(if present). +field (if present). =cut sub add_provided_package { - my ($self, $pkg, $rel, $ver, $by, $archqual) = @_; + my ($self, $pkg, $rel, $ver, $by) = @_; my $v = { package => $pkg, - archqual => $archqual, relation => $rel, version => $ver, provider => $by, @@ -1538,10 +1536,6 @@ sub _evaluate_simple_dep { =head1 CHANGES -=head2 Version 1.07 (dpkg 1.19.1) - -New argument: Add $archqual to $dep->add_provided_package(). - =head2 Version 1.06 (dpkg 1.18.7; module version bumped on dpkg 1.18.24) New option: Add tests_dep option to Dpkg::Deps::deps_parse(). diff --git a/scripts/dpkg-checkbuilddeps.pl b/scripts/dpkg-checkbuilddeps.pl index 738afa0..80b309f 100755 --- a/scripts/dpkg-checkbuilddeps.pl +++ b/scripts/dpkg-checkbuilddeps.pl @@ -173,7 +173,7 @@ sub parse_status { { $facts->add_provided_package($_->{package}, $_->{relation}, $_->{version}, - $package, $_->{archqual}); + $package); } } } diff --git a/scripts/dpkg-genbuildinfo.pl b/scripts/dpkg-genbuildinfo.pl index c2916c2..96b0609 100755 --- a/scripts/dpkg-genbuildinfo.pl +++ b/scripts/dpkg-genbuildinfo.pl @@ -115,8 +115,7 @@ sub parse_status { deps_iterate($provides, sub { my $dep = shift; $facts->add_provided_package($dep->{package}, $dep->{relation}, - $dep->{version}, $package, - $dep->{archqual}); + $dep->{version}, $package); }); } diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl index 517db35..1c92e66 100755 --- a/scripts/dpkg-gencontrol.pl +++ b/scripts/dpkg-gencontrol.pl @@ -263,8 +263,7 @@ if (exists $pkg->{'Provides'}) { if ($subdep->isa('Dpkg::Deps::Simple')) { $facts->add_provided_package($subdep->{package}, $subdep->{relation}, $subdep->{version}, - $fields->{'Package'}, - $subdep->{archqual}); + $fields->{'Package'}); } } } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/dpkg/dpkg.git
