[SCM] live-build branch, debian, updated. debian/2.0_a21-1-13-ga4e4e97

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 040fd3753ab70f0c2b8aebd1da0287340ea5ab89
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Aug 4 03:54:05 2010 +0200

    Updating debian-cd data.

diff --git a/data/debian-cd/sid b/data/debian-cd/sid
index fb5b653..20f08b4 120000
--- a/data/debian-cd/sid
+++ b/data/debian-cd/sid
@@ -1 +1 @@
-lenny
\ No newline at end of file
+squeeze
\ No newline at end of file
diff --git a/data/debian-cd/squeeze b/data/debian-cd/squeeze
deleted file mode 120000
index fb5b653..0000000
--- a/data/debian-cd/squeeze
+++ /dev/null
@@ -1 +0,0 @@
-lenny
\ No newline at end of file
diff --git a/data/debian-cd/lenny/alpha_businesscard_udeb_include b/data/debian-cd/squeeze/alpha_businesscard_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/alpha_businesscard_udeb_include
copy to data/debian-cd/squeeze/alpha_businesscard_udeb_include
diff --git a/data/debian-cd/lenny/alpha_netinst_udeb_include b/data/debian-cd/squeeze/alpha_netinst_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/alpha_netinst_udeb_include
copy to data/debian-cd/squeeze/alpha_netinst_udeb_include
diff --git a/data/debian-cd/lenny/alpha_udeb_include b/data/debian-cd/squeeze/alpha_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/alpha_udeb_include
copy to data/debian-cd/squeeze/alpha_udeb_include
diff --git a/data/debian-cd/lenny/amd64_businesscard_udeb_include b/data/debian-cd/squeeze/amd64_businesscard_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/amd64_businesscard_udeb_include
copy to data/debian-cd/squeeze/amd64_businesscard_udeb_include
diff --git a/data/debian-cd/lenny/amd64_netinst_udeb_include b/data/debian-cd/squeeze/amd64_netinst_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/amd64_netinst_udeb_include
copy to data/debian-cd/squeeze/amd64_netinst_udeb_include
diff --git a/data/debian-cd/lenny/amd64_udeb_include b/data/debian-cd/squeeze/amd64_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/amd64_udeb_include
copy to data/debian-cd/squeeze/amd64_udeb_include
diff --git a/data/debian-cd/lenny/arm_businesscard_udeb_include b/data/debian-cd/squeeze/arm_businesscard_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/arm_businesscard_udeb_include
copy to data/debian-cd/squeeze/arm_businesscard_udeb_include
diff --git a/data/debian-cd/lenny/arm_netinst_udeb_include b/data/debian-cd/squeeze/arm_netinst_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/arm_netinst_udeb_include
copy to data/debian-cd/squeeze/arm_netinst_udeb_include
diff --git a/data/debian-cd/lenny/arm_udeb_include b/data/debian-cd/squeeze/arm_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/arm_udeb_include
copy to data/debian-cd/squeeze/arm_udeb_include
diff --git a/data/debian-cd/lenny/exclude-udebs b/data/debian-cd/squeeze/exclude-udebs
similarity index 69%
copy from data/debian-cd/lenny/exclude-udebs
copy to data/debian-cd/squeeze/exclude-udebs
index db20967..1faaa9a 100644
--- a/data/debian-cd/lenny/exclude-udebs
+++ b/data/debian-cd/squeeze/exclude-udebs
@@ -40,21 +40,18 @@ libfribidi0-udeb
 libdebconfclient0-udeb
 libdebian-installer4-udeb
 libdebian-installer-extra4-udeb
-# These udebs are only useful in building the boot floppy image.
+# These udebs are only useful in building the boot floppy image
 busybox-floppy-udeb
 rootskel-bootfloppy
-# gtk stuff included in initrd if needed
+# Graphical installer: common udebs included in initrd
 rootskel-gtk
 cdebconf-gtk-udeb
 fontconfig-udeb
 gtk2-engines-udeb
 libatk1.0-udeb
