[debhelper-devel] [debhelper] 01/01: dh_installmenu: Remove unncessary snippets for 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 a88e4f7901e6f416afe1167ace57f8d6f79ed59e
Author: Niels Thykier <niels at thykier.net>
Date:   Tue Jan 5 21:52:57 2016 +0000

    dh_installmenu: Remove unncessary snippets for menu files
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 autoscripts/postinst-menu | 3 ---
 autoscripts/postrm-menu   | 1 -
 debian/changelog          | 4 +++-
 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 b56a346..0000000
--- 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 a180558..0000000
--- 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 144365e..c72b5c8 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 adca9d6..a3084c6 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 '') {

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