* Added some tasks-* package to the list of packages that should go

on the first CD.
* Make the second i386 CD bootable with the "compact" image.

debian/changelog

@@ -1,5 +1,6 @@
 debian-cd (2.1.92) unstable; urgency=low
 
+  * Make the second CD bootable on i386 with the "compact" image.
   * Changes to installtools.sh, change to check for documentation
     directory name by $ARCH.
     -> This change will have to be removed when all arch will have synced

tasks/Debian_potato

@@ -27,6 +27,20 @@ task-sgml-dev
 task-tcltk
 task-fortran
 task-objc-dev
+task-database-pg
+task-news-server
+task-x-window-system-core
+task-x-window-system
+task-dns-server
+task-imap
+task-science
+task-python
+task-python-dev
+task-python-bundle
+task-python-web
+task-tcltk-dev
+task-parallel-computing-node
+task-parallel-computing-dev
 
 /* Well I don't know if task for specific countries should be included
    on the first CD ... 
@@ -34,6 +48,7 @@ task-objc-dev
 */
    
 task-german
+task-spanish
 task-chinese-s
 task-chinese-t
 task-japanese

tools/boot/potato/boot-i386

@@ -18,20 +18,18 @@ BOOTDIR=
 
 cd $CDDIR/..
 
-# There's no more tecra disk in Debian potato
-# Tecra image for disk 2
-#if [ $N == 2 ]; then
-#	:> 2.mkisofs_opts
-#	if [ -e 1/dists/$CODENAME/main/disks-$ARCH/current/resc1440tecra.bin ] 
-#	then
-#		mkdir -p boot2/boot
-#		cp 1/dists/$CODENAME/main/disks-$ARCH/current/resc1440tecra.bin \
-#			boot2/boot
-#		echo -n "-J -b boot/resc1440tecra.bin -c boot/boot.catalog boot2" \
-#		        > 2.mkisofs_opts
-#	fi
-#	exit 0;
-#fi
+# Compact image for disk 2
+if [ $N == 2 ]; then
+	:> 2.mkisofs_opts
+	if [ -e 1/dists/$CODENAME/main/disks-$ARCH/current/disks-2.88/compact/rescue.bin ] 
+	then
+	  mkdir -p boot2/boot
+	  cp 1/dists/$CODENAME/main/disks-$ARCH/current/disks-2.88/compact/rescue.bin boot2/boot/
+	  echo -n "-J -b boot/rescue.bin -c boot/boot.catalog boot2" \
+		        > 2.mkisofs_opts
+	fi
+	exit 0;
+fi
 
 # Disks != 1 and not 2
 if [ $N != 1 ]; then 
@@ -51,7 +49,6 @@ echo -n "-J -b boot/rescue.bin -c boot/boot.catalog boot1" > 1.mkisofs_opts
 
 mkdir -p boot1/boot
 
-#cp $CDDIR/dists/$CODENAME/main/disks-$ARCH/current/resc2880.bin boot1/boot
 cp $CDDIR/dists/$CODENAME/main/disks-$ARCH/current/disks-2.88/rescue.bin boot1/boot