-libcairo-directfb2-udeb
-libdirectfb-*-udeb
 libexpat1-udeb
 libfreetype6-udeb
 libglib2.0-udeb
-libgtk-directfb-2.0-0-udeb
 libgtk2-engines-udeb
 libpango1.0-udeb
 libpcre3-udeb
@@ -64,27 +61,52 @@ libsdl1.2debian-udeb
 mouse-modules-*
 ttf-*
 fbset-udeb
-# terminal for gtk frontend is also included in initrd
+# Graphical installer: udebs for directfb
+libdirectfb-*-udeb
+libcairo-directfb2-udeb
+libgtk-directfb-2.0-0-udeb
+# Graphical installer: udebs for X.Org
+xserver-xorg-core-udeb
+xserver-xorg-input-evdev-udeb
+xserver-xorg-video-fbdev-udeb
+x11-xkb-utils-udeb
+xkb-data-udeb
+libcairo2-udeb
+libdrm2-udeb
+libfontenc1-udeb
+libgtk-x11-udeb
+libpciaccess0-udeb
+libx11-6-udeb
+libxau6-udeb
+libxcb1-udeb
+libxcursor1-udeb
+libxdmcp6-udeb
+libxext6-udeb
+libxfixes3-udeb
+libxfont1-udeb
+libxft2-udeb
+libxi6-udeb
+libxinerama1-udeb
+libxkbfile1-udeb
+libxrender1-udeb
+# Graphical installer: terminal support is included in initrd
 cdebconf-gtk-terminal
 libvte9-udeb
 # Not currently used
 cdebootstrap-udeb
 hdparm-udeb
 dhcp-client-udeb
-# This package is only useful in the d-i-demo.
+# This package is only useful in the d-i-demo
 di-utils-exit-installer
 # No need for these loaders.
 download-installer
 load-floppy
-# Only useful in the hd-media initrd.
+# Only useful in the hd-media initrd
 iso-scan
 load-iso
-# Nothing currently depends on this, and it seems not useful on its own.
+# Nothing currently depends on this, and it seems not useful on its own
 reiserfsprogs-udeb
-# reiser4 is not in the Debian kernel.
-mkreiser4-udeb
-reiser4progs-udeb
-# These are not really needed, the regular netcfg subsumes them.
+# These are not really needed, the regular netcfg subsumes them
 netcfg-static
 # skolelinux stuff, not for the stock CDs
 debian-edu-install-udeb
@@ -95,7 +117,7 @@ autopartkit
 # live CD stuff
 live-installer
 simple-cdd-profiles
-# If needed, will be on the initrd already.
+# If needed, will be on the initrd already
 module-init-tools-udeb
 env-preseed
 rescue-check
@@ -104,14 +126,15 @@ brltty-udeb
 klibc-utils-udeb
 libklibc-udeb
 udev-udeb
+udev-gtk-udeb
 ai-choosers
 auto-install
 libslang2-udeb
+kbd-chooser
+kbd-udeb
+console-setup-*
 # Currently unused
 nbd-client-udeb
 pwgen-udeb
 # Eh?
 gnumach-udeb
-# Exclude kbd and console-setup udebs, they're not currently used
-kbd-udeb
-console-setup-*
diff --git a/data/debian-cd/lenny/exclude-udebs-amd64 b/data/debian-cd/squeeze/exclude-udebs-amd64
similarity index 100%
copy from data/debian-cd/lenny/exclude-udebs-amd64
copy to data/debian-cd/squeeze/exclude-udebs-amd64
diff --git a/data/debian-cd/lenny/exclude-udebs-i386 b/data/debian-cd/squeeze/exclude-udebs-i386
similarity index 97%
copy from data/debian-cd/lenny/exclude-udebs-i386
copy to data/debian-cd/squeeze/exclude-udebs-i386
index eeed470..b3af1c9 100644
--- a/data/debian-cd/lenny/exclude-udebs-i386
+++ b/data/debian-cd/squeeze/exclude-udebs-i386
@@ -29,7 +29,7 @@ usb-serial-modules-*
 usb-storage-modules-*
 zlib-modules-*
 # 686-bigmem kernel udebs are only used for the Xen netboot image
