[SCM] live-build branch, debian-next, updated. debian/3.0_a19-1-13-g65b7eb9

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 65b7eb99f87c12741b1d6bb7640d8fdb7ad4a14f
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jun 11 16:14:35 2011 +0200

    Updating and simplyfing conditionals in package lists.

diff --git a/lists/gnome b/lists/gnome
index 4686f8b..fc878b1 100644
--- a/lists/gnome
+++ b/lists/gnome
@@ -3,7 +3,7 @@
 #include <gnome-core>
 
 gnome-desktop-environment gnome-screensaver gnome-themes-extras
-#if MODE debian
+#nif MODE ubuntu
 system-config-printer
 #endif
 #if MODE ubuntu
diff --git a/lists/rescue b/lists/rescue
index bb793f3..ec1d862 100644
--- a/lists/rescue
+++ b/lists/rescue
@@ -33,9 +33,7 @@ aview mc nano-tiny mg vim wdiff hexedit nvi tweak
 # Harddisk
 dvd+rw-tools genisoimage sdparm hdparm blktool parted partimage secure-delete scsitools smartmontools testdisk wodim wipe hddtemp bonnie++
 par2 dvd+rw-tools
-#if DISTRIBUTION squeeze wheezy sid
 fsarchiver
-#endif
 
 # for /usr/bin/summer:
 chiark-utils-bin
@@ -155,9 +153,6 @@ cutter
 iproute
 iproute-doc
 iputils-tracepath
-#if DISTRIBUTION lenny
-mrt
-#endif
 mtr-tiny
 tcptraceroute
 traceroute
diff --git a/lists/standard b/lists/standard
index 440ac8e..e63631a 100644
--- a/lists/standard
+++ b/lists/standard
@@ -4,11 +4,9 @@
 
 console-setup console-common kbd
 
-
-#if MODE emdebian debian ubuntu
+#nif MODE progress
 locales
 #endif
-
 #if MODE progress
 locales-all
 #endif
diff --git a/lists/standard-x11 b/lists/standard-x11
index 9729b85..042b986 100644
--- a/lists/standard-x11
+++ b/lists/standard-x11
@@ -2,6 +2,9 @@
 
 #include <standard>
 
-xorg menu
+xorg
+#nif MODE progress
+menu
+#endif
 alsa-base alsa-utils
 keyboard-configuration

-- 
live-build