[debhelper-devel] [debhelper] 01/02: Revert "dh_installmenu: Stop installing menu files in compat 11"

[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 4c982e422c4843d72aee9007864ac4861d9fe6bb
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Jul 9 12:31:21 2017 +0000

    Revert "dh_installmenu: Stop installing menu files in compat 11"
    
    This reverts commit c1f102537e9e204deed0eab17c10680f3372a2ba.
---
 debhelper.pod    |  5 -----
 debian/changelog |  7 +++++++
 dh_installmenu   | 24 ++++++++----------------
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/debhelper.pod b/debhelper.pod
index 8e3bfcd..d8a02ed 100644
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -587,11 +587,6 @@ Changes from v10 are:
 
 =item -
 
-B<dh_installmenu> no longer installs F<menu> files.  The
-F<menu-method> files are still installed.
-
-=item -
-
 B<dh_installinit> no longer installs F<service> or F<tmpfile> files, nor
 generates maintainer scripts for those files. Use B<dh_systemd_enable> and
 B<dh_systemd_start> instead.
diff --git a/debian/changelog b/debian/changelog
index 491497d..bca6381 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (10.6.4) UNRELEASED; urgency=medium
+
+  * dh_installmenu: Revert "Stop installing menu files in compat 11
+    (menu-methods are still installed)".
+
+ -- Niels Thykier <niels at thykier.net>  Sun, 09 Jul 2017 12:30:20 +0000
+
 debhelper (10.6.3) unstable; urgency=medium
 
   * Makefile: Use "dpkg-parsechangelog -S" rather than
diff --git a/dh_installmenu b/dh_installmenu
index b4464a2..3bad129 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")
 		}
 	}
 

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