r1814: * Remove hardcoded pathc to update-modules and gconf-schemas in various

  script fragments.

diff --git a/autoscripts/postinst-gconf b/autoscripts/postinst-gconf
index f5e7b2bccb8003cb9a43a930fa7dff74f6004f9c..eec1d51c19ec14d7a536267500135d8a66a325bb 100644 (file)
--- a/autoscripts/postinst-gconf
+++ b/autoscripts/postinst-gconf
@@ -1,3 +1,3 @@
 if [ "$1" = "configure" ]; then
-       /usr/sbin/gconf-schemas --register #SCHEMAS#
+       gconf-schemas --register #SCHEMAS#
 fi

diff --git a/autoscripts/postinst-modules b/autoscripts/postinst-modules
index f2342da434cedfbdcac722e87261c6074f3925a8..8d2c4cbc9da1b7695604c876debf122beb4bfd91 100644 (file)
--- a/autoscripts/postinst-modules
+++ b/autoscripts/postinst-modules
@@ -1,3 +1,3 @@
-if [ "$1" = "configure" ] && [ -x /sbin/update-modules ]; then
+if [ "$1" = "configure" ] && [ -x "`which update-modules 2>/dev/null`" ]; then
        update-modules >/dev/null || [ "$?" = 3 ]
 fi

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

diff --git a/autoscripts/prerm-gconf b/autoscripts/prerm-gconf
index 18e911bafd86717058f7ef6bb4a6ff6a65074bbb..6a18816c4902bc46ac425ff7f008a8f7d948b503 100644 (file)
--- a/autoscripts/prerm-gconf
+++ b/autoscripts/prerm-gconf
@@ -1,3 +1,3 @@
 if [ "$1" = remove ] || [ "$1" = upgrade ]; then
-       /usr/sbin/gconf-schemas --unregister #SCHEMAS#
+       gconf-schemas --unregister #SCHEMAS#
 fi

diff --git a/debian/changelog b/debian/changelog
index 3f59698efc6ea70e6e347bc0f21af357b31da9f4..66f4af2ab6bc79bdc80e6cef507595948f7016c7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (5.0.4) UNRELEASED; urgency=low
+
+  * Remove hardcoded pathc to update-modules and gconf-schemas in various
+    script fragments.
+
+ -- Joey Hess <joeyh@debian.org>  Tue,  8 Nov 2005 16:02:09 -0500
+
 debhelper (5.0.3) unstable; urgency=low
 
   * Remove dh_shlibs from binary-indep section of debian/rules.