Bug#545464: dpkg-cross: updated patch

[Simon Richter <sjr@debian.org>]

Package: dpkg-cross
Severity: normal

here is an updated version of the patch.

Index: dpkg-cross
===================================================================
RCS file: /cvsroot/dpkg-cross/dpkg-cross/dpkg-cross,v
retrieving revision 1.72
diff -u -r1.72 dpkg-cross
--- dpkg-cross	10 Jun 2009 11:28:55 -0000	1.72
+++ dpkg-cross	11 Sep 2009 11:41:11 -0000
@@ -213,7 +213,7 @@
 use warnings;
 use vars qw($verbose $str @removedeps $package %builds $arch $exclude
 @keepdeps $dpkg_statfile $progname $debname $anyway $cross2cross
-$crossdir $crosslib $crosslib64 $crosslib32 $crossinc $data $len
+$crossdir $crosstype $crosslib $crosslib64 $crosslib32 $crossinc $data $len
 $retval $dpkg_cmd $mode $pkg @exlist $conffile $removedeps $keepdeps
 $DPKGCROSSVERSION $keep_temp);
 
@@ -716,6 +716,7 @@
 		return 1;
 	}
 	my $config = &get_config;
+	$crosstype = $$config{'crosstype'};
 	$crossinc = $$config{'crossinc'};
 	$crossdir = $$config{'crossdir'};
 	$crosslib = $$config{'crosslib'};
@@ -760,6 +761,10 @@
 			}
 			close(FROM);
 			close(TO);
+		} elsif (m:^/usr/include/$crosstype/:) {
+			link_file("$src$_", "$dst$_") or goto fail;
+		} elsif (m:^/usr/lib/$crosstype/:) {
+			link_file("$src$_", "$dst$_") or goto fail;
 		} elsif (m:^/usr(/X11R6)?/include/:) {
 			# regular file under /usr/include or /usr/X11R6/include
 			link_file("$src$_", "$dst$crossinc/$'") or goto fail;
Index: Debian/DpkgCross.pm
===================================================================
RCS file: /cvsroot/dpkg-cross/dpkg-cross/Debian/DpkgCross.pm,v
retrieving revision 1.45
diff -u -r1.45 DpkgCross.pm
--- Debian/DpkgCross.pm	1 Jun 2009 15:15:28 -0000	1.45
+++ Debian/DpkgCross.pm	11 Sep 2009 11:40:00 -0000
@@ -395,6 +395,7 @@
 
 	$crosslib64 ||= $crosslib . "64";
 	$crosslib32 ||= $crosslib . "32";
+	$config{'crosstype'} = $deb_host_gnu_type;
 	$config{'crossbase'} = $crossbase;
 	$config{'crossprefix'} = $crossprefix;
 	$config{'crossdir'} = $crossdir;
Index: debian/changelog
===================================================================
RCS file: /cvsroot/dpkg-cross/dpkg-cross/debian/changelog,v
retrieving revision 1.194
diff -u -r1.194 changelog
--- debian/changelog	2 Jul 2009 11:17:27 -0000	1.194
+++ debian/changelog	11 Sep 2009 12:40:09 -0000
@@ -1,3 +1,9 @@
+dpkg-cross (2.5.4) unstable; urgency=low
+
+  * Add support for multiarch paths (Closes: #545464)
+
+ -- Simon Richter <sjr@debian.org>  Fri, 11 Sep 2009 14:38:13 +0200
+
 dpkg-cross (2.5.3) unstable; urgency=low
 
   * Retain font metadata in /usr/share/fonts for xfonts-utils.