[debhelper-devel] [debhelper] 01/01: Add DH_EXTRA_ADDONS env variable to specify local addons.
Niels Thykier
nthykier at moszumanska.debian.org
Fri Dec 29 12:56:13 UTC 2017
This is an automated email from the git hooks/post-receive script.
nthykier pushed a commit to branch master
in repository debhelper.
commit 6bd40b18f8fbe69e2f5b0f3f2dd2795f78b2f042
Author: Paul Tagliamonte <paultag at debian.org>
Date: Tue Dec 12 23:35:39 2017 -0500
Add DH_EXTRA_ADDONS env variable to specify local addons.
This is intended to be used by downstreams or specific local configurations
that require a debhelper addon to be run during multiple builds without
having to patch a large number of rules file. If at all possible, this should
be avoided in favor of a --with flag in the rules file.
Signed-off-by: Niels Thykier <niels at thykier.net>
---
debhelper.pod | 12 ++++++++++++
debian/changelog | 8 +++++++-
dh | 1 +
3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/debhelper.pod b/debhelper.pod
index dd73c3f..4cb1825 100644
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -958,6 +958,18 @@ your package is built.
Multiple things to exclude can be separated with colons, as in
B<DH_ALWAYS_EXCLUDE=CVS:.svn>
+=item B<DH_EXTRA_ADDONS>
+
+If set, this adds the specified dh addons to be run in the appropriate places
+in the sequence of commands. This is equivalent to specifying the addon to run
+with the --with flag in the debian/rules file. Any --without calls specifying
+an addon in this environment variable will not be run.
+
+This is intended to be used by downstreams or specific local configurations
+that require a debhelper addon to be run during multiple builds without
+having to patch a large number of rules file. If at all possible, this should
+be avoided in favor of a --with flag in the rules file.
+
=back
=head1 SEE ALSO
diff --git a/debian/changelog b/debian/changelog
index e562889..d49f271 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-debhelper (11.0.1) UNRELEASED; urgency=medium
+debhelper (11.1) UNRELEASED; urgency=medium
+
+ [ Paul Tagliamonte ]
+ * dh: Provide the DH_EXTRA_ADDONS environment as a method for
+ e.g. derivatives to enable additional debhelper add-ons.
+ It is *not* a replacement for the --with parameter (which
+ package maintainers should still use). (Closes: #570935)
[ Hideki Yamane ]
* Fix typo of unnecessary. (Closes: #884574)
diff --git a/dh b/dh
index 3d26826..344d4e9 100755
--- a/dh
+++ b/dh
@@ -303,6 +303,7 @@ if (not compat(9, 1)) {
unshift(@ARGV, "--with=build-stamp");
}
+push @{$dh{WITH}},split(",", $ENV{DH_EXTRA_ADDONS});
inhibit_log();
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git
More information about the debhelper-devel
mailing list