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

[Modestas Vainius]

The following commit has been merged in the master branch:
commit cf846300930655d2b7d660c96538d05b3c10baf4
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Mon Jan 18 20:10:59 2010 +0200

    pkgkde-gensymbols: refactor code a bit for better readability.
---
 symbolshelper/pkgkde-gensymbols |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/symbolshelper/pkgkde-gensymbols b/symbolshelper/pkgkde-gensymbols
index 4721754..1c9125b 100755
--- a/symbolshelper/pkgkde-gensymbols
+++ b/symbolshelper/pkgkde-gensymbols
@@ -36,6 +36,17 @@ sub find_dpkg_gensymbols {
     return (undef, undef);
 }
 
+my $old_symbolfile_load;
+
+sub new_symbolfile_load {
+    # Use Debian::PkgKde::SymbolsHelper::Symbol as base symbol
+    my ($self, $file, $seen, $obj_ref, $base_symbol) = @_;
+    unless (defined $base_symbol) {
+	$base_symbol = 'Debian::PkgKde::SymbolsHelper::Symbol';
+    }
+    return &$old_symbolfile_load($self, $file, $seen, $obj_ref, $base_symbol);
+}
+
 # Finally, run stock dpkg-gensymbols
 my ($exe, $dir) = find_dpkg_gensymbols();
 
@@ -50,15 +61,7 @@ if (defined $exe) {
     # Replace Dpkg::Shlibs::SymbolFile::load with a custom version
     # which uses Debian::PkgKde::SymbolsHelper::Symbol rather than
     # Dpkg::Shlibs::Symbol
-    my $old_symbolfile_load = *Dpkg::Shlibs::SymbolFile::load;
-    sub new_symbolfile_load {
-	# Use Debian::PkgKde::SymbolsHelper::Symbol as base symbol
-	my ($self, $file, $seen, $obj_ref, $base_symbol) = @_;
-	unless (defined $base_symbol) {
-	    $base_symbol = 'Debian::PkgKde::SymbolsHelper::Symbol';
-	}
-	return &$old_symbolfile_load($self, $file, $seen, $obj_ref, $base_symbol);
-    }
+    $old_symbolfile_load = *Dpkg::Shlibs::SymbolFile::load;
     *Dpkg::Shlibs::SymbolFile::load = *new_symbolfile_load;
 
     do "$exe";

-- 
Debian Qt/KDE packaging tools