30 files changed, 211 insertions, 140 deletions
diff --git a/lists/debian-forensics b/lists/debian-forensics
index 111f4f905..27a3a2b9a 100644
--- a/lists/debian-forensics
+++ b/lists/debian-forensics
@@ -1,5 +1,6 @@
 # /usr/share/live/build/lists/debian-forensics - package list for live-build(7)
 
+## LH: Debian Forensics
 #include <standard>
 
 # http://qa.debian.org/developer.php?login=forensics-devel@lists.alioth.debian.org
@@ -28,7 +29,6 @@ wipe
 
 ## Packages available as of squeeze
 
-#if DISTRIBUTION squeeze wheezy sid
 aesfix
 aeskeyfind
 afflib-tools
@@ -46,4 +46,3 @@ rifiuti
 rifiuti2
 safecopy
 shed
-#endif
diff --git a/lists/debian-junior b/lists/debian-junior
new file mode 100644
index 000000000..b5bf5d74b
--- /dev/null
+++ b/lists/debian-junior
@@ -0,0 +1,11 @@
+# /usr/share/live/build/lists/debian-junior - package list for live-build(7)
+
+## LH: Debian Junior
+#include <standard>
+
+# http://qa.debian.org/developer.php?login=debian-jr@lists.debian.org
+
+junior-sound junior-typing junior-internet junior-toys junior-games-net
+junior-games-sim junior-games-gl junior-puzzle junior-arcade junior-math
+junior-writing junior-games-card junior-programming junior-system junior-art
+junior-doc junior-games-text
diff --git a/lists/debian-live-devel b/lists/debian-live-devel
index 7776041dc..4e963b0e1 100644
--- a/lists/debian-live-devel
+++ b/lists/debian-live-devel
@@ -1,31 +1,34 @@
 # /usr/share/live/build/lists/debian-live - package list for live-build(7)
 
+## LH: Debian Live
 #include <standard>
 
 # http://qa.debian.org/developer.php?login=debian-live@lists.debian.org
 
 # debian-live
-live-build live-manual
+live-build
+git
+grub-pc grub-legacy
 
-aufs-tools dosfstools genisoimage parted squashfs-tools
-syslinux syslinux-common memtest86+
+debootstrap cdebootstrap
+syslinux
+memtest86+ memtest86
+dosfstools genisoimage mtools parted squashfs-tools genext2fs mtd-tools
+fakeroot fakechroot sudo
+
+# kernel
+aufs-tools
+qemu kqemu-source
+kvm kvm-source
+squashfs-tools
+#linux-headers-2.6-all
 
 # some other stuff
-#if DISTRIBUTION lenny
-qemu
-#endif
-#if DISTRIBUTION squeeze wheezy sid
-bridge-utils lxc kvm
-#endif
-
-git-core gnupg less rsync screen sudo vim
+vim less screen gnupg dash posh
 
 # build
-debootstrap cdebootstrap
-#if DISTRIBUTION squeeze wheezy sid
-multistrap
-#endif
-build-essential debhelper devscripts fakechroot fakeroot lintian wdiff
+build-essential debhelper dh-make lintian fakeroot devscripts wdiff
+autotools-dev dpatch module-assistant quilt
 
 # bootchart
 acct bootchart
diff --git a/lists/debian-live-pxe-server b/lists/debian-live-pxe-server
index 207db0077..586f38c8c 100644
--- a/lists/debian-live-pxe-server
+++ b/lists/debian-live-pxe-server
@@ -1,21 +1,14 @@
 # /usr/share/live/build/lists/debian-live-pxe-server - package list for live-build(7)
 
+## LH: Debian Live
 #include <standard>
 
 bind9
 
-#if DISTRIBUTION lenny
-dhcp3-server
-#endif
-#if DISTRIBUTION squeeze wheezy sid
 isc-dhcp-server
-#endif
-
 nfs-kernel-server
 syslinux-common
 tftpd-hpa
 
-#if DISTRIBUTION squeeze wheezy sid
 debian-installer-netboot-amd64
 debian-installer-netboot-i386
-#endif
diff --git a/lists/debian-science b/lists/debian-science
index 8b3c21087..d9da39d60 100644
--- a/lists/debian-science
+++ b/lists/debian-science
@@ -1,5 +1,6 @@
 # /usr/share/live/build/lists/debian-science - package list for live-build(7)
 
