summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rwxr-xr-xdh9
2 files changed, 11 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index be0ac27c..0203c222 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (7.4.11) UNRELEASED; urgency=low
+
+ * dh(1): Minor rewording of documentation of override commands.
+ Closes: #560421
+
+ -- Joey Hess <joeyh@debian.org> Mon, 14 Dec 2009 19:23:25 -0500
+
debhelper (7.4.10) unstable; urgency=low
* Add --parallel option that can be used to enable parallel building
diff --git a/dh b/dh
index 11fb27b4..dc588e21 100755
--- a/dh
+++ b/dh
@@ -35,11 +35,10 @@ in the sequence. The B<--until>, B<--before>, B<--after>, and B<--remaining>
options can override this behavior.
If debian/rules contains a target with a name like "override_I<dh_command>",
-then when it gets to that command in the sequence, dh will run that
-target from the rules file, rather than running the actual command. The
-override target can then run the command with additional options, or run
-entirely different commands instead. (Note that to use this feature,
-you should Build-Depend on debhelper 7.0.50 or above.)
+then when it would notmally run I<dh_command>, dh will instead call that
+target. The override target can then run the command with additional options,
+or run entirely different commands instead. See examples below. (Note that to
+use this feature, you should Build-Depend on debhelper 7.0.50 or above.)
=head1 OPTIONS