Updating and simplyfing conditionals in package lists.

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

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

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

lists/standard-x11

@@ -2,6 +2,9 @@
 
 #include <standard>
 
-xorg menu
+xorg
+#nif MODE progress
+menu
+#endif
 alsa-base alsa-utils
 keyboard-configuration