r408: * Fixed a man page typo, Closes: #82371:

   * Added note to dh_strip man page, Closes: #82220

3 files changed, 12 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 670a257e..fa495347 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (2.2.13) unstable; urgency=medium
+
+  * Fixed a man page typo, Closes: #82371:
+  * Added note to dh_strip man page, Closes: #82220
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 15 Jan 2001 20:38:53 -0800
+
 debhelper (2.2.12) unstable; urgency=medium
 
   * suidmanager is obsolete now, and so is dh_suidmanager. Instead,
diff --git a/dh_installmime.1 b/dh_installmime.1
index f7059fbe..2a825922 100644
--- a/dh_installmime.1
+++ b/dh_installmime.1
@@ -26,12 +26,12 @@ for a list of options common to all debhelper commands.
 Do not modify postinst/postrm scripts.
 .SH ENVIRONMENT
 See
+.BR debhelper (1)
+for a list of environment variables that affect all debhelper commands.
 .SH NOTES
 Note that this command is not idempotent. "dh_clean -k" should be called
 between invocations of this command. Otherwise, it may cause multiple
 instances of the same text to be added to maintainer scripts.
-.BR debhelper (1)
-for a list of environment variables that affect all debhelper commands.
 .SH "SEE ALSO"
 .TP
 .BR debhelper (1)
diff --git a/dh_strip.1 b/dh_strip.1
index cd967af1..74c6b751 100644
--- a/dh_strip.1
+++ b/dh_strip.1
@@ -26,6 +26,9 @@ things to exclude.
 See
 .BR debhelper (1)
 for a list of environment variables that affect all debhelper commands.
+.SH NOTES
+If the DEB_BUILD_OPTIONS environement variable contains "nostrip", nothing
+will be stripped, in accordance with Debian policy.
 .SH "SEE ALSO"
 .BR debhelper (1)
 .SH "CONFORMS TO"