diff options
| author | Niels Thykier <niels@thykier.net> | 2016-01-05 21:52:57 +0000 |
|---|---|---|
| committer | Niels Thykier <niels@thykier.net> | 2016-01-05 21:53:49 +0000 |
| commit | a88e4f7901e6f416afe1167ace57f8d6f79ed59e (patch) | |
| tree | 1228f0ad482f5873d84160402a33af7a21cf268c | |
| parent | 0465b5c521e7be529ca8af8049cb1a0ed6ec6c7e (diff) | |
| download | debhelper-a88e4f7901e6f416afe1167ace57f8d6f79ed59e.tar.gz | |
dh_installmenu: Remove unncessary snippets for menu files
Signed-off-by: Niels Thykier <niels@thykier.net>
| -rw-r--r-- | autoscripts/postinst-menu | 3 | ||||
| -rw-r--r-- | autoscripts/postrm-menu | 1 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rwxr-xr-x | dh_installmenu | 7 |
4 files changed, 3 insertions, 12 deletions
diff --git a/autoscripts/postinst-menu b/autoscripts/postinst-menu deleted file mode 100644 index b56a3462..00000000 --- a/autoscripts/postinst-menu +++ /dev/null @@ -1,3 +0,0 @@ -if [ "$1" = "configure" ] && [ -x "`which update-menus 2>/dev/null`" ]; then - update-menus -fi diff --git a/autoscripts/postrm-menu b/autoscripts/postrm-menu deleted file mode 100644 index a180558d..00000000 --- a/autoscripts/postrm-menu +++ /dev/null @@ -1 +0,0 @@ -if [ -x "`which update-menus 2>/dev/null`" ]; then update-menus ; fi diff --git a/debian/changelog b/debian/changelog index 144365e6..c72b5c82 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,9 @@ debhelper (9.20151225+unreleased) UNRELEASED; urgency=medium * dh_install: Only fallback to debian/tmp if the given glob does not start with debian/tmp. This should make the output on failures less weird. - * autoscripts/*-makeshlibs: Removed, no longer used. + * autoscripts: Remove unused snippets. + * dh_installmenu: Stop adding script snippets when installing + menu files. These are handled by a trigger now. [ Dmitry Shachnev ] * dh_install: Fail because of missing files only after processing diff --git a/dh_installmenu b/dh_installmenu index adca9d6e..a3084c60 100755 --- a/dh_installmenu +++ b/dh_installmenu @@ -65,13 +65,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) { install_dir("$tmp/usr/share/menu"); } install_file($menu,"$tmp/usr/share/menu/$package"); - - # 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}) { - autoscript($package,"postinst","postinst-menu"); - autoscript($package,"postrm","postrm-menu") - } } if ($menu_method ne '') { |