r477: * Check that update-modules is present before running it, since modutils

     is not essential. Closes: #100430

diff --git a/autoscripts/postinst-modules b/autoscripts/postinst-modules
index a7e7c77d37b064f8609e97124322a06fa09742be..b25a1c1301ad25301aa11b367074c5dbdcad4cac 100644 (file)
--- a/autoscripts/postinst-modules
+++ b/autoscripts/postinst-modules
@@ -1,3 +1,3 @@
-if [ "$1" = "configure" ]; then
+if [ "$1" = "configure" -a -x /sbin/update-modules ]; then
        update-modules
 fi

diff --git a/autoscripts/postinst-xaw b/autoscripts/postinst-xaw
index 324058f8406ac7c29b2aaedced39f6e19c1bb233..035aa26935dad34aaff8b1962e25d2e845a56a68 100644 (file)
--- a/autoscripts/postinst-xaw
+++ b/autoscripts/postinst-xaw
@@ -1,5 +1,5 @@
 if [ "$1" = "configure" ]; then
-       if test -x /usr/sbin/update-xaw-wrappers; then
+       if [ -x /usr/sbin/update-xaw-wrappers ]; then
                /usr/sbin/update-xaw-wrappers
        fi
        for opts in #OPTS#; do

diff --git a/autoscripts/postrm-menu-method b/autoscripts/postrm-menu-method
index 3e63f2f422585d9a8c995c059f12a2ebd12caef8..2e0faed72bb04a91a56a50f41ed2bb79d5f0dc7f 100644 (file)
--- a/autoscripts/postrm-menu-method
+++ b/autoscripts/postrm-menu-method
@@ -1,3 +1,3 @@
 inst=/etc/menu-methods/#PACKAGE#
 if [ "$1" = "remove" -a -f "$inst" ]; then chmod a-x $inst ; fi
-if [ -x /usr/bin/update-menus ] ; then update-menus; fi
+if [ -x /usr/bin/update-menus ]; then update-menus; fi

diff --git a/autoscripts/postrm-modules b/autoscripts/postrm-modules
index 7abe0c013344568de7908ad9c8ee106c46fc1711..fdf249efc66ca386aab9f43cfb81e82b5c86233e 100644 (file)
--- a/autoscripts/postrm-modules
+++ b/autoscripts/postrm-modules
@@ -1 +1,3 @@
-update-modules
+if [ -x /sbin/update-modules ]; then
+       update-modules
+fi

diff --git a/autoscripts/postrm-xaw b/autoscripts/postrm-xaw
index b8d718ea40189f5fb795db0693c8a7f207b99902..14d13ebbbf29424eafb880981041f45161c10a77 100644 (file)
--- a/autoscripts/postrm-xaw
+++ b/autoscripts/postrm-xaw
@@ -1,3 +1,3 @@
-if test -x /usr/sbin/update-xaw-wrappers; then
+if [ -x /usr/sbin/update-xaw-wrappers ]; then
        /usr/sbin/update-xaw-wrappers
 fi

diff --git a/debian/changelog b/debian/changelog
index edce5fb3fedb18f3ae8ad9a849ed445da34d6c76..4ca7abea656ff47c95326da7d94aac252805ec59 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (3.0.32) unstable; urgency=low
+
+  * Check that update-modules is present before running it, since modutils
+    is not essential. Closes: #100430
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 10 Jun 2001 15:13:51 -0400
+
 debhelper (3.0.31) unstable; urgency=low
 
   * Remove dh_testversion from example rules file, Closes: #99901