[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 c7d894303715b45e3a198babd121225d793dcfab
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Mon Jan 18 20:03:42 2010 +0200

    pkgkde-{gensymbols,symbolshelper}: do not touch @INC when running locally.
---
 symbolshelper/pkgkde-gensymbols    |   12 +++++-------
 symbolshelper/pkgkde-symbolshelper |   34 +++++++++++++---------------------
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/symbolshelper/pkgkde-gensymbols b/symbolshelper/pkgkde-gensymbols
index 467b534..4721754 100755
--- a/symbolshelper/pkgkde-gensymbols
+++ b/symbolshelper/pkgkde-gensymbols
@@ -24,13 +24,9 @@ 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) {
+    unless ($dir && -f "$dir/dpkg-gensymbols.pl" &&
+	-f "$dir/Dpkg/Shlibs/SymbolFile.pm") {
 	$dir = DATADIR;
     }
 
@@ -44,7 +40,9 @@ sub find_dpkg_gensymbols {
 my ($exe, $dir) = find_dpkg_gensymbols();
 
 if (defined $exe) {
-    unshift @INC, $dir;
+    if (defined $dir && $dir eq DATADIR) {
+	unshift @INC, DATADIR;
+    }
 
     eval "use Dpkg::Shlibs::SymbolFile";
     eval "use Debian::PkgKde::SymbolsHelper::Symbol";
diff --git a/symbolshelper/pkgkde-symbolshelper b/symbolshelper/pkgkde-symbolshelper
index 32004c9..312a7dd 100755
--- a/symbolshelper/pkgkde-symbolshelper
+++ b/symbolshelper/pkgkde-symbolshelper
@@ -49,34 +49,26 @@ Each subcommand accepts a few common options and a few specific options.
 
 use strict;
 use warnings;
-use File::Spec;
-use Getopt::Long;
-
-use constant DATADIR => '/usr/share/pkg-kde-tools';
 
 # Setup environment
-my $datadir;
-if ($0 =~ m@^(.+)/[^/]+$@) {
-    $datadir = $1;
-    unless ($datadir && -f "$datadir/Dpkg/Shlibs/SymbolFile.pm") {
-	$datadir = undef;
+use constant DATADIR => '/usr/share/pkg-kde-tools';
+BEGIN {
+    my $datadir;
+    if ($0 =~ m@^(.+)/[^/]+$@) {
+	$datadir = $1;
+    }
+    if (!defined $datadir || ! -f "$datadir/Dpkg/Shlibs/SymbolFile.pm") {
+	unshift @INC, DATADIR;
     }
-}
-unless ($datadir) {
-    $datadir = DATADIR;
-}
-unshift @INC, $datadir;
-
-sub _use {
-    my $module = shift;
-    eval "use $module";
 }
 
+use File::Spec;
+use Getopt::Long;
 use Dpkg::ErrorHandling;
 use Dpkg::Arch qw(get_host_arch get_valid_arches);
-_use "Debian::PkgKde::SymbolsHelper::SymbolFile";
-_use "Debian::PkgKde::SymbolsHelper::SymbolFileCollection";
-_use "Debian::PkgKde::SymbolsHelper::Patch";
+use Debian::PkgKde::SymbolsHelper::SymbolFile;
+use Debian::PkgKde::SymbolsHelper::SymbolFileCollection;
+use Debian::PkgKde::SymbolsHelper::Patch;
 
 ######## Option processing ##################
 my $opt_out;

-- 
Debian Qt/KDE packaging tools