[SCM] Debian Qt/KDE packaging tools branch, improved-gensymbols, updated. debian/0.5.3-25-gf1ba9e5

[Modestas Vainius]

The following commit has been merged in the improved-gensymbols branch:
commit 8bf8a2811f245f0f7d2674b466da0baf3dbb7ebd
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Jan 17 16:31:55 2010 +0200

    Refactor pkgkde-gensymbols a bit.
---
 symbolshelper/pkgkde-gensymbols |   32 +++++++++++++++++++++-----------
 1 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/symbolshelper/pkgkde-gensymbols b/symbolshelper/pkgkde-gensymbols
index 2a5e29b..d657bf3 100755
--- a/symbolshelper/pkgkde-gensymbols
+++ b/symbolshelper/pkgkde-gensymbols
@@ -20,21 +20,31 @@ use warnings;
 
 use constant DATADIR => '/usr/share/pkg-kde-tools';
 
-my $dir;
-if ($0 =~ m@^(.+)/[^/]+$@) {
-    $dir = $1;
-    unless ($dir && -f "$dir/dpkg-gensymbols.pl" &&
-        -f "$dir/Dpkg/Shlibs/SymbolFile.pm") {
-        $dir = undef;
+sub find_dpkg_gensymbols {
+    my $dir;
+    if ($0 =~ m@^(.+)/[^/]+$@) {
+	$dir = $1;
+	unless ($dir && -f "$dir/dpkg-gensymbols.pl" &&
+	    -f "$dir/Dpkg/Shlibs/SymbolFile.pm") {
+	    $dir = undef;
+	}
+    }
+
+    unless ($dir) {
+	$dir = DATADIR;
     }
-}
 
-unless ($dir) {
-    $dir = DATADIR;
+    if (-f "$dir/dpkg-gensymbols.pl") {
+	return ("$dir/dpkg-gensymbols.pl",$dir);
+    }
+    return (undef, undef);
 }
 
-unshift @INC, $dir;
-if (-f "$dir/dpkg-gensymbols.pl") {
+# Finally, run stock dpkg-gensymbols
+my ($exe, $dir) = find_dpkg_gensymbols();
+
+if (defined $exe) {
+    unshift @INC, $dir;
     do "$dir/dpkg-gensymbols.pl";
 } else {
     print STDERR "pkgkde-gensymbols: unable to determine execution context.", "\n";

-- 
Debian Qt/KDE packaging tools