-*-686-bigmem-di
+*-686-bigmem-di !xen
 # Not used on i386
 console-keymaps-acorn
 console-keymaps-amiga
diff --git a/data/debian-cd/lenny/exclude-udebs-powerpc b/data/debian-cd/squeeze/exclude-udebs-powerpc
similarity index 100%
copy from data/debian-cd/lenny/exclude-udebs-powerpc
copy to data/debian-cd/squeeze/exclude-udebs-powerpc
diff --git a/data/debian-cd/lenny/exclude-udebs-s390 b/data/debian-cd/squeeze/exclude-udebs-s390
similarity index 100%
copy from data/debian-cd/lenny/exclude-udebs-s390
copy to data/debian-cd/squeeze/exclude-udebs-s390
diff --git a/data/debian-cd/lenny/exclude-udebs-sparc b/data/debian-cd/squeeze/exclude-udebs-sparc
similarity index 100%
copy from data/debian-cd/lenny/exclude-udebs-sparc
copy to data/debian-cd/squeeze/exclude-udebs-sparc
diff --git a/data/debian-cd/lenny/hppa_businesscard_udeb_include b/data/debian-cd/squeeze/hppa_businesscard_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/hppa_businesscard_udeb_include
copy to data/debian-cd/squeeze/hppa_businesscard_udeb_include
diff --git a/data/debian-cd/lenny/hppa_netinst_udeb_include b/data/debian-cd/squeeze/hppa_netinst_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/hppa_netinst_udeb_include
copy to data/debian-cd/squeeze/hppa_netinst_udeb_include
diff --git a/data/debian-cd/lenny/hppa_udeb_include b/data/debian-cd/squeeze/hppa_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/hppa_udeb_include
copy to data/debian-cd/squeeze/hppa_udeb_include
diff --git a/data/debian-cd/lenny/i386_businesscard_udeb_include b/data/debian-cd/squeeze/i386_businesscard_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/i386_businesscard_udeb_include
copy to data/debian-cd/squeeze/i386_businesscard_udeb_include
diff --git a/data/debian-cd/lenny/i386_netinst_udeb_include b/data/debian-cd/squeeze/i386_netinst_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/i386_netinst_udeb_include
copy to data/debian-cd/squeeze/i386_netinst_udeb_include
diff --git a/data/debian-cd/lenny/i386_udeb_include b/data/debian-cd/squeeze/i386_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/i386_udeb_include
copy to data/debian-cd/squeeze/i386_udeb_include
diff --git a/data/debian-cd/lenny/ia64_businesscard_udeb_include b/data/debian-cd/squeeze/ia64_businesscard_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/ia64_businesscard_udeb_include
copy to data/debian-cd/squeeze/ia64_businesscard_udeb_include
diff --git a/data/debian-cd/lenny/ia64_netinst_udeb_include b/data/debian-cd/squeeze/ia64_netinst_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/ia64_netinst_udeb_include
copy to data/debian-cd/squeeze/ia64_netinst_udeb_include
diff --git a/data/debian-cd/lenny/ia64_udeb_include b/data/debian-cd/squeeze/ia64_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/ia64_udeb_include
copy to data/debian-cd/squeeze/ia64_udeb_include
diff --git a/data/debian-cd/lenny/m68k_businesscard_udeb_include b/data/debian-cd/squeeze/m68k_businesscard_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/m68k_businesscard_udeb_include
copy to data/debian-cd/squeeze/m68k_businesscard_udeb_include
diff --git a/data/debian-cd/lenny/m68k_netinst_udeb_include b/data/debian-cd/squeeze/m68k_netinst_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/m68k_netinst_udeb_include
copy to data/debian-cd/squeeze/m68k_netinst_udeb_include
diff --git a/data/debian-cd/lenny/m68k_udeb_include b/data/debian-cd/squeeze/m68k_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/m68k_udeb_include
copy to data/debian-cd/squeeze/m68k_udeb_include
diff --git a/data/debian-cd/lenny/mips_businesscard_udeb_include b/data/debian-cd/squeeze/mips_businesscard_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/mips_businesscard_udeb_include
copy to data/debian-cd/squeeze/mips_businesscard_udeb_include
diff --git a/data/debian-cd/lenny/mips_netinst_udeb_include b/data/debian-cd/squeeze/mips_netinst_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/mips_netinst_udeb_include
copy to data/debian-cd/squeeze/mips_netinst_udeb_include
diff --git a/data/debian-cd/lenny/mips_udeb_include b/data/debian-cd/squeeze/mips_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/mips_udeb_include
copy to data/debian-cd/squeeze/mips_udeb_include
diff --git a/data/debian-cd/lenny/mipsel_businesscard_udeb_include b/data/debian-cd/squeeze/mipsel_businesscard_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/mipsel_businesscard_udeb_include
copy to data/debian-cd/squeeze/mipsel_businesscard_udeb_include
diff --git a/data/debian-cd/lenny/mipsel_netinst_udeb_include b/data/debian-cd/squeeze/mipsel_netinst_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/mipsel_netinst_udeb_include
copy to data/debian-cd/squeeze/mipsel_netinst_udeb_include
diff --git a/data/debian-cd/lenny/mipsel_udeb_include b/data/debian-cd/squeeze/mipsel_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/mipsel_udeb_include
copy to data/debian-cd/squeeze/mipsel_udeb_include
diff --git a/data/debian-cd/lenny/powerpc_businesscard_udeb_include b/data/debian-cd/squeeze/powerpc_businesscard_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/powerpc_businesscard_udeb_include
copy to data/debian-cd/squeeze/powerpc_businesscard_udeb_include
diff --git a/data/debian-cd/lenny/powerpc_netinst_udeb_include b/data/debian-cd/squeeze/powerpc_netinst_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/powerpc_netinst_udeb_include
copy to data/debian-cd/squeeze/powerpc_netinst_udeb_include
diff --git a/data/debian-cd/lenny/powerpc_udeb_include b/data/debian-cd/squeeze/powerpc_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/powerpc_udeb_include
copy to data/debian-cd/squeeze/powerpc_udeb_include
diff --git a/data/debian-cd/lenny/s390_businesscard_udeb_include b/data/debian-cd/squeeze/s390_businesscard_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/s390_businesscard_udeb_include
copy to data/debian-cd/squeeze/s390_businesscard_udeb_include
diff --git a/data/debian-cd/lenny/s390_netinst_udeb_include b/data/debian-cd/squeeze/s390_netinst_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/s390_netinst_udeb_include
copy to data/debian-cd/squeeze/s390_netinst_udeb_include
diff --git a/data/debian-cd/lenny/s390_udeb_include b/data/debian-cd/squeeze/s390_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/s390_udeb_include
copy to data/debian-cd/squeeze/s390_udeb_include
diff --git a/data/debian-cd/lenny/sparc_businesscard_udeb_include b/data/debian-cd/squeeze/sparc_businesscard_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/sparc_businesscard_udeb_include
copy to data/debian-cd/squeeze/sparc_businesscard_udeb_include
diff --git a/data/debian-cd/lenny/sparc_netinst_udeb_include b/data/debian-cd/squeeze/sparc_netinst_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/sparc_netinst_udeb_include
copy to data/debian-cd/squeeze/sparc_netinst_udeb_include
diff --git a/data/debian-cd/lenny/sparc_udeb_include b/data/debian-cd/squeeze/sparc_udeb_include
similarity index 100%
copy from data/debian-cd/lenny/sparc_udeb_include
copy to data/debian-cd/squeeze/sparc_udeb_include
diff --git a/data/debian-cd/lenny/udeb_exclude b/data/debian-cd/squeeze/udeb_exclude
similarity index 100%
copy from data/debian-cd/lenny/udeb_exclude
copy to data/debian-cd/squeeze/udeb_exclude

-- 
live-build