From 46b72b659b15f188bf5691628a221460d411d216 Mon Sep 17 00:00:00 2001
From: codehelp <codehelp@debian.org>
Date: Fri, 1 Apr 2011 21:45:11 +0000
Subject: [PATCH] Initial support for Multi-Arch paths. (Closes: #616111)

git-svn-id: http://emdebian.org/svn/current@7971 563faec7-e20c-0410-992a-a66f704d0ccd
---
 debian/changelog |  3 ++-
 multistrap       | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 519183e..af2872b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,9 @@ multistrap (2.1.13) unstable; urgency=low
     breakage if the repository is incomplete.
   * Complete the support for 'flat' repositories (Closes: #619959)
   * Update config files for build and cross chroot (Closes: #610631)
+  * Initial support for Multi-Arch paths. (Closes: #616111)
 
- -- Neil Williams <codehelp@debian.org>  Fri, 01 Apr 2011 20:15:06 +0100
+ -- Neil Williams <codehelp@debian.org>  Fri, 01 Apr 2011 22:44:10 +0100
 
 multistrap (2.1.12) unstable; urgency=low
 
diff --git a/multistrap b/multistrap
index 215b2bc..ca394c3 100755
--- a/multistrap
+++ b/multistrap
@@ -524,9 +524,15 @@ sub force_unpack {
 		my $ver=`LC_ALL=C dpkg -f ./${cachedir}archives/$deb Version`;
 		my $pkg=`LC_ALL=C dpkg -f ./${cachedir}archives/$deb Package`;
 		my $src=`LC_ALL=C dpkg -f ./${cachedir}archives/$deb Source`;
+		my $multi=`LC_ALL=C dpkg -f ./${cachedir}archives/$deb Multi-Arch`;
 		chomp ($ver);
 		chomp ($pkg);
 		chomp ($src);
+		chomp ($multi);
+		if ($multi eq "same") {
+			$multi=":".`LC_ALL=C dpkg -f ./${cachedir}archives/$deb Architecture`;
+			chomp ($multi);
+		}
 		$src =~ s/ \(.*\)//;
 		push @dsclist, $src;
 		mkdir ("./tmp");
@@ -540,7 +546,7 @@ sub force_unpack {
 			next;
 		}
 		my @lines = split("\n", $datatar);
-		open (LIST, ">>./${dpkgdir}info/${pkg}.list");
+		open (LIST, ">>./${dpkgdir}info/${pkg}${multi}.list");
 		foreach my $l (@lines) {
 			chomp ($l);
 			$l =~ s:^\.::;
@@ -556,9 +562,9 @@ sub force_unpack {
 		open (AVAIL, ">>./${dpkgdir}available");
 		open (STATUS, ">>./${dpkgdir}status");
 		foreach my $mscript (@maint) {
-			rename "./${tmpdir}/$mscript", "./${dpkgdir}info/$pkg.$mscript";
+			rename "./${tmpdir}/$mscript", "./${dpkgdir}info/$pkg${multi}.$mscript";
 			if ( $mscript eq "control" ) {
-				open (MSCRIPT, "./${dpkgdir}info/$pkg.$mscript");
+				open (MSCRIPT, "./${dpkgdir}info/$pkg${multi}.$mscript");
 				my @scr=<MSCRIPT>;
 				close (MSCRIPT);
 				my @avail = grep(!/^$/, @scr);
@@ -570,10 +576,10 @@ sub force_unpack {
 			}
 		}
 		close (AVAIL);
-		if ( -f "./${dpkgdir}info/$pkg.conffiles") {
+		if ( -f "./${dpkgdir}info/$pkg${multi}.conffiles") {
 			print STATUS "Conffiles:\n";
 			printf (_g(" -> Processing conffiles for %s\n"), $pkg);
-			open (CONF, "./${dpkgdir}info/$pkg.conffiles");
+			open (CONF, "./${dpkgdir}info/$pkg${multi}.conffiles");
 			my @lines=<CONF>;
 			close (CONF);
 			foreach my $line (@lines) {
@@ -704,6 +710,7 @@ sub check_bin_sh {
 	# (always expects a diversion to already exist).
 	# (works OK in subsequent upgrades.) #546528
 	unlink ("$dir/var/lib/dpkg/info/dash.postinst");
+	unlink ("$dir/var/lib/dpkg/info/dash:${host}.postinst");
 	# now ensure that a usable shell is available as /bin/sh
 	if (not -l "$dir/bin/sh") {
 		print (_g("I: ./bin/sh symbolic link does not exist.\n"));