dh_scrollkeeper: Now a deprecated no-op. Closes: #530806

[debhelper.git] / dh_installmenu

diff --git a/dh_installmenu b/dh_installmenu
index 420b2164545c8971a5fa07e48cc7f4ee9f5c4545..327fac0fc31cd23b98edc615c0a3ef17536ed154 100755 (executable)
--- a/dh_installmenu
+++ b/dh_installmenu
@@ -19,12 +19,13 @@ dh_installmenu is a debhelper program that is responsible for installing
 files used by the debian menu package into package build directories.
 
 It also automatically generates the postinst and postrm commands needed to
 files used by the debian menu package into package build directories.
 
 It also automatically generates the postinst and postrm commands needed to

-interface with the debian menu package. See L<dh_installdeb(1)> for an
+interface with the debian menu package. These commands are inserted into
+the maintainer scripts by dh_installdeb. See L<dh_installdeb(1)> for an

 explanation of how this works.
 
 If a file named debian/package.menu exists, then it is installed into
 explanation of how this works.
 
 If a file named debian/package.menu exists, then it is installed into

-usr/lib/menu/package in the package build directory. This is a debian menu
-file. See L<menufile(5L)> for its format.
+usr/share/menu/package in the package build directory. This is a debian menu
+file. See L<menufile(5)> for its format.

 
 If a file named debian/package.menu-method exits, then it is installed into
 etc/menu-methods/package in the package build directory. This is a debian
 
 If a file named debian/package.menu-method exits, then it is installed into
 etc/menu-methods/package in the package build directory. This is a debian


@@ -50,10 +51,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        my $menu_method=pkgfile($package,"menu-method");
        
        if ($menu ne '') {
        my $menu_method=pkgfile($package,"menu-method");
        
        if ($menu ne '') {

-               if (! -d "$tmp/usr/lib/menu") {
-                       doit("install","-d","$tmp/usr/lib/menu");
+               if (! -d "$tmp/usr/share/menu") {
+                       doit("install","-d","$tmp/usr/share/menu");

                }
                }

-               doit("install","-p","-m644",$menu,"$tmp/usr/lib/menu/$package");
+               doit("install","-p","-m644",$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.
                
                # Add the scripts if a menu-method file doesn't exist.
                # The scripts for menu-method handle everything these do, too.


@@ -67,7 +68,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                if (!-d "$tmp/etc/menu-methods") {
                        doit("install","-d","$tmp/etc/menu-methods");
                }
                if (!-d "$tmp/etc/menu-methods") {
                        doit("install","-d","$tmp/etc/menu-methods");
                }

-               doit("install","-p",$menu_method,"$tmp/etc/menu-methods/$package");
+               doit("install","-p","-m644",$menu_method,"$tmp/etc/menu-methods/$package");

 
                if (! $dh{NOSCRIPTS}) {
                        autoscript($package,"postinst","postinst-menu-method","s/#PACKAGE#/$package/");
 
                if (! $dh{NOSCRIPTS}) {
                        autoscript($package,"postinst","postinst-menu-method","s/#PACKAGE#/$package/");