[debhelper-devel] [Git][debian/debhelper][master] dh_install{docs, examples, info, man}: Add missing compat 11 documentation

Sun Feb 4 18:06:42 UTC 2018

Niels Thykier pushed to branch master at Debian / debhelper


Commits:
7d61a59f by Niels Thykier at 2018-02-04T18:05:03+00:00
dh_install{docs,examples,info,man}: Add missing compat 11 documentation

Signed-off-by: Niels Thykier <niels at thykier.net>

- - - - -


6 changed files:

- debian/changelog
- dh_install
- dh_installdocs
- dh_installexamples
- dh_installinfo
- dh_installman


Changes:

=====================================
debian/changelog
=====================================

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+debhelper (11.1.5) UNRELEASED; urgency=medium
+
+  * dh_installdocs: Add missing documentation about --sourcedir
+    in compat 11.
+  * dh_installdocs: Document that d/tmp is used by default
+    in compat 11.
+  * dh_installexamples: Ditto.
+  * dh_installinfo: Ditto.
+  * dh_installman: Ditto.
+
+ -- Niels Thykier <niels at thykier.net>  Sun, 04 Feb 2018 18:03:34 +0000
+
 debhelper (11.1.4) unstable; urgency=medium
 
   * qmake.pm/qmake4.pm: Avoid global state in the build systems.


=====================================
dh_install
=====================================
--- a/dh_install
+++ b/dh_install
@@ -34,7 +34,7 @@ F<Makefile> to install it all into F<debian/tmp>, and then use B<dh_install> to 
 directories and files from there into the proper package build directories.
 
 From debhelper compatibility level 7 on, B<dh_install> will fall back to
-looking in F<debian/tmp> for files, if it doesn't find them in the current
+looking in F<debian/tmp> for files, if it does not find them in the current
 directory (or wherever you've told it to look using B<--sourcedir>).
 
 =head1 FILES


=====================================
dh_installdocs
=====================================
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -28,6 +28,10 @@ the upstream documentation, when upstream's own build system installs all the de
 correctly.  In this case, B<dh_installdocs> is still useful for installing
 packaging related documentation (e.g. the F<debian/copyright> file).
 
+From debhelper compatibility level 11 on, B<dh_install> will fall back to
+looking in F<debian/tmp> for files, if it does not find them in the current
+directory (or wherever you've told it to look using B<--sourcedir>).
+
 In compat 11 and later, B<dh_installdocs> offers many of the features that
 L<dh_install(1)> also have.  Furthermore, B<dh_installdocs> also supports
 the B<nodoc> build profile to exclude documentation (regardless of compat
@@ -97,6 +101,16 @@ acted on.
 Exclude files that contain I<item> anywhere in their filename from
 being installed. Note that this includes doc-base files.
 
+=item B<--sourcedir=>I<dir>
+
+Look in the specified directory for files to be installed.  This option
+requires compat 11 or later (it is silently ignored in compat 10 or earlier).
+
+Note that this is not the same as the B<--sourcedirectory> option used
+by the B<dh_auto_>I<*> commands. You rarely need to use this option, since
+B<dh_installman> automatically looks for files in F<debian/tmp> in debhelper
+compatibility level 11 and above.
+
 =item B<--doc-main-package=>I<main-package>
 
 Set the main package for a documentation package.  This is used to


=====================================
dh_installexamples
=====================================
--- a/dh_installexamples
+++ b/dh_installexamples
@@ -24,6 +24,10 @@ B<dh_installexamples> is a debhelper program that is responsible for
 installing examples into F<usr/share/doc/package/examples> in package
 build directories.
 
+From debhelper compatibility level 11 on, B<dh_install> will fall back to
+looking in F<debian/tmp> for files, if it does not find them in the current
+directory (or wherever you've told it to look using B<--sourcedir>).
+
 =head1 FILES
 
 =over 4


=====================================
dh_installinfo
=====================================
--- a/dh_installinfo
+++ b/dh_installinfo
@@ -21,6 +21,10 @@ B<dh_installinfo> [S<I<debhelper options>>] [B<-A>] [S<I<file> ...>]
 B<dh_installinfo> is a debhelper program that is responsible for installing
 info files into F<usr/share/info> in the package build directory.
 
+From debhelper compatibility level 11 on, B<dh_install> will fall back to
+looking in F<debian/tmp> for files, if it does not find them in the current
+directory (or wherever you've told it to look using B<--sourcedir>).
+
 =head1 FILES
 
 =over 4


=====================================
dh_installman
=====================================
--- a/dh_installman
+++ b/dh_installman
@@ -66,6 +66,10 @@ manual page and convert it to UTF-8. If the guesswork fails for some
 reason, you can override it using an encoding declaration. See
 L<manconv(1)> for details.
 
+From debhelper compatibility level 11 on, B<dh_install> will fall back to
+looking in F<debian/tmp> for files, if it does not find them in the current
+directory (or wherever you've told it to look using B<--sourcedir>).
+
 =head1 FILES
 
 =over 4



View it on GitLab: https://salsa.debian.org/debian/debhelper/commit/7d61a59ff0135e50c955a3b3162686f1d50d6ed3

---
View it on GitLab: https://salsa.debian.org/debian/debhelper/commit/7d61a59ff0135e50c955a3b3162686f1d50d6ed3
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debhelper-devel/attachments/20180204/3a82541f/attachment-0001.html>
