Merge lp:~geser/pkg-create-dbgsym/strip_-O_some_more into lp:pkg-create-dbgsym

Proposed by Michael Bienia
Status: Merged
Merged at revision: not available
Proposed branch: lp:~geser/pkg-create-dbgsym/strip_-O_some_more
Merge into: lp:pkg-create-dbgsym
Diff against target: 28 lines (+9/-1)
2 files modified
debian/changelog (+7/-0)
dh_strip (+2/-1)
To merge this branch: bzr merge lp:~geser/pkg-create-dbgsym/strip_-O_some_more
Reviewer Review Type Date Requested Status
Martin Pitt Pending
Review via email: mp+22977@code.launchpad.net

Description of the change

dh_strip stripped -O from the passed dh options only for comparison in the case statement but used the unstripped value (including the -O) afterwards.

This branch uses the stripped value for comparison and later usage.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2010-02-15 11:22:10 +0000
+++ debian/changelog 2010-04-07 21:08:14 +0000
@@ -1,3 +1,10 @@
1pkg-create-dbgsym (0.40) UNRELEASED; urgency=low
2
3 * Strip -O from options passed from dh not only for comparison but also for
4 processing them.
5
6 -- Michael Bienia <geser@ubuntu.com> Wed, 07 Apr 2010 22:59:48 +0200
7
1pkg-create-dbgsym (0.39) lucid; urgency=low8pkg-create-dbgsym (0.39) lucid; urgency=low
29
3 * Strip -O from options passed from dh (LP: #520767).10 * Strip -O from options passed from dh (LP: #520767).
411
=== modified file 'dh_strip'
--- dh_strip 2010-02-15 10:15:01 +0000
+++ dh_strip 2010-04-07 21:08:14 +0000
@@ -108,7 +108,8 @@
108 continue108 continue
109 fi109 fi
110110
111 case "${p#-O}" in111 p=${p#-O}
112 case "$p" in
112 -i|--indep)113 -i|--indep)
113 unset actpkgs114 unset actpkgs
114 optsel=1115 optsel=1

Subscribers

People subscribed via source and target branches

to all changes: