r338: * Patch from Jorgen `forcer' Schaefer <forcer at mindless.com> (much

[debhelper.git] / dh_installmanpages

diff --git a/dh_installmanpages b/dh_installmanpages
index 82681f332437081aaf866a625ed6dd70b9376d37..448f0891169570e058d239cf30b964d371bf4daa 100755 (executable)
--- a/dh_installmanpages
+++ b/dh_installmanpages
@@ -7,8 +7,7 @@
 # This is a little bit (hah!) DWIMish, but still very handy.
 
 use File::Find;
-BEGIN { push @INC, "debian", "/usr/share/debhelper" }
-use Dh_Lib;
+use Debian::Debhelper::Dh_Lib;
 init();
 
 # Check if a file is a man page, for use by File::Find.
@@ -60,8 +59,8 @@ sub find_so_man {
        if ($l=~m/\.so\s+(.*)/) {
                my $solink=$1;
                # This test is here to prevent links like ... man8/../man8/foo.8
-               if (Dh_Lib::basename($File::Find::dir) eq Dh_Lib::dirname($solink)) {
-                       $solink=Dh_Lib::basename($solink);
+               if (Debian::Debhelper::Dh_Lib::basename($File::Find::dir) eq Debian::Devhelper::Dh_Lib::dirname($solink)) {
+                       $solink=Debian::Debhelper::Dh_Lib::basename($solink);
                }
                else {
                        $solink="../$solink";
@@ -83,14 +82,14 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
        foreach $page (@manpages) {
                $page=~s:^\./::; # just for looks
                
-               $basename=Dh_Lib::basename($page);
+               $basename=Debian::Debhelper::Dh_Lib::basename($page);
                
                # Skip all files listed on command line.
                my $install=1;
                foreach $skip (@ARGV) {
                        # Look at basename of what's on connect line
                        # for backwards compatability.
-                       if ($basename eq Dh_Lib::basename($skip)) {
+                       if ($basename eq Debian::Debhelper::Dh_Lib::basename($skip)) {
                                $install=undef;
                                last;
                        }