r2039: releasing version 5.0.58

[debhelper.git] / dh_installmodules

diff --git a/dh_installmodules b/dh_installmodules
index be2efad560951509a6da5231278fd83fa01af89f..2d1d596945de519f02213bc553a48764438c8e70 100755 (executable)
--- a/dh_installmodules
+++ b/dh_installmodules
@@ -20,16 +20,21 @@ 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.
 
 Kernel modules are searched for in the package build directory and if
 found, postinst and postrm commands are automatically generated to 
-run depmod and register the modules when the package is installed. See
-L<dh_installdeb(1)> for an explanation of how this works.
+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
 
@@ -67,7 +72,7 @@ sub find_kernel_modules {
        return unless -d $searchdir;
        find(sub {
                if (/\.k?o$/) {
-                       my $kvers=$File::Find::dir=~m!lib/modules/([^/]+)/!;
+                       my ($kvers)=$File::Find::dir=~m!lib/modules/([^/]+)/!;
                        if (! defined $kvers || ! length $kvers) {
                                warning("Cannot determine kernel version for module $File::Find::name");
                        }
@@ -90,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,8 +107,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        
        if (! $dh{NOSCRIPTS}) {
                foreach my $kvers (find_kernel_modules("$tmp/lib/modules")) {
-                       autoscript($package,"postinst","postinst-modules","s/#KVERS#/$kvers/");
-                       autoscript($package,"postrm","postrm-modules","s/#KVERS#/$kvers/");
+                       autoscript($package,"postinst","postinst-modules","s/#KVERS#/$kvers/g");
+                       autoscript($package,"postrm","postrm-modules","s/#KVERS#/$kvers/g");
                }
        }
 }