r1932: split the scripts for the two cases, undo behavior change

diff --git a/autoscripts/postinst-modules b/autoscripts/postinst-modules
index 0460eaaff5c55149e9c2694124cdd1ec63c192c7..f17dc2da139e35c4c385c24116827e2f4aa75fb8 100644 (file)
--- a/autoscripts/postinst-modules
+++ b/autoscripts/postinst-modules
@@ -1,7 +1,4 @@
 if [ "$1" = "configure" ]; then
-       if [ -x "`which update-modules 2>/dev/null`" ]; then
-               update-modules >/dev/null || [ "$?" = 3 ]
-       fi
        if [ -e /boot/System.map-#KVERS# ]; then
                depmod -a -F /boot/System.map-#KVERS# #KVERS# || true
        fi

diff --git a/autoscripts/postinst-update-modules b/autoscripts/postinst-update-modules
new file mode 100644 (file)
index 0000000..f5e13b5
--- /dev/null
+++ b/autoscripts/postinst-update-modules
@@ -0,0 +1,5 @@
+if [ "$1" = "configure" ]; then
+       if [ -x "`which update-modules 2>/dev/null`" ]; then
+               update-modules >/dev/null || [ "$?" = 3 ]
+       fi
+fi

diff --git a/autoscripts/postrm-modules b/autoscripts/postrm-modules
index d710791da3ede828cd96bf20b51f0b6698bd4ba4..c2577dd272d7aefc1b86f4fa9462de4446b762c3 100644 (file)
--- a/autoscripts/postrm-modules
+++ b/autoscripts/postrm-modules
@@ -1,6 +1,3 @@
-if [ -x "`which update-modules 2>/dev/null`" ]; then
-       update-modules >/dev/null || [ "$?" = 3 ]
-fi
 if [ -e /boot/System.map-#KVERS# ]; then
        depmod -a -F /boot/System.map-#KVERS# #KVERS# || true
 fi

diff --git a/autoscripts/postrm-update-modules b/autoscripts/postrm-update-modules
new file mode 100644 (file)
index 0000000..35db871
--- /dev/null
+++ b/autoscripts/postrm-update-modules
@@ -0,0 +1,3 @@
+if [ -x "`which update-modules 2>/dev/null`" ]; then
+       update-modules >/dev/null || [ "$?" = 3 ]
+fi

diff --git a/debian/changelog b/debian/changelog
index 923ae6c6ef3d6aab4b0adb7a1d02449beec0c6f3..2a9d24383b669931a768ad96b42620780147d131 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-debhelper (5.0.37) UNRELEASED; urgency=low
+debhelper (5.0.37) unstable; urgency=low
 
   * dh_installmodules: depmod -a is no longer run during boot, so if a module
     package is installed for a kernel other than the running kernel, just
@@ -6,14 +6,11 @@ debhelper (5.0.37) UNRELEASED; urgency=low
     depmod -a -F /boot/System.map-<kvers> <kvers>
     The kernel version is guessed at based on the path to the modules in the
     package. Closes: #301424
-  * Note: behavior change due to the above: The mere existence of a
-    debian/package.modules file will no longer make dh_installmodules add code
-    to maintainer scripts.
   * dh_installxfonts: In postrm, run the deregistraton code even on upgrade,
     in case an upgrade involves moving fonts around (or removing or renaming
     fonts). Closes: #372686
 
- -- Joey Hess <joeyh@debian.org>  Sun, 11 Jun 2006 12:29:14 -0400
+ -- Joey Hess <joeyh@debian.org>  Sun, 11 Jun 2006 21:17:38 -0400
 
 debhelper (5.0.36) unstable; urgency=low
 

diff --git a/dh_installmodules b/dh_installmodules
index f3e8cc840b93004220b8def96c6d4bf95f6d2395..6b996a582200ee3ffc3ef050fa866c2837e2cb82 100755 (executable)
--- a/dh_installmodules
+++ b/dh_installmodules
@@ -104,6 +104,11 @@ 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");