summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey>1999-08-17 05:08:02 +0000
committerjoey <joey>1999-08-17 05:08:02 +0000
commitdc1239161f436fffdd586b4640cef147424f626e (patch)
tree649c4fcb28679d9a418d066798287001dd31eb66
parent6b0e8f6773b98cc4905cc0329e471ade8db3ac32 (diff)
downloaddebhelper-dc1239161f436fffdd586b4640cef147424f626e.tar.gz
r161: Initial Import
-rw-r--r--autoscripts/postinst-menu2
-rw-r--r--autoscripts/postinst-menu-method2
-rw-r--r--autoscripts/postrm-menu-method2
-rw-r--r--debian/changelog10
4 files changed, 13 insertions, 3 deletions
diff --git a/autoscripts/postinst-menu b/autoscripts/postinst-menu
index 49b2c5de..2b0f740c 100644
--- 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 7f7aaa96..6ab538cb 100644
--- 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 0c2baae9..a6682fee 100644
--- 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 4feee157..33bbbe2e 100644
--- 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