+## LH: Debian Science
 #include <standard>
 
 # http://qa.debian.org/developer.php?login=debian-science-maintainers@lists.alioth.debian.org
diff --git a/lists/gnome b/lists/gnome
index c4043e4f0..98b324fac 100644
--- a/lists/gnome
+++ b/lists/gnome
@@ -1,10 +1,8 @@
 # /usr/share/live/build/lists/gnome - package list for live-build(7)
 
+## LH: GNOME Desktop
 #include <gnome-core>
 
-#if DISTRIBUTION lenny
-gdm-themes
-#endif
 gnome-desktop-environment gnome-screensaver gnome-themes-extras
 #if MODE debian
 system-config-printer
diff --git a/lists/gnome-core b/lists/gnome-core
index 09a33de45..525f4e219 100644
--- a/lists/gnome-core
+++ b/lists/gnome-core
@@ -1,13 +1,9 @@
 # /usr/share/live/build/lists/gnome-core - package list for live-build(7)
 
+## LH: GNOME Core
 #include <standard-x11>
 
 gnome-core
-#if DISTRIBUTION lenny
-gdm
-#endif
-#if DISTRIBUTION squeeze wheezy sid
 gdm3
-#endif
 desktop-base
 gnome-themes
diff --git a/lists/gnome-desktop b/lists/gnome-desktop
deleted file mode 100644
index 4c6dc8518..000000000
--- a/lists/gnome-desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-# /usr/share/live/build/lists/gnome-desktop - package list for live-build(7)
-
-# This is a virtual package list, equivalent to:
-#   lb config --packages-lists standard-x11 --tasks "gnome-desktop desktop standard laptop"
-#
-# No files or directives are listed here because it is processed internally, and any
-# changes to this file will be ignored.
diff --git a/lists/gnome-full b/lists/gnome-full
index 1cef34683..1f4c6d7e1 100644
--- a/lists/gnome-full
+++ b/lists/gnome-full
@@ -1,11 +1,7 @@
 # /usr/share/live/build/lists/gnome-full - package list for live-build(7)
 
+## LH: GNOME full
 #include <gnome>
 
 gnome
-#if DISTRIBUTION lenny
-gdm
-#endif
-#if DISTRIBUTION squeeze wheezy sid
 gdm3
-#endif
diff --git a/lists/gnome-junior b/lists/gnome-junior
new file mode 100644
index 000000000..f5d4ef994
--- /dev/null
+++ b/lists/gnome-junior
@@ -0,0 +1,7 @@
+# /usr/share/live/build/lists/gnome-junior - package list for live-build(7)
+
+## LH: Debian Junior (Gnome)
+#include <gnome>
+#include <debian-junior>
+
+junior-gnome
diff --git a/lists/gnustep b/lists/gnustep
new file mode 100644
index 000000000..3fc0ad5aa
--- /dev/null
+++ b/lists/gnustep
@@ -0,0 +1,24 @@
+# /usr/share/live/build/lists/gnustep - package list for live-build(7)
+
+## LH: GNUstep desktop
+#include <standard-x11>
+
+wdm
+
+gnustep gnumail.app talksoup.app viewpdf.app wmaker gnustep-icons
+gnustep-examples gnumail-doc aclock.app biococoa.app timemon.app cenon.app wmnd
+bubblefishymon wmmixer wmpinboard gworkspace.app clipbook.app poe.app
+plopfolio.app mpdcon.app lusernet.app helpviewer.app gnuwash.app easydiff.app
+displaycalibrator.app cynthiune.app agenda.app stepulator.app edenmath.app
+price.app volumecontrol.app latex.service wildmenus.bundle innerspace.app
+
+gnustep-core
+
+gnustep-core-devel gnustep-base-examples
+
+gnustep-core-doc gnustep-tutorial-html gnustep-tutorial-pdf
+
+gnustep-games gridlock.app
+
+gnustep-devel librenaissance0-dev steptalk libpantomime1-dev
+popplerkit.framework gnustep-netclasses
diff --git a/lists/kde b/lists/kde
index ab6b64260..3778e7844 100644
--- a/lists/kde
+++ b/lists/kde
@@ -1,12 +1,8 @@
 # /usr/share/live/build/lists/kde - package list for live-build(7)
 
