This is an automated email from the git hooks/post-receive script.
guillem pushed a commit to branch master
in repository dpkg.
commit 83272497c5be8c4e703ab179906cf904465fe775
Author: Guillem Jover <guil...@debian.org>
Date: Mon Feb 6 03:52:50 2017 +0100
Dpkg::Deps: Accept $archqual for add_provided_package() method
---
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, 16 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index efd84ec..a73e910 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,6 +60,7 @@ 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.
* Documentation:
- Update gettext minimal version in README.
- Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/scripts/Dpkg/Deps.pm b/scripts/Dpkg/Deps.pm
index df8d9f4..3612eb3 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.06';
+our $VERSION = '1.07';
our @EXPORT = qw(
deps_concat
deps_parse
@@ -1413,18 +1413,20 @@ sub add_installed_package {
push @{$self->{pkg}{$pkg}}, $p;
}
-=item $facts->add_provided_package($virtual, $relation, $version, $by)
+=item $facts->add_provided_package($virtual, $relation, $version, $by,
$archqual)
Records that the "$by" package provides the $virtual package. $relation
and $version correspond to the associated relation given in the Provides
-field (if present).
+field (if present). $archqual corresponds to the package arch qualifier
+(if present).
=cut
sub add_provided_package {
- my ($self, $pkg, $rel, $ver, $by) = @_;
+ my ($self, $pkg, $rel, $ver, $by, $archqual) = @_;
my $v = {
package => $pkg,
+ archqual => $archqual,
relation => $rel,
version => $ver,
provider => $by,
@@ -1536,6 +1538,10 @@ 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 80b309f..738afa0 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);
+ $package, $_->{archqual});
}
}
}
diff --git a/scripts/dpkg-genbuildinfo.pl b/scripts/dpkg-genbuildinfo.pl
index 96b0609..c2916c2 100755
--- a/scripts/dpkg-genbuildinfo.pl
+++ b/scripts/dpkg-genbuildinfo.pl
@@ -115,7 +115,8 @@ sub parse_status {
deps_iterate($provides, sub {
my $dep = shift;
$facts->add_provided_package($dep->{package}, $dep->{relation},
- $dep->{version}, $package);
+ $dep->{version}, $package,
+ $dep->{archqual});
});
}
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 1c92e66..517db35 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -263,7 +263,8 @@ if (exists $pkg->{'Provides'}) {
if ($subdep->isa('Dpkg::Deps::Simple')) {
$facts->add_provided_package($subdep->{package},
$subdep->{relation}, $subdep->{version},
- $fields->{'Package'});
+ $fields->{'Package'},
+ $subdep->{archqual});
}
}
}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/dpkg/dpkg.git
