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, 23 insertions, 12 deletions

diff --git a/dh_gencontrol b/dh_gencontrol
index e2a4e701..df53a753 100755
--- a/dh_gencontrol
+++ b/dh_gencontrol
@@ -1,19 +1,30 @@
-#!/bin/sh -e
+#!/usr/bin/perl -w
 #
 # Generate and install the control file. Simple dpkg-gencontrol wrapper.
 
-PATH=debian:$PATH:/usr/lib/debhelper
-. dh_lib
+use Debian::Debhelper::Dh_Lib;
+init();
 
-for PACKAGE in $DH_DOPACKAGES; do
-	TMP=`tmpdir $PACKAGE`
-	EXT=`pkgext $PACKAGE`
+foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
+	$TMP=tmpdir($PACKAGE);
+	$EXT=pkgext($PACKAGE);
+	
+	$changelog=pkgfile($PACKAGE,'changelog');
+	if (! $changelog) {
+		$changelog='debian/changelog';
+	}
 
-	if [ ! -d $TMP/DEBIAN ]; then
-		doit "install -o root -g root -d $TMP/DEBIAN"
-	fi
+	if ( ! -d '$TMP/DEBIAN' ) {
+		doit("install","-o","root","-g","root","-d","$TMP/DEBIAN");
+	}
 
 	# Generate and install control file.
-	doit "dpkg-gencontrol -p$PACKAGE -Tdebian/${EXT}substvars -P$TMP $DH_U_PARAMS"
-	doit "chown root.root $TMP/DEBIAN/control"
-done
+	doit("dpkg-gencontrol","-l$changelog","-isp","-p$PACKAGE",
+		"-Tdebian/$EXT\substvars","-P$TMP",@{$dh{U_PARAMS}});
+
+	# This chmod is only necessary if the user sets the umask to something odd.
+	doit("chmod","644","$TMP/DEBIAN/control");
+	
+	doit("chown","root.root","$TMP/DEBIAN/control");
+}
+