+## LH: KDE
 #include <kde-core>
 
-#if DISTRIBUTION lenny
-kde
-#endif
-#if DISTRIBUTION squeeze wheezy sid
 kde-standard
-#endif
 kdm
 desktop-base
diff --git a/lists/kde-core b/lists/kde-core
index 3ce7cf333..68d07df23 100644
--- a/lists/kde-core
+++ b/lists/kde-core
@@ -1,12 +1,8 @@
 # /usr/share/live/build/lists/kde-core - package list for live-build(7)
 
+## LH: KDE Core
 #include <standard-x11>
 
-#if DISTRIBUTION lenny
-kde-core
-#endif
-#if DISTRIBUTION squeeze wheezy sid
 kde-plasma-desktop
-#endif
 kdm
 desktop-base
diff --git a/lists/kde-desktop b/lists/kde-desktop
deleted file mode 100644
index 824e9f420..000000000
--- a/lists/kde-desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-# /usr/share/live/build/lists/kde-desktop - package list for live-build(7)
-
-# This is a virtual package list, equivalent to:
-#   lb config --packages-lists standard-x11 --tasks "kde-desktop desktop standard laptop"
-#
-# No files or directives are listed here because it is processed internally, and any
-# changes to this file will be ignored.
diff --git a/lists/kde-extra b/lists/kde-extra
index f3a94e478..a64d1db68 100644
--- a/lists/kde-extra
+++ b/lists/kde-extra
@@ -1,5 +1,6 @@
 # /usr/share/live/build/lists/kde-extra - package list for live-build(7)
 
+## LH: KDE Extra
 #include <kde-full>
 
 kde-extras
diff --git a/lists/kde-full b/lists/kde-full
index 7afc7a9b8..fb44f195f 100644
--- a/lists/kde-full
+++ b/lists/kde-full
@@ -1,10 +1,7 @@
 # /usr/share/live/build/lists/kde-full - package list for live-build(7)
 
+## LH: KDE Full
 #include <kde>
 
-#if DISTRIBUTION lenny
 koffice
-#endif
-#if DISTRIBUTION squeeze wheezy sid
 kde-full
-#endif
diff --git a/lists/kde-junior b/lists/kde-junior
new file mode 100644
index 000000000..0f79744c7
--- /dev/null
+++ b/lists/kde-junior
@@ -0,0 +1,7 @@
+# /usr/share/live/build/lists/kde-junior - package list for live-build(7)
+
+## LH: KDE Junior
+#include <kde>
+#include <debian-junior>
+
+junior-kde
diff --git a/lists/lxde b/lists/lxde
index 23a99a5ac..9d983ce71 100644
--- a/lists/lxde
+++ b/lists/lxde
@@ -1,13 +1,9 @@
 # /usr/share/live/build/lists/lxde - package list for live-build(7)
 
+## LH: LXDE
 #include <standard-x11>
 
 lxde
 gdm
-#if DISTRIBUTION lenny
-lxnm
-#endif
-#if DISTRIBUTION squeeze wheezy sid
 network-manager-gnome
-#endif
 desktop-base
diff --git a/lists/lxde-desktop b/lists/lxde-desktop
deleted file mode 100644
index 7b7c60eab..000000000
--- a/lists/lxde-desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-# /usr/share/live/build/lists/lxde-desktop - package list for live-build(7)
-
-# This is a virtual package list, equivalent to:
-#   lb config --packages-lists standard-x11 --tasks "lxde-desktop desktop standard laptop"
-#
-# No files or directives are listed here because it is processed internally, and any
-# changes to this file will be ignored.
diff --git a/lists/minimal b/lists/minimal
index 3c6cb9423..b3c9eea08 100644
--- a/lists/minimal
+++ b/lists/minimal
@@ -5,12 +5,12 @@
 # things to make the image smaller. This can lead to breakages at any time,
 # don't use it if you're not willing/capable of fixing any arising issues.
 
+## LH: Minimal
+
 eject file user-setup sudo
 
 #if MODE ubuntu
 gnupg
 #endif
 
-#if DISTRIBUTION wheezy
 live-config
-#endif
diff --git a/lists/rescue b/lists/rescue
index 1845f1e08..ccb4f0ccd 100644
--- a/lists/rescue
+++ b/lists/rescue
@@ -1,19 +1,16 @@
 # /usr/share/live/build/lists/rescue - package list for live-build(7)
 
