[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.10-164-g7765300



The following commit has been merged in the master branch:
commit b06a28c0e1ecb93ac874462a1bd24fbb217e214a
Author: Niels Thykier <niels@thykier.net>
Date:   Mon Sep 24 15:49:16 2012 +0200

    d/lintian.install: Install Lintian::* in /usr/share/perl5
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/debian/changelog b/debian/changelog
index ddf86c5..1394e72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -128,6 +128,8 @@ lintian (2.5.11) UNRELEASED; urgency=low
 
   * debian/control:
     + [NT] Add (Build-)Depends on libtext-levenshtein-perl.
+  * debian/lintian.install:
+    + [NT] Install Lintian perl modules in /usr/share/perl5.
   * debian/rules:
     + [NT] Add target to generate HTML API doc.  Currently
       this is only run manually.
diff --git a/debian/lintian.install b/debian/lintian.install
index df62a6c..4f2b812 100644
--- a/debian/lintian.install
+++ b/debian/lintian.install
@@ -2,6 +2,6 @@ frontend/lintian	usr/bin
 frontend/lintian-info	usr/bin
 checks			usr/share/lintian
 collection		usr/share/lintian
-lib			usr/share/lintian
+lib/Lintian		usr/share/perl5
 profiles		usr/share/lintian
 vendors 		usr/share/lintian
diff --git a/frontend/lintian b/frontend/lintian
index bff772f..2903131 100755
--- a/frontend/lintian
+++ b/frontend/lintian
@@ -605,7 +605,10 @@ $opt{'LINTIAN_PROFILE'} = 'debian/ftp-master-auto-reject' if $ftpmaster_tags;
 # }}}
 
 # {{{ Loading lintian's own libraries, parse config file and setup output
-unshift @INC, "$opt{'LINTIAN_ROOT'}/lib";
+
+# Only update @INC if the LINTIAN_ROOT actually contains any libraries...
+unshift @INC, "$opt{'LINTIAN_ROOT'}/lib"
+    if -d "$opt{'LINTIAN_ROOT'}/lib";
 
 require Lintian::Lab;
 

-- 
Debian package checker


Reply to: