[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.7.1
Modestas Vainius
modax at alioth.debian.org
Thu Apr 22 08:02:00 UTC 2010
The following commit has been merged in the master branch:
commit 055899a68a5a67a4860a2f134c66ffaaac505fc7
Author: Modestas Vainius <modestas at vainius.eu>
Date: Thu Apr 22 10:18:10 2010 +0300
Make dh_sameversiondep work with libdpkg-perl (>= 1.15.6).
The bug was triggered by altered interface of Dpkg::Substvars. Thanks to
Roderich Schupp for the patch (Closes: #577056).
---
debian/changelog | 2 ++
dh_sameversiondep | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 42de427..fbf5b1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ pkg-kde-tools (0.7.1~pre1) UNRELEASED; urgency=low
dpkg-dev (>= 1.15.6) is enough now. As a result, make appropriate changes
to pkgkde-gensymbols.
* Drop dpkg-dev 1.15.4 compatibility code from dh_sameversiondep.
+ * Make dh_sameversiondep work with libdpkg-perl (>= 1.15.6) (Dpkg::Substvars
+ API changed). Thanks to Roderich Schupp for the patch (Closes: #577056).
-- Modestas Vainius <modax at debian.org> Wed, 14 Apr 2010 20:22:09 +0300
diff --git a/dh_sameversiondep b/dh_sameversiondep
index 5c225b6..82b4324 100755
--- a/dh_sameversiondep
+++ b/dh_sameversiondep
@@ -169,7 +169,7 @@ my $re_splitsubstvar = qr/^($re_pkgname)(?::($re_pkgname))?(?:-($re_fields))?$/;
# Global substvars file
my $g_substvars = new Dpkg::Substvars;
-$g_substvars->parse("debian/substvars") if (-r "debian/substvars");
+$g_substvars->load("debian/substvars") if (-r "debian/substvars");
sub extract_package_names {
my $val = shift;
@@ -201,7 +201,7 @@ sub Shlibsvars::new {
}, $cls);
$self->{substvars} = new Dpkg::Substvars;
if (-r $self->{file}) {
- $self->{substvars}->parse($self->{file});
+ $self->{substvars}->load($self->{file});
}
return $self;
}
--
Debian Qt/KDE packaging tools
More information about the pkg-kde-commits
mailing list