[debhelper-devel] [debhelper] 01/01: Accept nodoc via DEB_BUILD_OPTIONS as well

[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 444460edb73e87bc34ab318f94baf1a80cc46f5f
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Aug 12 16:52:16 2017 +0000

    Accept nodoc via DEB_BUILD_OPTIONS as well
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog   | 7 +++++++
 dh_installdocs     | 2 +-
 dh_installexamples | 2 +-
 dh_installinfo     | 2 +-
 dh_installman      | 2 +-
 dh_installwm       | 2 +-
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fe924b3..f285248 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,13 @@ debhelper (10.7.3) UNRELEASED; urgency=medium
   * dh_gencontrol: Set the priority of all dbgsym packages to
     optional to be compliant with Standards-Version 4.0.1.
     Thanks to Mattia Rizzolo for the report.  (Closes: #870905)
+  * dh_installdocs: Accept "nodoc" via DEB_BUILD_OPTIONS as well.
+    Thanks to Sébastien Villemot for the suggestion.
+    (Closes: #866619)
+  * dh_installexamples: Ditto.
+  * dh_installinfo: Ditto.
+  * dh_installman: Ditto.
+  * dh_installwm: Ditto.
 
  -- Niels Thykier <niels at thykier.net>  Thu, 03 Aug 2017 19:30:01 +0000
 
diff --git a/dh_installdocs b/dh_installdocs
index 1bee66e..a94796e 100755
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -186,7 +186,7 @@ init(options => {
 
 my $called_getpackages = 0;
 my $default_error_handler = compat(10) ? \&glob_expand_error_handler_warn_and_discard : \&glob_expand_error_handler_reject;
-my $nodocs = is_build_profile_active('nodoc') ? 1 : 0;
+my $nodocs = is_build_profile_active('nodoc') || get_buildoption('nodoc') ? 1 : 0;
 # We cannot assume documentation is built under nodoc, but if it is we must flag it as handled
 # or dh_missing might make noise.
 $default_error_handler = \&glob_expand_error_handler_silently_ignore if $nodocs;
diff --git a/dh_installexamples b/dh_installexamples
index cb44b67..3b3d50b 100755
--- a/dh_installexamples
+++ b/dh_installexamples
@@ -79,7 +79,7 @@ init(options => {
 
 my $pwd;
 my $default_error_handler = compat(10) ? \&glob_expand_error_handler_warn_and_discard : \&glob_expand_error_handler_reject;
-my $nodocs = is_build_profile_active('nodoc') ? 1 : 0;
+my $nodocs = is_build_profile_active('nodoc') || get_buildoption('nodoc') ? 1 : 0;
 # We cannot assume documentation is built under nodoc, but if it is we must flag it as handled
 # or dh_missing might make noise.
 $default_error_handler = \&glob_expand_error_handler_silently_ignore if $nodocs;
diff --git a/dh_installinfo b/dh_installinfo
index 477d4c9..b401c9d 100755
--- a/dh_installinfo
+++ b/dh_installinfo
@@ -64,7 +64,7 @@ init();
 # PROMISE: DH NOOP WITHOUT info
 
 my $default_error_handler = compat(10) ? \&glob_expand_error_handler_warn_and_discard : \&glob_expand_error_handler_reject;
-my $nodocs = is_build_profile_active('nodoc') ? 1 : 0;
+my $nodocs = is_build_profile_active('nodoc') || get_buildoption('nodoc') ? 1 : 0;
 # We cannot assume documentation is built under nodoc, but if it is we must flag it as handled
 # or dh_missing might make noise.
 $default_error_handler = \&glob_expand_error_handler_silently_ignore if $nodocs;
diff --git a/dh_installman b/dh_installman
index 947abe6..c1583a7 100755
--- a/dh_installman
+++ b/dh_installman
@@ -142,7 +142,7 @@ my (@sofiles, @sodests);
 my @all_packages = getpackages();
 
 my $default_error_handler = compat(10) ? \&glob_expand_error_handler_warn_and_discard : \&glob_expand_error_handler_reject;
-my $nodocs = is_build_profile_active('nodoc') ? 1 : 0;
+my $nodocs = is_build_profile_active('nodoc') || get_buildoption('nodoc') ? 1 : 0;
 # We cannot assume documentation is built under nodoc, but if it is we must flag it as handled
 # or dh_missing might make noise.
 $default_error_handler = \&glob_expand_error_handler_silently_ignore if $nodocs;
diff --git a/dh_installwm b/dh_installwm
index 1be2500..bc68704 100755
--- a/dh_installwm
+++ b/dh_installwm
@@ -77,7 +77,7 @@ if (@ARGV) {
 	}
 }
 
-my $nodocs = is_build_profile_active('nodoc') ? 1 : 0;
+my $nodocs = is_build_profile_active('nodoc') || get_buildoption('nodoc') ? 1 : 0;
 
 # PROMISE: DH NOOP WITHOUT wm
 

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