summaryrefslogtreecommitdiff
path: root/dh_installmenu
diff options
context:
space:
mode:
authorNiels Thykier <niels@thykier.net>2017-07-09 12:31:21 +0000
committerNiels Thykier <niels@thykier.net>2017-07-09 12:31:21 +0000
commit4c982e422c4843d72aee9007864ac4861d9fe6bb (patch)
tree9d1dafef7e6f689cdd91fdcbabcabbaf2ee35abd /dh_installmenu
parentf5a22e8e17dd1061c2d8338a4af585e0d69394a2 (diff)
downloaddebhelper-4c982e422c4843d72aee9007864ac4861d9fe6bb.tar.gz
Revert "dh_installmenu: Stop installing menu files in compat 11"
This reverts commit c1f102537e9e204deed0eab17c10680f3372a2ba.
Diffstat (limited to 'dh_installmenu')
-rwxr-xr-xdh_installmenu24
1 files changed, 8 insertions, 16 deletions
diff --git a/dh_installmenu b/dh_installmenu
index b4464a27..3bad1292 100755
--- a/dh_installmenu
+++ b/dh_installmenu
@@ -31,9 +31,6 @@ the maintainer scripts by L<dh_installdeb(1)>.
=item debian/I<package>.menu
-In compat 11, this file is no longer installed the format has been
-deprecated. Please migrate to a desktop file instead.
-
Debian menu files, installed into usr/share/menu/I<package> in the package
build directory. See L<menufile(5)> for its format.
@@ -66,19 +63,14 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
my $menu_method=pkgfile($package,"menu-method");
if ($menu ne '') {
- if (compat(10)) {
- 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")
- }
- } else {
- warning("menu files are *not* installed in compat 11");
- warning("Please remove the menu file");
+ 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")
}
}