+## LH: Rescue
 #include <standard>
 
 # Debian Forensics
 #include <debian-forensics>
 
 # Other forensic packages
-#if DISTRIBUTION lenny squeeze wheezy sid
 scalpel
-#endif
 
 # Bootloaders
-#if DISTRIBUTION lenny squeeze wheezy sid
 syslinux-common
-#endif
 #if ARCHITECTURE amd64 i386
 grub lilo mbr syslinux
 #endif
@@ -37,9 +34,6 @@ 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
@@ -78,10 +72,7 @@ b43-fwcutter
 # Backup
 dar gddrescue dump ddrescue
 mt-st
-#if DISTRIBUTION lenny sid
-afio tob
-#endif
-dar duplicity
+afio dar duplicity tob
 
 # File comparison
 rdiff rdiff-backup rsnapshot
@@ -104,12 +95,8 @@ gkermit
 netcat
 netcat6
 netmask
-#if DISTRIBUTION lenny
-openntpd
-#endif
 openssl
 openvpn
-vpnc
 strongswan
 sipcalc
 socat
@@ -136,17 +123,11 @@ iptables
 knockd
 portsentry
 vlan
-#if DISTRIBUTION lenny
-zorp
-#endif
 
 # Essential networking
 netbase
 rdate
 ntpdate
-#if DISTRIBUTION lenny
-msntp
-#endif
 dhcp3-client
 ppp
 pppconfig
@@ -168,9 +149,7 @@ cutter
 iproute
 iproute-doc
 iputils-tracepath
-#if DISTRIBUTION lenny
 mrt
-#endif
 mtr-tiny
 tcptraceroute
 traceroute
@@ -198,9 +177,7 @@ netdiscover
 nload
 nsca
 nstreams
-#if DISTRIBUTION lenny sid
 ntop
-#endif
 saidar
 samhain
 scanssh
@@ -221,9 +198,6 @@ hping3
 icmpush
 macchanger
 medusa
-#if DISTRIBUTION lenny
-ndiff
-#endif
 netdiag
 netpipe-tcp
 nmap
@@ -231,10 +205,6 @@ ndisc6
 ngrep
 p0f
 packit
-#if DISTRIBUTION lenny
-paketto
-sing
-#endif
 python-scapy
 xprobe
 
@@ -261,9 +231,7 @@ sysfsutils
 udftools
 xfsdump
 xfsprogs
-#if DISTRIBUTION sid
 btrfs-tools
-#endif
 cryptsetup
 dmraid
 e2fsprogs
@@ -333,12 +301,7 @@ hostap-utils
 hostapd
 
 # Flab
-#if DISTRIBUTION lenny
-emacs22-nox
-#endif
-#if DISTRIBUTON squeeze wheezy sid
 emacs23-nox
-#endif
 build-essential gdb gfortran gnat
 
 #if ARCHITECTURE i386
diff --git a/lists/standard b/lists/standard
index af2cac5ee..4dd8a7a6a 100644
--- a/lists/standard
+++ b/lists/standard
@@ -1,5 +1,6 @@
 # /usr/share/live/build/lists/standard - package list for live-build(7)
 
+## LH: Standard
 #include <minimal>
 
 console-setup console-common kbd
diff --git a/lists/standard-x11 b/lists/standard-x11
index 42eddaf77..bddc0068f 100644
--- a/lists/standard-x11
+++ b/lists/standard-x11
@@ -1,14 +1,8 @@
 # /usr/share/live/build/lists/standard-x11 - package list for live-build(7)
 
+## LH: Standard X11
 #include <standard>
 
-xorg menu
+xorg xresprobe menu
 alsa-base alsa-utils
-
-#if DISTRIBUTION lenny
-xresprobe
-#endif
-
-#if DISTRIBUTION squeeze wheezy sid
 keyboard-configuration
