Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper

[debhelper.git] / dh_installmodules

diff --git a/dh_installmodules b/dh_installmodules
index 6a08eb774bb194cad2d2da588258eedd85157a87..475d83886e6ade8960afdff0c2b18ffebe15d436 100755 (executable)
--- a/dh_installmodules
+++ b/dh_installmodules
@@ -21,7 +21,7 @@ dh_installmodules is a debhelper program that is responsible for
 registering kernel modules.
 
 Files named debian/package.modprobe will be installed in
-etc/modprobe.d/package in the package build directory, to be used by
+etc/modprobe.d/package.conf 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
@@ -30,6 +30,10 @@ 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 installed files named
+etc/modprobe.d/package, code is added to the preinst and postinst to
+handle the upgrade from the old location.
+
 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
@@ -102,7 +106,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                if (! -e "$tmp/etc/modprobe.d") {
                        doit("install","-d","$tmp/etc/modprobe.d");
                }
-               doit("install","-m","0644",$modprobe_file,"$tmp/etc/modprobe.d/".pkgfilename($package));
+               my $old="/etc/modprobe.d/".pkgfilename($package);
+               my $new=$old.".conf";
+               doit("install","-m","0644",$modprobe_file,"$tmp/$new");
+               autoscript($package,"preinst","preinst-moveconffile","s!#OLD#!$old!g;s!#PACKAGE#!$package!g");
+               autoscript($package,"postinst","postinst-moveconffile","s!#OLD#!$old!g;s!#NEW#!$new!g");
        }
        
        if (! $dh{NOSCRIPTS}) {