[Reproducible-commits] [debhelper] 11/32: Revert "dh_installmenu: Remove unncessary snippets for menu files"
Mattia Rizzolo
mattia at debian.org
Fri Jan 15 00:38:24 UTC 2016
This is an automated email from the git hooks/post-receive script.
mattia pushed a commit to branch master
in repository debhelper.
commit bd3ab8767f07f5bc1a6d35316d8922333ce043dc
Author: Niels Thykier <niels at thykier.net>
Date: Wed Jan 6 07:20:32 2016 +0000
Revert "dh_installmenu: Remove unncessary snippets for menu files"
This reverts commit a88e4f7901e6f416afe1167ace57f8d6f79ed59e.
We still need the snippet for /executable/ menu files.
---
autoscripts/postinst-menu | 3 +++
autoscripts/postrm-menu | 1 +
debian/changelog | 4 +---
dh_installmenu | 7 +++++++
4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/autoscripts/postinst-menu b/autoscripts/postinst-menu
new file mode 100644
index 0000000..b56a346
--- /dev/null
+++ b/autoscripts/postinst-menu
@@ -0,0 +1,3 @@
+if [ "$1" = "configure" ] && [ -x "`which update-menus 2>/dev/null`" ]; then
+ update-menus
+fi
diff --git a/autoscripts/postrm-menu b/autoscripts/postrm-menu
new file mode 100644
index 0000000..a180558
--- /dev/null
+++ b/autoscripts/postrm-menu
@@ -0,0 +1 @@
+if [ -x "`which update-menus 2>/dev/null`" ]; then update-menus ; fi
diff --git a/debian/changelog b/debian/changelog
index c72b5c8..144365e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,9 +7,7 @@ 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: Remove unused snippets.
- * dh_installmenu: Stop adding script snippets when installing
- menu files. These are handled by a trigger now.
+ * autoscripts/*-makeshlibs: Removed, no longer used.
[ Dmitry Shachnev ]
* dh_install: Fail because of missing files only after processing
diff --git a/dh_installmenu b/dh_installmenu
index a3084c6..adca9d6 100755
--- a/dh_installmenu
+++ b/dh_installmenu
@@ -65,6 +65,13 @@ 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/reproducible/debhelper.git
More information about the Reproducible-commits
mailing list