-#endif
diff --git a/lists/studio b/lists/studio
new file mode 100644
index 000000000..d6251f980
--- /dev/null
+++ b/lists/studio
@@ -0,0 +1,102 @@
+# /usr/share/live/build/lists/studio - package list for live-build(7)
+
+## LH: Music Studio base
+# packagelist inspired from the A/DeMuDi one.
+#
+# You don't want to use that list as a standalone list. Instead use
+# studio-* desktop variants.
+
+alsa-tools
+alsa-tools-gui
+ams
+amsynth
+artsbuilder
+arts
+audacity
+aumix-gtk
+beast
+aterm
+bristol
+cdparanoia
+ceres3
+cheesetracker
+cmt
+cplay
+creox
+freewheeling
+ladspa-sdk
+lakai
+mcp-plugins
+mhwaveedit
+mikmod
+moosic
+mp3burn
+mp3info
+mpg321
+muse
+musiclibrarian
+noteedit
+nyquist
+openjade
+openssh
+pd-externals
+pd-zexy
+pmidi
+puredata
+pytone
+qjackctl
+qsynth
+realtime-lsm
+recode
+rev-plugins
+rezound
+ripperx
+rosegarden
+seq24
+sfftw2
+sfront
+solfege
+somaplayer
+songwrite
+soundtracker
+sox
+specimen
+spiralsynthmodular
+supercollider
+supercollider-doc
+swami
+sweep
+swh-plugins
+tap-plugins
+terminatorx
+timidity
+timemachine
+timidity-el
+timidity-interfaces-extra
+unison
+vkeybd
+vorbis-tools
+wavbreaker
+wavesurfer
+xmms
+xmms-bumpscope
+xmms-cdread
+xmms-crossfade
+xmms-flac
+xmms-fmradio
+xmms-goodnight
+xmms-iris
+xmms-jack
+xmms-jess
+xmms-ladspa
+xmms-lirc
+xmms-mad
+xmms-modplug
+xmms-msa
+xmms-osd-plugin
+xmms-qbble
+xmms-shell
+xmms-status-plugin
+xmms-synaesthesia
+xmms-volnorm
+zynaddsubfx
diff --git a/lists/studio-gnome b/lists/studio-gnome
new file mode 100644
index 000000000..0dc76b1e0
--- /dev/null
+++ b/lists/studio-gnome
@@ -0,0 +1,5 @@
+# /usr/share/live/build/lists/studio-gnome - package list for live-build(7)
+
+## LH: Music Studio (Gnome)
+#include <gnome>
+#include <studio>
diff --git a/lists/studio-kde b/lists/studio-kde
new file mode 100644
index 000000000..537407643
--- /dev/null
+++ b/lists/studio-kde
@@ -0,0 +1,5 @@
+# /usr/share/live/build/lists/studio-kde - package list for live-build(7)
+
+## LH: Music Studio (KDE)
+#include <kde>
+#include <studio>
diff --git a/lists/studio-xfce b/lists/studio-xfce
new file mode 100644
index 000000000..c6005fb2c
--- /dev/null
+++ b/lists/studio-xfce
@@ -0,0 +1,5 @@
+# /usr/share/live/build/lists/studio-xfce - package list for live-build(7)
+
+## LH: Music Studio (Xfce)
+#include <xfce>
+#include <studio>
diff --git a/lists/xfce b/lists/xfce
index 3c1ddf654..77b807bd3 100644
--- a/lists/xfce
+++ b/lists/xfce
@@ -1,12 +1,8 @@
 # /usr/share/live/build/lists/xfce - package list for live-build(7)
 
+## LH: Xfce
 #include <standard-x11>
 
 xfce4
-#if DISTRIBUTION lenny
-gdm
-#endif
-#if DISTRIBUTION squeeze wheezy sid
 gdm3
-#endif
 desktop-base
diff --git a/lists/xfce-desktop b/lists/xfce-desktop
deleted file mode 100644
index 0bbbe0ed3..000000000
--- a/lists/xfce-desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-# /usr/share/live/build/lists/xfce-desktop - package list for live-build(7)
-
-# This is a virtual package list, equivalent to:
-#   lb config --packages-lists standard-x11 --tasks "xfce-desktop desktop standard laptop"
-#
-# No files or directives are listed here because it is processed internally, and any
-# changes to this file will be ignored.
diff --git a/lists/xfce-junior b/lists/xfce-junior
new file mode 100644
index 000000000..e2bf43a55
--- /dev/null
+++ b/lists/xfce-junior
@@ -0,0 +1,7 @@
+# /usr/share/live/build/lists/xfce-junior - package list for live-build(7)
+
+## LH: Xfce Debian Junior
+#include <xfce>
+#include <debian-junior>
+
+junior-kde junior-gnome