diff options
| author | joey <joey> | 2002-02-06 22:21:41 +0000 |
|---|---|---|
| committer | joey <joey> | 2002-02-06 22:21:41 +0000 |
| commit | 5ed0df5cddd3bb2a52ca52d508409e09669af03e (patch) | |
| tree | 3c6b8e7e91c31be7dafdfe5134285bf1f8006926 | |
| parent | 7b3307a2faf0ab9dec667408a2d00d14fcd860c8 (diff) | |
| download | debhelper-5ed0df5cddd3bb2a52ca52d508409e09669af03e.tar.gz | |
r508: * Typo, Closes: #132454
* Ignore leading/trailing whitespace in DH_OPTIONS, Closes: #132645
| -rw-r--r-- | Debian/Debhelper/Dh_Lib.pm | 3 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | dh_installman | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm index a21db5da..ea4046a3 100644 --- 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 6fb86b43..44990371 100644 --- 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 d61a2fa3..e558f266 100755 --- 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. |