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

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 04e1901471014b0747998a365200ed53cfe6e8e1
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Thu Apr 29 00:03:06 2010 +0300

    pkgkde-gensymbols: no longer check dpkg version
    
    It is:
    
    1) pointless now as pkg-kde-tools depends on the appropriate libdpkg-perl
    version;
    2) the check is inaccurate for our needs as it checks the version of
    the dpkg binary rather than dpkg-dev package.
---
 debian/changelog  |    4 ++++
 pkgkde-gensymbols |   41 ++++++++++++++++++-----------------------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0356a99..bb67ad4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 pkg-kde-tools (0.7.3) UNRELEASED; urgency=low
 
   * pkgkde-gensymbols: add vim modeline.
+  * pkgkde-gensymbols: no longer check dpkg version. It is 1) pointless now
+    as pkg-kde-tools depends on the appropriate libdpkg-perl version and 2)
+    the check is inaccurate for our needs as it checks the version of the dpkg
+    binary rather than dpkg-dev package.
 
  -- Modestas Vainius <modax at debian.org>  Wed, 28 Apr 2010 23:54:18 +0300
 
diff --git a/pkgkde-gensymbols b/pkgkde-gensymbols
index 840248e..b340072 100755
--- a/pkgkde-gensymbols
+++ b/pkgkde-gensymbols
@@ -54,33 +54,28 @@ sub check_dpkg_version {
 
 my $exe = find_exe_in_path("dpkg-gensymbols", $0);
 
-if (check_dpkg_version(1, 15, 6)) {
-    # Export global datalibdir if needed
-    my $dir = setup_datalibdir(qw(Dpkg/Shlibs/SymbolFile.pm));
-    if (defined $dir) {
-	# Finally, run stock dpkg-gensymbols
-	unless ($exe) {
-	    print STDERR "pkgkde-gensymbols: dpkg-gensymbols could not be found in PATH", "\n";
-	    exit 1;
-	}
+# Export global datalibdir if needed
+my $dir = setup_datalibdir(qw(Dpkg/Shlibs/SymbolFile.pm));
+if (defined $dir) {
+    unless ($exe) {
+	print STDERR "pkgkde-gensymbols: dpkg-gensymbols could not be found in PATH", "\n";
+	exit 1;
+    }
 
-	eval "use Dpkg::Shlibs::SymbolFile";
-	eval "use Debian::PkgKde::SymbolsHelper::Symbol";
+    eval "use Dpkg::Shlibs::SymbolFile";
+    eval "use Debian::PkgKde::SymbolsHelper::Symbol";
 
-	# Replace Dpkg::Shlibs::SymbolFile::load with a custom version
-	# which uses Debian::PkgKde::SymbolsHelper::Symbol rather than
-	# Dpkg::Shlibs::Symbol
-	$old_symbolfile_parse = *Dpkg::Shlibs::SymbolFile::parse;
-	*Dpkg::Shlibs::SymbolFile::parse = *new_symbolfile_parse;
+    # Replace Dpkg::Shlibs::SymbolFile::load with a custom version
+    # which uses Debian::PkgKde::SymbolsHelper::Symbol rather than
+    # Dpkg::Shlibs::Symbol
+    $old_symbolfile_parse = *Dpkg::Shlibs::SymbolFile::parse;
+    *Dpkg::Shlibs::SymbolFile::parse = *new_symbolfile_parse;
 
-	do "$exe";
-    } else {
-	print STDERR "pkgkde-gensymbols: unable to determine execution context.", "\n";
-	exit 1;
-    }
+    # Finally, run stock dpkg-gensymbols
+    do "$exe";
 } else {
-    $exe = '/usr/bin/dpkg-gensymbols' unless $exe;
-    exec $exe, @ARGV;
+    print STDERR "pkgkde-gensymbols: unable to determine execution context.", "\n";
+    exit 1;
 }
 
 # vim: noexpandtab ts=8 sw=4

-- 
Debian Qt/KDE packaging tools