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

[Andreas Moog]

[Colin Watson (cjwatson)]

Looks sensible to me. Thanks for dealing with this.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-14 12:17:13 +0000
+++ debian/changelog	2011-05-01 18:52:26 +0000
@@ -1,3 +1,10 @@
+klibc (1.5.20-1ubuntu7) oneiric; urgency=low
+
+  * debian/patches/multiarch-include-path: append -I/usr/include/<triplet>
+    instead of -I/usr/lib/klibc/include/<triplet> (LP: #775054)
+
+ -- Andreas Moog <[e-mail]>  Sun, 01 May 2011 20:30:30 +0200
+
 klibc (1.5.20-1ubuntu6) natty; urgency=low
 
   * debian/patches/multiarch-include-path: Include the multiarch include
 
=== modified file 'debian/patches/multiarch-include-path'
--- debian/patches/multiarch-include-path	2011-04-14 12:17:13 +0000
+++ debian/patches/multiarch-include-path	2011-05-01 18:52:26 +0000
@@ -31,7 +31,7 @@
  	     "-I${prefix}/${KCROSS}include");
  
 +if ($multiarch_path ne '') {
-+	unshift(@includes, "-I${prefix}/${KCROSS}include/${multiarch_path}");
++	unshift(@includes, "-I/usr/${KCROSS}include/${multiarch_path}");
 +}
 +
  # Default optimization options (for compiles without -g)
 
=== modified file 'klcc/klcc.in'
--- klcc/klcc.in	2011-04-14 12:17:13 +0000
+++ klcc/klcc.in	2011-05-01 18:52:26 +0000
@@ -8,7 +8,7 @@
 	     "-I${prefix}/${KCROSS}include");
 
 if ($multiarch_path ne '') {
-	unshift(@includes, "-I${prefix}/${KCROSS}include/${multiarch_path}");
+	unshift(@includes, "-I/usr/${KCROSS}include/${multiarch_path}");
 }
 
 # Default optimization options (for compiles without -g)