[SCM] live-helper branch, debian-old-1.0, updated. 40575b665b7da3be874c82b1c214b9a30140e31e

[Daniel Baumann]

The following commit has been merged in the debian-old-1.0 branch:
commit 40575b665b7da3be874c82b1c214b9a30140e31e
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jan 30 14:52:00 2010 +0100

    Updating package lists.

diff --git a/lists/debian-forensics b/lists/debian-forensics
index 1da0f8e..9915219 100644
--- a/lists/debian-forensics
+++ b/lists/debian-forensics
@@ -5,12 +5,10 @@
 
 # http://qa.debian.org/developer.php?login=forensics-devel@lists.alioth.debian.org
 
-# packages already part since etch
-gpart sleuthkit tct wipe
-
-#if DISTRIBUTION lenny squeeze sid
-ext3grep galleta grokevt memdump missidentify myrescue pasco reglookup
-scrounge-ntfs ssdeep tableau-parm unhide
+galleta grokevt memdump missidentify myrescue pasco reglookup
+scrounge-ntfs sleuthkit ssdeep tableau-parm tct unhide wipe
+#if ARCHITECTURE amd64 i386
+ext3grep gpart
 #endif
 
 #if DISTRIBUTION squeeze sid
diff --git a/lists/debian-live b/lists/debian-live
index 5ac9607..3643780 100644
--- a/lists/debian-live
+++ b/lists/debian-live
@@ -12,13 +12,16 @@ dosfstools genisoimage memtest86+ memtest86 mtools parted squashfs-tools genext2
 
 # kernel
 #if DISTRIBUTION lenny squeeze sid
-aufs-tools aufs-source
+aufs-tools
+#endif
+#if DISTRIBUTION lenny
+aufs-source
 #endif
 qemu kqemu-source
 kvm kvm-source
-squashfs-tools squashfs-source
-#if DISTRIBUTION etch
-unionfs-tools unionfs-source
+squashfs-tools
+#if DISTRIBUTION lenny
+squashfs-source
 #endif
 #linux-headers-2.6-all
 
diff --git a/lists/kde-core b/lists/kde-core
index 5e5a7f3..1430df7 100644
--- a/lists/kde-core
+++ b/lists/kde-core
@@ -3,7 +3,7 @@
 ## LH: KDE Core
 #include <standard-x11>
 
-#if DISTRIBUTION etch lenny
+#if DISTRIBUTION lenny
 kde-core
 #endif
 #if DISTRIBUTION squeeze sid
diff --git a/lists/lxde b/lists/lxde
index 2adf8b1..5d1537e 100644
--- a/lists/lxde
+++ b/lists/lxde
@@ -3,5 +3,11 @@
 ## LH: LXDE
 #include <standard-x11>
 
-lxde lxnm
+lxde
+#if DISTRIBUTION lenny
+lxnm
+#endif
+#if DISTRIBUTION squeeze sid
+wicd
+#endif
 gdm desktop-base
diff --git a/lists/rescue b/lists/rescue
index dd9b585..287ced2 100644
--- a/lists/rescue
+++ b/lists/rescue
@@ -43,18 +43,16 @@ par2 dvd+rw-tools
 chiark-utils-bin
 
 # System
-dmidecode lshw pciutils procinfo usbutils mcelog
-sysstat
-cpuburn stress
+#if ARCHITECTURE amd64 i386
+dmidecode mcelog cpuburn
+#endif
+lshw pciutils procinfo usbutils
+sysstat stress
 
 #if ARCHITECTURE i386 powerpc
 read-edid
 #endif
 
-#if DISTRIBUTION etch
-sysutils
-#endif
-
 # Browser
 lynx links2 w3m
 
@@ -62,7 +60,7 @@ lynx links2 w3m
 arj bzip2 lzma p7zip-full unace unrar-free unzip zip lzop ncompress
 unace pax
 
-#if CATEGORIES non-free
+#if ARCHIVE_AREAS non-free
 rar unrar
 sl-modem-daemon
 atmel-firmware linux-wlan-ng-firmware firmware-ralink bluez-firmware
@@ -71,12 +69,9 @@ firmware-qlogic firmware-bnx2
 #endif
 
 # These two are from contrib but the idea is the same: non-free firmware.
-#if CATEGORIES contrib
+#if ARCHIVE_AREAS contrib
 b43-fwcutter
 #endif
-#if DISTRIBUTION etch
-bcm43xx-fwcutter
-#endif
 
 # Backup
 dar gddrescue dump ddrescue
@@ -98,7 +93,6 @@ ifenslave-2.6
 ifrename
 ethtool
 ipcalc
-mailx
 mii-diag
 minicom
 gkermit
@@ -136,10 +130,6 @@ portsentry
 vlan
 zorp
 
-#if DISTRIBUTION etch
-reaim
-#endif
-
 # Essential networking
 netbase
 rdate
@@ -169,9 +159,6 @@ iputils-tracepath
 mrt
 mtr-tiny
 tcptraceroute
-#if DISTRIBUTION etch
-traceproto
-#endif
 traceroute
 spinner
 
@@ -213,9 +200,6 @@ crashme
 dbench
 doscan
 dsniff
-#if DISTRIBUTION etch
-fragrouter
-#endif
 honeyd
 hping3
 icmpush
@@ -229,7 +213,7 @@ ndisc6
 ngrep
 p0f
 packit
-#if DISTRIBUTION etch lenny
+#if DISTRIBUTION lenny
 paketto
 sing
 #endif
@@ -257,9 +241,6 @@ squashfs-tools
 sshfs
 sysfsutils
 udftools
-#if DISTRIBUTION etch
-unionfs-tools
-#endif
 xfsdump
 xfsprogs
 #if DISTRIBUTION sid
@@ -292,7 +273,10 @@ sleuthkit
 dosfstools mscompress chntpw pptpd pptp-linux
 
 # unsorted
-hwinfo x86info cpuid
+#if ARCHITECTURE amd64 i386
+cpuid x86info
+#endif
+hwinfo
 tofrodos rpncalc
 hal
 dc
diff --git a/lists/studio b/lists/studio
index 7f967f7..24ede73 100644
--- a/lists/studio
+++ b/lists/studio
@@ -8,7 +8,7 @@
 
 alsa-tools
 alsa-tools-gui
-#if DISTRIBUTION etch sid
+#if DISTRIBUTION sid
 ardour-gtk
 #endif
 ams

-- 
live-helper