[debhelper-devel] [debhelper] 02/02: dh_installmenu: Skip maintscripts for non-exec menu files

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit 882b84eeaaf06c3fb20e7c8e6b71a4dd6acafe42
Author: Niels Thykier <niels at thykier.net>
Date:   Wed Jan 6 07:45:42 2016 +0000

    dh_installmenu: Skip maintscripts for non-exec menu files
    
    Regular non-executable files are handled just fine by the menu
    trigger, so stop the creating maintainer scripts for them.
    
    Bonus info: There is currently only 1 executable menu file in the
    archive and it does not need the maintscript either.  Nor does it have
    one (because it does not use debhelper to install it).
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 3 +++
 dh_installmenu   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 144365e..7c7498a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ debhelper (9.20151225+unreleased) UNRELEASED; urgency=medium
     does not start with debian/tmp.  This should make the
     output on failures less weird.
   * autoscripts/*-makeshlibs: Removed, no longer used.
+  * dh_installmenu: Do not add post{rm,inst} snippets for
+    /non-executable/ menu files.  The trigger in the menu package
+    can handle these correctly.  (Closes: #628564)
 
   [ Dmitry Shachnev ]
   * dh_install: Fail because of missing files only after processing
diff --git a/dh_installmenu b/dh_installmenu
index adca9d6..c775e3a 100755
--- a/dh_installmenu
+++ b/dh_installmenu
@@ -68,7 +68,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 		# Add the scripts if a menu-method file doesn't exist.
 		# The scripts for menu-method handle everything these do, too.
-		if ($menu_method eq "" && ! $dh{NOSCRIPTS}) {
+		if (-x $menu && $menu_method eq "" && ! $dh{NOSCRIPTS}) {
 			autoscript($package,"postinst","postinst-menu");
 			autoscript($package,"postrm","postrm-menu")
 		}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git