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

     modified)to make dh_installwm use new window manager registration method,
     update-alternatives. Closes: #52156, #34684 (latter bug is obsolete)
   * Fixed $dh{flavor} to be upper-case.
   * Deprecated dh_installemavcsen --number; use --priority instead. Also,
     the option parser requires the parameter be a number now. And,
     dh_installwm now accepts --priority, and window manager packages should
     start using it.
   * dh_installwm now behaves like a proper debhelper command, and reads
     debian/<package>.wm too. This is a small behavior change; filenames
     specified on the command line no longer apply to all packages it acts
     on. I can't belive this program existed for 2 years with such a glaring
     problem; I guess most people don't need ot register 5 wm's in 3
     sub-packages. Anyway, it can handle such things now. :-)
   * Moved Dh_*.pm to /usr/lib/perl5/Debian/Debhelper. *big* change.

1 files changed, 5 insertions, 6 deletions

diff --git a/dh_installmanpages b/dh_installmanpages
index 82681f33..448f0891 100755
--- 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;
 			}