From a8beab40a352b7391453b795cbf97f019a8a5fe3 Mon Sep 17 00:00:00 2001
From: Frans Pop <fjp@debian.org>
Date: Wed, 16 Jan 2008 17:04:13 +0000
Subject: [PATCH] * start_new_disc: make multi-arch CD/DVDs and CD/DVDs that
 are not part of a   set (e.g. KDE/Xfce CDs) recognizable through info in
 .disk directory.

---
 debian/changelog     |  4 +++-
 tools/start_new_disc | 31 ++++++++++++++++++++++---------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9906ccf7..b7c5a1f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -71,11 +71,13 @@ debian-cd (3.0.4) UNRELEASED; urgency=low
   * During installation debootstrap will complain about an invalid Release file
     if there is no Packages file for the local section. Create an empty Packages
     file if one is missing.
+  * start_new_disc: make multi-arch CD/DVDs and CD/DVDs that are not part of a
+    set (e.g. KDE/Xfce CDs) recognizable through info in .disk directory.
 
   [ Steve McIntyre ]
   * Significant cleanup of list2cds. Closes: #451237
 
- -- Frans Pop <fjp@debian.org>  Mon, 17 Dec 2007 21:54:11 +0100
+ -- Frans Pop <fjp@debian.org>  Wed, 16 Jan 2008 17:47:37 +0100
 
 debian-cd (3.0.3) unstable; urgency=low
 
diff --git a/tools/start_new_disc b/tools/start_new_disc
index 58ce4a8a..16eba7e4 100755
--- a/tools/start_new_disc
+++ b/tools/start_new_disc
@@ -128,15 +128,28 @@ if [ $DISKNUM = 1 ] ; then
 	fi
 
 	echo "  Adding .disk/cd_type"
-    if [ "$COMPLETE"x = "1"x ]; then
-        if [ $DISKTYPE = DVD ]; then
-            echo "dvd" > $CDDIR/.disk/cd_type
-        else
-            echo "full_cd" > $CDDIR/.disk/cd_type
-        fi
-    else
-        echo "not_complete" > $CDDIR/.disk/cd_type
-    fi
+	if [ "$COMPLETE"x = "1"x ]; then
+            if [ $DISKTYPE = DVD ]; then
+		if [ $MAXCDS -eq 1 ]; then
+		    echo "dvd/single" > $CDDIR/.disk/cd_type
+		else
+		    echo "dvd" > $CDDIR/.disk/cd_type
+		fi
+	    else
+		if [ $MAXCDS -eq 1 ]; then
+		    echo "full_cd/single" > $CDDIR/.disk/cd_type
+		else
+		    echo "full_cd" > $CDDIR/.disk/cd_type
+		fi
+	    fi
+	else
+            echo "not_complete" > $CDDIR/.disk/cd_type
+	fi
+
+	if [ $NUM_ARCHES -gt 1 ]; then
+		echo "  Adding .disk/multi_arch"
+		touch $CDDIR/.disk/multi_arch
+	fi
 
 	echo "  Adding udeb/base includes/excludes"