r508: * Typo, Closes: #132454

   * Ignore leading/trailing whitespace in DH_OPTIONS, Closes: #132645

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index a21db5da15ea162bb8d9f3f54c0863d7e09eb462..ea4046a3ba12334f7467bfd156fcaf9c72540ec1 100644 (file)
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -19,6 +19,9 @@ my $max_compat=4;
 sub init {
        # If DH_OPTIONS is set, prepend it @ARGV.
        if (defined($ENV{DH_OPTIONS})) {
+               # Ignore leading/trailing whitespace.
+               $ENV{DH_OPTIONS}=~s/^\s+//;
+               $ENV{DH_OPTIONS}=~s/\s+$//;
                unshift @ARGV,split(/\s+/,$ENV{DH_OPTIONS});
        }
 

diff --git a/debian/changelog b/debian/changelog
index 6fb86b4369098fa14cc14dc4d6b705d5d35b8484..449903716f8b0eaa80d4f546eef586340531dad4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (3.4.6) unstable; urgency=low
+
+  * Typo, Closes: #132454
+  * Ignore leading/trailing whitespace in DH_OPTIONS, Closes: #132645
+
+ -- Joey Hess <joeyh@debian.org>  Tue,  5 Feb 2002 17:33:57 -0500
+
 debhelper (3.4.5) unstable; urgency=low
 
   * dh_installxfonts: separate multiple commands with \n so sed doesn't get

diff --git a/dh_installman b/dh_installman
index d61a2fa3240e24e5d4f8164a45e74682536a367e..e558f266bd23f314d2e4d4599db67eb5b1173200 100755 (executable)
--- a/dh_installman
+++ b/dh_installman
@@ -24,7 +24,7 @@ extension. It also supports translated man pages, by looking for extensions
 like .ll.8 and .ll_LL.8
 
 If dh_installman seems to install a man page into the wrong section or with
-the wrong extension, this is because the man page has thw wrong section
+the wrong extension, this is because the man page has the wrong section
 listed in its .TH line. Edit the man page and correct the section, and
 dh_installman will follow suit.  See to L<man(7)> for details about the .TH
 section.