Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper

[debhelper.git] / dh_installmenu

diff --git a/dh_installmenu b/dh_installmenu
index e61b9adf4be6b4c853f2ec8bc05c56b7beb7ecb6..c1a609a9cbe0e99694eab3a1ca28054f6bec682d 100755 (executable)
--- a/dh_installmenu
+++ b/dh_installmenu
@@ -19,16 +19,24 @@ 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
-explanation of how this works.
+interface with the debian menu package. These commands are inserted into
+the maintainer scripts by L<dh_installdeb(1)>.

 
 

-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(5)> for its format.
+=head1 FILES

 
 

-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
-menu method file.
+=over 4
+
+=item debian/I<package>.menu
+
+Debian menu files, installed into usr/share/menu/I<package> in the package
+build directory. See L<menufile(5)> for its format.
+
+=item debian/I<package>.menu-method
+
+Debian menu method files, installed into etc/menu-methods/I<package>
+in the package build directory.
+
+=back

 
 =head1 OPTIONS
 
 
 =head1 OPTIONS
 


@@ -50,10 +58,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.