r1695: * dh_gconf: gconf schemas moved to /usr/share/gconf/schemas. Relocate

    schemas from /etc/gconf/schemas. (Josselin Mouette)
  * dh_gconf: kill gconfd-2 so that the newly installed schemas
    are available straight away. (Josselin Mouette)
  * dh_gconf: fix bashism in restart of gconfd-2
  * dh_gconf: fix innaccuracy in man page; gconfd-2 is HUPPed, not
    killed.
  * dh_scrollkeeper: stop adding scrollkeeper to misc:Depends, since
    the postinst will not run it if it's not installed, and a single run after
    it's installed is sufficient to find all documents. Closes: #256745
  * dh_fixperms: make .ali files mode 444 to prevent recompilation by GNAT.
    For speed, only scan for .ali files in usr/lib/ada. Closes: #245211
  * dh_python: check to make sure compileall.py is available before running it
    in the postinst. Closes: #253112
  * dh_installmodules: install debian/package.modprobe into etc/modprobe.d/
    for module-init-tools. These files can sometimes need to differ from the
    etc/modutils/ files. Closes: #204336, #234495
  * dh_installmanpages is now deprecated.
  * Add a test case for bug #244157, and fixed the inverted ok() parameters
    in the others, and added a few new tests.
  * dh_link: applied GOTO Masanori's patch to fix conversion of existing
    relative symlinks between top level directories. Closes: #244157

1 files changed, 17 insertions, 6 deletions

diff --git a/dh_installmodules b/dh_installmodules
index 28f947ca..132857a0 100755
--- a/dh_installmodules
+++ b/dh_installmodules
@@ -21,12 +21,15 @@ dh_installmodules is a debhelper program that is responsible for
 registering kernel modules with modutils.
 
 Files named debian/package.modules will be installed as
-etc/modutils/package in the package build directory.
+etc/modutils/package in the package build directory. This is for use by
+modutils. 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.
 
 Then postinst and postrm commands are automatically generated to register
 the modules when the package is installed. See L<dh_installdeb(1)> for an
 explanation of how this works. Note that this will be done for any
-package this program acts on which has either the above-mentioned file, or
+package this program acts on which has either a package.modules file, or
 has .o or .ko files in /lib/modules.
 
 =head1 OPTIONS
@@ -68,21 +71,29 @@ sub find_kernel_modules {
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
 	my $tmp=tmpdir($package);
-	my $file=pkgfile($package,"modules");
+	my $modutils_file=pkgfile($package,"modules");
+	my $modprobe_file=pkgfile($package,"modprobe");
 
 	if (! -e $tmp) {
 		doit("install","-d",$tmp);
 	}
 
-	if ($file) {
+	if ($modutils_file) {
 		if (! -e "$tmp/etc/modutils") {
 			doit("install","-d","$tmp/etc/modutils");
 		}
-		doit("install","-m","0644",$file,"$tmp/etc/modutils/".pkgfilename($package));
+		doit("install","-m","0644",$modutils_file,"$tmp/etc/modutils/".pkgfilename($package));
 	}
 
+	if ($modprobe_file) {
+		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));
+	}
+	
 	if (! $dh{NOSCRIPTS} &&
-	    ($file || find_kernel_modules("$tmp/lib/modules"))) {
+	    ($modutils_file || find_kernel_modules("$tmp/lib/modules"))) {
 			autoscript($package,"postinst","postinst-modules","s/#PACKAGE#/$package/");
 			autoscript($package,"postrm","postrm-modules","s/#PACKAGE#/$package/");
 	}