r161: Initial Import

diff --git a/autoscripts/postinst-menu b/autoscripts/postinst-menu
index 49b2c5de2daa1ffcdfd2b993dd64b729c3952fe9..2b0f740c48fe5cc1d92ce30b189a0569e14b8afe 100644 (file)
--- a/autoscripts/postinst-menu
+++ b/autoscripts/postinst-menu
@@ -1 +1 @@
-if command -v update-menus >/dev/null 2>&1 ; then update-menus ; fi
+if text -x /usr/bin/update-menus ; then update-menus ; fi

diff --git a/autoscripts/postinst-menu-method b/autoscripts/postinst-menu-method
index 7f7aaa967b5e6e4b6eaeb4539cb43e8d0f8130a3..6ab538cb60f61df9f6c9adbe9de39d26c5d20be0 100644 (file)
--- a/autoscripts/postinst-menu-method
+++ b/autoscripts/postinst-menu-method
@@ -1,5 +1,5 @@
 inst=/etc/menu-methods/#PACKAGE#
-if command -v update-menus >/dev/null 2>&1 && [ -f $inst ] ; then
+if [ -x /usr/bin/update-menus && -f $inst ] ; then
        chmod a+x $inst
        update-menus
 fi

diff --git a/autoscripts/postrm-menu-method b/autoscripts/postrm-menu-method
index 0c2baae9d73c838db62d38395389363fe3d359b3..a6682fee58610c56053770ca47a61069f8786eda 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 command -v update-menus >/dev/null 2>&1 ; then update-menus; fi
+if text -x /usr/bin/update-menus ; then update-menus; fi

diff --git a/debian/changelog b/debian/changelog
index 4feee1573f0a5ceb4daa77e5c7e5a46759b8c6df..33bbbe2e4b3895e3b3da7a5513bf3dbc56a79204 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+debhelper (1.2.25) unstable; urgency=low
+
+  * autoscripts/*menu*: It turns out that "command" is like test -w, it will
+    still return true if update-menus is not executable. This can
+    legitimatly happen if you are upgrading the menu package, and it makes
+    postinsts that use command fail. Reverted to using test -x. Packages
+    built with debhelper >= 1.2.21 that use menus should be rebuilt.
+
+ -- Joey Hess <joeyh@master.debian.org>  Sat, 16 Jan 1999 13:47:16 -0800
+
 debhelper (1.2.24) unstable; urgency=low
 
   * dh_fixperms: linux 2.1.x and 2.2.x differ from earlier versions in that