Merge lp:~ampelbein/ubuntu/oneiric/klibc/lp-775054 into lp:ubuntu/oneiric/klibc

Proposed by Andreas Moog on 2011-05-01
Status: Merged
Merged at revision: 47
Proposed branch: lp:~ampelbein/ubuntu/oneiric/klibc/lp-775054
Merge into: lp:ubuntu/oneiric/klibc
Diff against target: 40 lines (+9/-2)
3 files modified
debian/changelog (+7/-0)
debian/patches/multiarch-include-path (+1/-1)
klcc/klcc.in (+1/-1)
To merge this branch: bzr merge lp:~ampelbein/ubuntu/oneiric/klibc/lp-775054
Reviewer Review Type Date Requested Status
Colin Watson 2011-05-01 Approve on 2011-05-04
Review via email: mp+59624@code.launchpad.net
To post a comment you must log in.
Colin Watson (cjwatson) wrote :

Looks sensible to me. Thanks for dealing with this.

review: Approve

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 2011-04-14 12:17:13 +0000
3+++ debian/changelog 2011-05-01 18:52:26 +0000
4@@ -1,3 +1,10 @@
5+klibc (1.5.20-1ubuntu7) oneiric; urgency=low
6+
7+ * debian/patches/multiarch-include-path: append -I/usr/include/<triplet>
8+ instead of -I/usr/lib/klibc/include/<triplet> (LP: #775054)
9+
10+ -- Andreas Moog <amoog@ubuntu.com> Sun, 01 May 2011 20:30:30 +0200
11+
12 klibc (1.5.20-1ubuntu6) natty; urgency=low
13
14 * debian/patches/multiarch-include-path: Include the multiarch include
15
16=== modified file 'debian/patches/multiarch-include-path'
17--- debian/patches/multiarch-include-path 2011-04-14 12:17:13 +0000
18+++ debian/patches/multiarch-include-path 2011-05-01 18:52:26 +0000
19@@ -31,7 +31,7 @@
20 "-I${prefix}/${KCROSS}include");
21
22 +if ($multiarch_path ne '') {
23-+ unshift(@includes, "-I${prefix}/${KCROSS}include/${multiarch_path}");
24++ unshift(@includes, "-I/usr/${KCROSS}include/${multiarch_path}");
25 +}
26 +
27 # Default optimization options (for compiles without -g)
28
29=== modified file 'klcc/klcc.in'
30--- klcc/klcc.in 2011-04-14 12:17:13 +0000
31+++ klcc/klcc.in 2011-05-01 18:52:26 +0000
32@@ -8,7 +8,7 @@
33 "-I${prefix}/${KCROSS}include");
34
35 if ($multiarch_path ne '') {
36- unshift(@includes, "-I${prefix}/${KCROSS}include/${multiarch_path}");
37+ unshift(@includes, "-I/usr/${KCROSS}include/${multiarch_path}");
38 }
39
40 # Default optimization options (for compiles without -g)

Subscribers

People subscribed via source and target branches

to all changes: