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

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 792ebfb67e0fd4e3a327fc4f43b8472cf3dc1e56
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Thu Apr 22 10:12:13 2010 +0300

    Drop dpkg-dev 1.15.4 compatibility code from dh_sameversiondep.
---
 debian/changelog  |    1 +
 dh_sameversiondep |   11 ++---------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cc013f8..42de427 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ pkg-kde-tools (0.7.1~pre1) UNRELEASED; urgency=low
   * No longer ship a backported dpkg-gensymbols.pl script. The one from
     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.
 
  -- Modestas Vainius <modax at debian.org>  Wed, 14 Apr 2010 20:22:09 +0300
 
diff --git a/dh_sameversiondep b/dh_sameversiondep
index cef678a..5c225b6 100755
--- a/dh_sameversiondep
+++ b/dh_sameversiondep
@@ -153,14 +153,7 @@ Modestas Vainius <modax at debian.org>
 use strict;
 use warnings;
 
-# 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::Control::Info;
 use Dpkg::Substvars;
 use Dpkg::ErrorHandling ();
 use File::Copy;
@@ -317,7 +310,7 @@ sub write_substvar($$$$) {
 
 init();
 
-my $control = $dpkg_control_class->new();
+my $control = Dpkg::Control::Info->new();
 my %shlibsvars;
 
 foreach my $package (@{$dh{DOPACKAGES}}) {

-- 
Debian Qt/KDE packaging tools