r2030: * dh_installmodules: Since modutils is gone, stop supporting

  debian/*.modutils files. Warn about such files. Closes: #443127

1 files changed, 8 insertions, 12 deletions

diff --git a/dh_installmodules b/dh_installmodules
index 99dcc31a..2d1d5969 100755
--- a/dh_installmodules
+++ b/dh_installmodules
@@ -20,9 +20,7 @@ B<dh_installmodules> [S<I<debhelper options>>] [B<-n>] [B<--name=>I<name>]
 dh_installmodules is a debhelper program that is responsible for
 registering kernel modules.
 
-Files named debian/package.modules will be installed as
-etc/modutils/package in the package build directory. This is for use by
-modutils. Files named debian/package.modprobe will be installed in
+Files named debian/package.modprobe will be installed in
 etc/modprobe.d/package in the package build directory, to be used by
 module-init-tools's version of modprobe.
 
@@ -32,6 +30,12 @@ run depmod and register the modules when the package is installed.
 These commands are inserted into the maintainer scripts by dh_installdeb.
 See L<dh_installdeb(1)> for an explanation of how this works.
 
+Previous versions of dh_installmodules also supported 
+files named debian/package.modules, which were installed into 
+etc/modutils/package in the package build directory. This was for use by
+modutils, which is no longer in Debian. dh_installmodules will warn about
+such files now.
+
 =head1 OPTIONS
 
 =over 4
@@ -91,10 +95,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	}
 
 	if ($modutils_file) {
-		if (! -e "$tmp/etc/modutils") {
-			doit("install","-d","$tmp/etc/modutils");
-		}
-		doit("install","-m","0644",$modutils_file,"$tmp/etc/modutils/".pkgfilename($package));
+		warning("ignoring $modutils_file, since modutils is no longer in Debian");
 	}
 
 	if ($modprobe_file) {
@@ -105,11 +106,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 	}
 	
 	if (! $dh{NOSCRIPTS}) {
-		if ($modutils_file) {
-			autoscript($package,"postinst","postinst-update-modules");
-			autoscript($package,"postrm","postrm-update-modules");
-		}
-
 		foreach my $kvers (find_kernel_modules("$tmp/lib/modules")) {
 			autoscript($package,"postinst","postinst-modules","s/#KVERS#/$kvers/g");
 			autoscript($package,"postrm","postrm-modules","s/#KVERS#/$kvers/g");