[debhelper-devel] [debhelper] 01/02: dh_{fixperms,usrlocal}: Assume less familarity with R³

[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 d7ec57e1b53d892ae4426515e56a203ce33454ce
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Oct 23 16:53:07 2017 +0000

    dh_{fixperms,usrlocal}: Assume less familarity with R³
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog |  5 ++++-
 dh_fixperms      | 21 +++++++++++++--------
 dh_usrlocal      | 13 ++++++++-----
 3 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c36b4c2..c579d31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
 debhelper (10.10.3) UNRELEASED; urgency=medium
 
-  * dh_strip: Skip the entire directoru when an exclude rule
+  * dh_strip: Skip the entire directory when an exclude rule
     parameter matches it.
+  * dh_fixperms: Improve the documentation to assume less familarity
+    with "Rules-Requires-Root" (R³).
+  * dh_usrlocal: Ditto.
 
  -- Niels Thykier <niels at thykier.net>  Mon, 23 Oct 2017 06:14:30 +0000
 
diff --git a/dh_fixperms b/dh_fixperms
index d3bbec0..393381f 100755
--- a/dh_fixperms
+++ b/dh_fixperms
@@ -23,14 +23,19 @@ B<dh_fixperms> is a debhelper program that is responsible for setting the
 permissions of files and directories in package build directories to a
 sane state -- a state that complies with Debian policy.
 
-B<dh_fixperms> makes all files in F<usr/share/doc> in the package build directory
-(excluding files in the F<examples/> directory) be mode 644. It also changes
-the permissions of all man pages to mode 644. It makes all files be owned
-by root, and it removes group and other write permission from all files. It
-removes execute permissions from any libraries, headers, Perl modules, or
-desktop files that have it set. It makes all files in the standard F<bin> and
-F<sbin> directories, F<usr/games/> and F<etc/init.d> executable (since v4). Finally,
-it removes the setuid and setgid bits from all files in the package.
+B<dh_fixperms> makes all files in F<usr/share/doc> in the package
+build directory (excluding files in the F<examples/> directory) be
+mode 644. It also changes the permissions of all man pages to mode
+644. It removes group and other write permission from all files. It
+removes execute permissions from any libraries, headers, Perl modules,
+or desktop files that have it set. It makes all files in the standard
+F<bin> and F<sbin> directories, F<usr/games/> and F<etc/init.d>
+executable (since v4). Finally, it removes the setuid and setgid bits
+from all files in the package.
+
+When the I<Rules-Requires-Root> field has the (effective) value of
+I<binary-targets>, B<dh_fixperms> will also reset the ownership of
+all paths to "root:root".
 
 =head1 OPTIONS
 
diff --git a/dh_usrlocal b/dh_usrlocal
index f69449e..5045ae6 100755
--- a/dh_usrlocal
+++ b/dh_usrlocal
@@ -33,15 +33,18 @@ snippets are inserted into the maintainer scripts by B<dh_installdeb>. See
 L<dh_installdeb(1)> for an explanation of debhelper maintainer script
 snippets.
 
-In a non-legacy R³ build, the directories in F</usr/local> will have
+When the I<Rules-Requires-Root> field is not (effectively)
+I<binary-targets>, the directories in F</usr/local> will have
 ownership root:staff and the mode will be 02775.  These values have
 been chosen to comply with the recommendations of the Debian policy
 for directories in F</usr/local>.
 
-In R³ legacy mode, the owners, groups and permissions will be preserved with
-one exception.  If the directory is owned by root:root, then ownership will
-be reset to root:staff and mode will be reset to 02775. This is useful, since
-that is the group and mode policy recommends for directories in F</usr/local>.
+When I<Rules-Requires-Root> has an effective value of
+I<binary-targets>, the owners, groups and permissions will be
+preserved with one exception.  If the directory is owned by root:root,
+then ownership will be reset to root:staff and mode will be reset to
+02775. This is useful, since that is the group and mode policy
+recommends for directories in F</usr/local>.
 
 =head1 OPTIONS
 

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