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, 25 insertions, 8 deletions

diff --git a/dh_installwm b/dh_installwm
index b3b9059e..8cb7af03 100755
--- a/dh_installwm
+++ b/dh_installwm
@@ -2,21 +2,38 @@
 #
 # Add to postinst and postrm to register a window manager.
 
-BEGIN { push @INC, "debian", "/usr/share/debhelper" }
-use Dh_Lib;
+use Debian::Debhelper::Dh_Lib;
 init();
 
-$wm=shift;
+if (! defined $dh{PRIORITY}) {
+        $dh{PRIORITY}=20;
+}
 
-if ($wm eq '') {
-	error("No window manager filename was specified.");
+if (@ARGV) {
+	# This is here for backwards comatability. If the filename doesn't
+	# include a path, assume it's in /usr/X11R6/bin.
+	if ($ARGV[0] !~ m:/:) {
+		$ARGV[0]="/usr/X11R6/$ARGV[0]";
+	}
 }
 
 foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
 #	$TMP=tmpdir($PACKAGE);
+	$file=pkgfile($PACKAGE,"wm");
+
+	if ($file) {
+		@wm=filearray($file);
+	}
 
-	if (! $dh{NOSCRIPTS}) {
-		autoscript($PACKAGE,"postinst","postinst-wm","s:#WM#:$wm:");
-		autoscript($PACKAGE,"postrm","postrm-wm","s:#WM#:$wm:");
+	if (($PACKAGE eq $dh{FIRSTPACKAGE} || $dh{PARAMS_ALL}) && @ARGV) {
+		push @wm, @ARGV;
+	}
+
+	if (@wm && ! $dh{NOSCRIPTS}) {
+		foreach (@wm) {
+			autoscript($PACKAGE,"postinst","postinst-wm","s:#WM#:$_:;s/#PRIORITY#/$dh{PRIORITY}/",);
+			autoscript($PACKAGE,"postrm","postrm-wm","s:#WM#:$_:");
+		}
 	}
 }
+