From 8d3f10b38de49099f20a7a0115dafdb318fbb2c0 Mon Sep 17 00:00:00 2001 From: joey Date: Tue, 17 Aug 1999 05:07:14 +0000 Subject: r157: Initial Import --- autoscripts/postinst-menu-method | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'autoscripts/postinst-menu-method') diff --git a/autoscripts/postinst-menu-method b/autoscripts/postinst-menu-method index 0ea7959b..7f7aaa96 100644 --- a/autoscripts/postinst-menu-method +++ b/autoscripts/postinst-menu-method @@ -1,5 +1,5 @@ inst=/etc/menu-methods/#PACKAGE# -if [ -x /usr/bin/update-menus -a -f $inst -a -x /usr/sbin/install-menu ] ; then +if command -v update-menus >/dev/null 2>&1 && [ -f $inst ] ; then chmod a+x $inst update-menus fi -- cgit v1.2.3 From dc1239161f436fffdd586b4640cef147424f626e Mon Sep 17 00:00:00 2001 From: joey Date: Tue, 17 Aug 1999 05:08:02 +0000 Subject: r161: Initial Import --- autoscripts/postinst-menu | 2 +- autoscripts/postinst-menu-method | 2 +- autoscripts/postrm-menu-method | 2 +- debian/changelog | 10 ++++++++++ 4 files changed, 13 insertions(+), 3 deletions(-) (limited to 'autoscripts/postinst-menu-method') 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 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 -- cgit v1.2.3 From 3a48e5ca07d99dacf1dc3899a66d5874fa7cf796 Mon Sep 17 00:00:00 2001 From: joey Date: Tue, 17 Aug 1999 05:09:47 +0000 Subject: r171: Initial Import --- autoscripts/postinst-menu-method | 2 +- debian/changelog | 7 +++++++ dh_compress.1 | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) (limited to 'autoscripts/postinst-menu-method') diff --git a/autoscripts/postinst-menu-method b/autoscripts/postinst-menu-method index 6ab538cb..03acde7f 100644 --- a/autoscripts/postinst-menu-method +++ b/autoscripts/postinst-menu-method @@ -1,5 +1,5 @@ inst=/etc/menu-methods/#PACKAGE# -if [ -x /usr/bin/update-menus && -f $inst ] ; then +if [ -x /usr/bin/update-menus -a -f $inst ] ; then chmod a+x $inst update-menus fi diff --git a/debian/changelog b/debian/changelog index cf51a7ca..5a4fe4e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +debhelper (1.2.35) unstable; urgency=low + + * Dh_Lib.pm filearray(): Deal with multiple spaces and spaces at the + beginning of lines in files. (closes: #33161) + + -- Joey Hess Tue, 9 Feb 1999 21:01:07 -0800 + debhelper (1.2.34) unstable; urgency=low * dh_clean: added -d flag (also --dirs-only) that will make it clean only diff --git a/dh_compress.1 b/dh_compress.1 index 4d1fa1f7..8fa2d802 100644 --- a/dh_compress.1 +++ b/dh_compress.1 @@ -38,7 +38,7 @@ for a list of options common to all debhelper commands. .TP .B \-Xitem, \--exclude=item Exclude files that contain "item" anywhere in their filename from being -compressed. For example, -X=.jpeg will exclude jpeg's from compression. +compressed. For example, -X.jpeg will exclude jpeg's from compression. You may use this option multiple times to build up a list of things to exclude. You can accomplish the same thing by using a debian/compress file, but this is easier. -- cgit v1.2.3