=== modified file 'debian/changelog'
--- debian/changelog	2012-12-17 15:01:29 +0000
+++ debian/changelog	2013-08-16 21:47:28 +0000
@@ -1,3 +1,32 @@
+dpkg-cross (2.6.11ubuntu1) saucy; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - dpkg-cross:
+      + Handle datarootdir specially in .pc files; it should keep the original
+        prefix.
+      + Handle lines containing '${exec_prefix}/bin' specially in .pc files;
+        these are normally development tools, so should keep the original
+        prefix.  (For example, orbit_idl in ORBit-2.0.pc.)
+      + Assume multiarch if encoutering a /usr/include/$crosstype/ file too.
+        This fixes issues with arch-qualified include files being moved to
+        “doubly-qualified” paths.
+      + Handle biarch linker scripts
+
+ -- Jackson Doak <noskcaj@ubuntu.com>  Sat, 17 Aug 2013 07:40:29 +1000
+
+dpkg-cross (2.6.11) unstable; urgency=low
+
+  * Upload changes from experimental to unstable.
+
+ -- Neil Williams <codehelp@debian.org>  Fri, 24 May 2013 20:28:54 +0100
+
+dpkg-cross (2.6.10) experimental; urgency=low
+
+  * Fix include directories in cflags values of pkg-config files
+    (Closes: #697695)
+
+ -- Neil Williams <codehelp@debian.org>  Thu, 21 Mar 2013 17:42:37 +0000
+
 dpkg-cross (2.6.9ubuntu2) raring; urgency=low
 
   * Handle biarch linker scripts - LP: #1090800

=== modified file 'debian/control'
--- debian/control	2012-08-15 01:10:10 +0000
+++ debian/control	2013-08-16 21:47:28 +0000
@@ -10,9 +10,9 @@
  NIIBE Yutaka <gniibe@fsij.org>,
  Neil Williams <codehelp@debian.org>
 Build-Depends: cdbs, debhelper (>> 5), po-debconf
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://dpkg-cross.alioth.debian.org/
-Vcs-Browser: http://www.emdebian.org/svn/browser/current/host/trunk/dpkg-cross/trunk/
+Vcs-Browser: http://www.emdebian.org/trac/browser/current/host/trunk/dpkg-cross/trunk/
 Vcs-SVN: http://www.emdebian.org/svn/current/host/trunk/dpkg-cross/trunk/
 
 Package: dpkg-cross

=== modified file 'dpkg-cross'
--- dpkg-cross	2012-12-17 15:01:29 +0000
+++ dpkg-cross	2013-08-16 21:47:28 +0000
@@ -11,7 +11,7 @@
 use strict;
 use warnings;
 use vars qw($verbose $str @removedeps $package %builds $arch $exclude
-@keepdeps $dpkg_statfile $progname $debname $anyway $cross2cross
+@keepdeps $dpkg_statfile $progname $debname $anyway $cross2cross $crosstype
 $crossdir $crosslib $crosslib64 $crosslib32 $crossinc $data $len
 $retval $dpkg_cmd $mode $pkg @exlist $conffile $removedeps $keepdeps
 $DPKGCROSSVERSION $keep_temp $msg $multiarchpackage $multiarch $multiarchconv);
@@ -513,7 +513,7 @@
 	if (defined ($control{'multi-arch'})) {
 		if ($multiarchconv) {
 			# Carry on and process file anyway if --convert-multiarch given
-			warn sprintf(_g("%s: Multi-Arch package detected; processing anyway as --convert-mulitarch specified.\n"), $progname);
+			warn sprintf(_g("%s: Multi-Arch package detected; processing anyway as --convert-multiarch specified.\n"), $progname);
 			$multiarchpackage=1;
 		} else {
 			my $output = basename ($package);
@@ -715,6 +715,11 @@
 			} elsif (/^includedir=/) {
 				my $inc = ($crossinc eq "$crossdir/include") ? "\${prefix}/include" : $crossinc;
 				s:\${(exec_)?prefix}/include:$inc:;
+				print TO "includedir=$inc\n";
+			} elsif (m#^Cflags:.*(-I/usr/include)#) {
+				# dpkg-cross unconditionally moves /usr/include to /usr/$host/include
+				# adapt pc file to match See bug #697695
+				s:-I/usr/include:-I/usr/$crosstype/include:;
 				print TO;
 			} else {
 				print TO;
@@ -725,7 +730,7 @@
 		return 1;
 	}
 	my $config = &get_config;
-	my $crosstype = `CC="" dpkg-architecture -f -a$arch -qDEB_HOST_GNU_TYPE 2> /dev/null`;
+	$crosstype = `CC="" dpkg-architecture -f -a$arch -qDEB_HOST_GNU_TYPE 2> /dev/null`;
 	chomp ($crosstype);
 	$crossinc = $$config{'crossinc'};
 	$crossdir = $$config{'crossdir'};