pkg-create-dbgsym

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

  1. strip_-O_some_more
  2. Merge into ubuntu
Proposed by Michael Bienia on 2010-04-07
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 2010-04-07 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
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-02-15 11:22:10 +0000
3+++ debian/changelog 2010-04-07 21:08:14 +0000
4@@ -1,3 +1,10 @@
5+pkg-create-dbgsym (0.40) UNRELEASED; urgency=low
6+
7+ * Strip -O from options passed from dh not only for comparison but also for
8+ processing them.
9+
10+ -- Michael Bienia <geser@ubuntu.com> Wed, 07 Apr 2010 22:59:48 +0200
11+
12 pkg-create-dbgsym (0.39) lucid; urgency=low
13
14 * Strip -O from options passed from dh (LP: #520767).
15
16=== modified file 'dh_strip'
17--- dh_strip 2010-02-15 10:15:01 +0000
18+++ dh_strip 2010-04-07 21:08:14 +0000
19@@ -108,7 +108,8 @@
20 continue
21 fi
22
23- case "${p#-O}" in
24+ p=${p#-O}
25+ case "$p" in
26 -i|--indep)
27 unset actpkgs
28 optsel=1

Subscribers

People subscribed via source and target branches

to all changes: