Fix typo in French translation, about debian/package.README.Debian files.

[debhelper.git] / dh_usrlocal

diff --git a/dh_usrlocal b/dh_usrlocal
index da70949182e64a8e50ef132584411ac32b649015..db7dfcd8b25b0b6d14bcdf7431cac54ea172ffc8 100755 (executable)
--- a/dh_usrlocal
+++ b/dh_usrlocal
@@ -24,7 +24,8 @@ that will provide a subdirectory in /usr/local when installed.
 It finds subdirectories of usr/local in the package build directory, and
 removes them, replacing them with maintainer script snippets (unless B<-n>
 is used) to create the directories at install time, and remove them when
 It finds subdirectories of usr/local in the package build directory, and
 removes them, replacing them with maintainer script snippets (unless B<-n>
 is used) to create the directories at install time, and remove them when

-the package is removed, in a manner compliant with Debian policy. See
+the package is removed, in a manner compliant with Debian policy. These
+snippets are inserted into the maintainer scripts by dh_installdeb. See

 L<dh_installdeb(1)> for an explanation of Debhelper maintainer script
 snippets.
 
 L<dh_installdeb(1)> for an explanation of Debhelper maintainer script
 snippets.
 


@@ -47,7 +48,7 @@ Do not modify F<postinst>/F<prerm> scripts.
 
 =head1 NOTES
 
 
 =head1 NOTES
 

-Note that this command is not idempotent. "dh_clean -k" should be called
+Note that this command is not idempotent. L<dh_prep(1)> should be called

 between invocations of this command. Otherwise, it may cause multiple
 instances of the same text to be added to maintainer scripts.
 
 between invocations of this command. Otherwise, it may cause multiple
 instances of the same text to be added to maintainer scripts.
 


@@ -99,12 +100,13 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                # This constructs the body of a 'sed' c\ expression which
                # is parsed by the shell in double-quotes
                my $dirs = join("$ebs\n", @dirs);
                # This constructs the body of a 'sed' c\ expression which
                # is parsed by the shell in double-quotes
                my $dirs = join("$ebs\n", @dirs);

+               pop @justdirs; # don't remove directories directly in /usr/local

                my $justdirs = join("$ebs\n", @justdirs);
                if (! $dh{NOSCRIPTS}) { 
                        autoscript($package,"postinst", "postinst-usrlocal",
                                   "/#DIRS#/ c${ebs}\n${dirs}");
                        autoscript($package,"prerm", "prerm-usrlocal",
                my $justdirs = join("$ebs\n", @justdirs);
                if (! $dh{NOSCRIPTS}) { 
                        autoscript($package,"postinst", "postinst-usrlocal",
                                   "/#DIRS#/ c${ebs}\n${dirs}");
                        autoscript($package,"prerm", "prerm-usrlocal",

-                                  "/#JUSTDIRS#/ c${ebs}\n${justdirs}");
+                                  "/#JUSTDIRS#/ c${ebs}\n${justdirs}") if length $justdirs;

                }
        }
 }
                }
        }
 }