diff options
| author | Niels Thykier <niels@thykier.net> | 2016-01-06 15:55:17 +0000 |
|---|---|---|
| committer | Niels Thykier <niels@thykier.net> | 2016-01-06 15:55:17 +0000 |
| commit | 084fcd326b9d058ebaef14b5b76fade652062f90 (patch) | |
| tree | 0f9fd452f44fe7fc621819ed3bac35227ad326ea | |
| parent | 882b84eeaaf06c3fb20e7c8e6b71a4dd6acafe42 (diff) | |
| download | debhelper-084fcd326b9d058ebaef14b5b76fade652062f90.tar.gz | |
Revert "dh_installmenu: Skip maintscripts for non-exec menu files"
This reverts commit 882b84eeaaf06c3fb20e7c8e6b71a4dd6acafe42.
The menu trigger is largely broken and useless. Go back to the
scripts again.
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rwxr-xr-x | dh_installmenu | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 7c7498ad..144365e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,9 +8,6 @@ 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 c775e3ad..adca9d6e 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 (-x $menu && $menu_method eq "" && ! $dh{NOSCRIPTS}) { + if ($menu_method eq "" && ! $dh{NOSCRIPTS}) { autoscript($package,"postinst","postinst-menu"); autoscript($package,"postrm","postrm-menu") } |