From 2a63b8a701902c7ba300589a0a1d66cd059a886e Mon Sep 17 00:00:00 2001
From: codehelp <codehelp@debian.org>
Date: Sat, 30 Jul 2011 09:06:52 +0000
Subject: [PATCH] Package an example of multiarch support.

git-svn-id: http://emdebian.org/svn/current@8058 563faec7-e20c-0410-992a-a66f704d0ccd
---
 debian/changelog          |  3 ++-
 debian/multistrap.install |  1 +
 examples/multiarch.conf   | 19 +++++++++----------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ae1f6b3..00955bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ multistrap (2.1.16) unstable; urgency=low
   * Allow multiple keyring packages to be imported. (Closes: #635584)
   * Add support for shortcuts to use configuration files in known
     locations like /usr/share/multistrap and /etc/multistrap.d/
+  * Package an example of multiarch support.
 
- -- Neil Williams <codehelp@debian.org>  Sat, 30 Jul 2011 09:38:38 +0200
+ -- Neil Williams <codehelp@debian.org>  Sat, 30 Jul 2011 11:06:47 +0200
 
 multistrap (2.1.15) unstable; urgency=low
 
diff --git a/debian/multistrap.install b/debian/multistrap.install
index fd05517..bfd7fe7 100644
--- a/debian/multistrap.install
+++ b/debian/multistrap.install
@@ -2,6 +2,7 @@ multistrap ./usr/sbin/
 doc/multistrap/man/* ./usr/share/man/
 examples/device_table.txt ./usr/share/doc/multistrap/examples/
 examples/multistrap-example.conf ./usr/share/doc/multistrap/examples/
+examples/multiarch.conf ./usr/share/doc/multistrap/examples/
 examples/setup.sh ./usr/share/doc/multistrap/examples/
 examples/config.sh ./usr/share/doc/multistrap/examples/
 examples/sid.conf ./usr/share/multistrap/
diff --git a/examples/multiarch.conf b/examples/multiarch.conf
index e590a7a..badd6cd 100644
--- a/examples/multiarch.conf
+++ b/examples/multiarch.conf
@@ -8,25 +8,25 @@ cleanup=true
 # same as --no-auth option if set to true
 # keyring packages listed in each debootstrap will
 # still be installed.
-noauth=false
+noauth=true
 # whether to add the /suite to be explicit about where apt
 # needs to look for packages. Default is false.
 explicitsuite=false
 # extract all downloaded archives (default is true)
 unpack=true
 # enable MultiArch for the specified architectures
-multiarch=armel armhf
+multiarch=armel mipsel
 # the order of sections is not important.
 # the debootstrap option determines which repository
 # is used to calculate the list of Priority: required packages.
-debootstrap=Debian Foreign ForeignFloat
+debootstrap=Debian Foreign Test
 aptsources=Debian
 
 [Debian]
 packages=apt
 source=http://ftp.uk.debian.org/debian
 keyring=debian-archive-keyring
-suite=sid
+suite=wheezy
 
 [Foreign]
 packages=libgcc1
@@ -34,11 +34,10 @@ packages=libc6
 architecture=armel
 source=http://ftp.uk.debian.org/debian
 keyring=debian-archive-keyring
-suite=sid
+suite=wheezy
 
-[ForeignFloat]
-packages=libgcc1 libc6
-architecture=armhf
-source=http://ftp.uk.debian.org/debian
-keyring=debian-archive-keyring
+[Test]
+packages=
+source=http://ftp.uk.debian.org/emdebian-multiarch/
+keyring=
 suite=sid