[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.5.3

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 81483da78707720bb98db018c3d468b67a5a2c09
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Wed Nov 18 02:29:04 2009 +0200

    Add support for dpkg-dev 1.15.5 to dh_sameversiondep.
    
    Dpkg::Control was renamed to Dpkg::Control::Info in dpkg-dev 1.15.5.
    Now dh_sameversiondep tries to load either.
---
 debhelper/dh_sameversiondep |   12 ++++++++++--
 debian/changelog            |    6 ++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/debhelper/dh_sameversiondep b/debhelper/dh_sameversiondep
index d14a3f7..4f7fe85 100755
--- a/debhelper/dh_sameversiondep
+++ b/debhelper/dh_sameversiondep
@@ -137,7 +137,15 @@ Modestas Vainius <modestas at vainius.eu>
 
 use strict;
 use warnings;
-use Dpkg::Control;
+
+# 1.15.5 or later
+my $dpkg_control_class = 'Dpkg::Control::Info';
+eval "use Dpkg::Control::Info";
+if ($@) {
+    # 1.15.4 or earlier
+    eval "use Dpkg::Control";
+    $dpkg_control_class = 'Dpkg::Control';
+}
 use Dpkg::Substvars;
 use Dpkg::ErrorHandling ();
 use File::Copy;
@@ -294,7 +302,7 @@ sub write_substvar($$$$) {
 
 init();
 
-my $control = new Dpkg::Control;
+my $control = $dpkg_control_class->new();
 my %shlibsvars;
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
diff --git a/debian/changelog b/debian/changelog
index 3eb2f97..c42192e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pkg-kde-tools (0.5.3) unstable; urgency=low
+
+  * Add support for dpkg-dev 1.15.5 to dh_sameversiondep.
+
+ -- Modestas Vainius <modestas at vainius.eu>  Wed, 18 Nov 2009 02:31:00 +0200
+
 pkg-kde-tools (0.5.2) unstable; urgency=low
 
   * Add pkgkde-vcs helper tool for performing various common tasks

-- 
Debian Qt/KDE packaging tools