[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.6.5-6-g4e4605e
Modestas Vainius
modax at alioth.debian.org
Sun Feb 21 11:02:48 UTC 2010
The following commit has been merged in the master branch:
commit b7bcdd0d64408bf334b79daed031abc99c5ad92d
Author: Modestas Vainius <modestas at vainius.eu>
Date: Fri Feb 19 20:55:05 2010 +0200
Update code stolen from dpkg-dev to current git master.
---
debian/changelog | 1 +
symbolshelper/Dpkg/Shlibs/Symbol.pm | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0d82fef..1bde008 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ pkg-kde-tools (0.6.6~pre1) UNRELEASED; urgency=low
retaining compatibility with 1.15.5 as well (Dpkg::IPC::spawn).
* Use new Dpkg::IPC::spawn() rather than Dpkg::IPC::fork_and_exec() in the
code.
+ * Update code stolen from dpkg-dev to current git master.
-- Modestas Vainius <modax at debian.org> Fri, 19 Feb 2010 20:30:09 +0200
diff --git a/symbolshelper/Dpkg/Shlibs/Symbol.pm b/symbolshelper/Dpkg/Shlibs/Symbol.pm
index dc3d55f..717fde3 100644
--- a/symbolshelper/Dpkg/Shlibs/Symbol.pm
+++ b/symbolshelper/Dpkg/Shlibs/Symbol.pm
@@ -249,15 +249,17 @@ sub get_tag_value {
# tag sets, versioning info (minver and depid))
sub equals {
my ($self, $other, %opts) = @_;
+ $opts{versioning} = 1 unless exists $opts{versioning};
+ $opts{tags} = 1 unless exists $opts{tags};
return 0 if $self->{symbol} ne $other->{symbol};
- if (!exists $opts{versioning} || $opts{versioning}) {
+ if ($opts{versioning}) {
return 0 if $self->{minver} ne $other->{minver};
return 0 if $self->{dep_id} ne $other->{dep_id};
}
- if (!exists $opts{tags} || $opts{tags}) {
+ if ($opts{tags}) {
return 0 if scalar(@{$self->{tagorder}}) != scalar(@{$other->{tagorder}});
for (my $i = 0; $i < scalar(@{$self->{tagorder}}); $i++) {
--
Debian Qt/KDE packaging tools
More information about the pkg-kde-commits
mailing list