[SCM] live-build branch, debian-next, updated. debian/2.0_a29-1-7-g686bf54

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 686bf549166cf322184b427917e3e25076ad0043
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Sep 19 15:36:42 2010 +0200

    Updating packages list for squeeze and wheezy.

diff --git a/lists/debian-forensics b/lists/debian-forensics
index 834004c..4c7a356 100644
--- a/lists/debian-forensics
+++ b/lists/debian-forensics
@@ -29,7 +29,7 @@ wipe
 
 ## Packages available as of squeeze
 
-#if DISTRIBUTION squeeze sid
+#if DISTRIBUTION squeeze wheezy sid
 aesfix
 aeskeyfind
 afflib-tools
diff --git a/lists/gnome-core b/lists/gnome-core
index 729f935..faa7774 100644
--- a/lists/gnome-core
+++ b/lists/gnome-core
@@ -7,7 +7,7 @@ gnome-core
 #if DISTRIBUTION lenny
 gdm
 #endif
-#if DISTRIBUTION squeeze sid
+#if DISTRIBUTION squeeze wheezy sid
 gdm3
 #endif
 desktop-base
diff --git a/lists/gnome-full b/lists/gnome-full
index 5c2ef11..bd717cf 100644
--- a/lists/gnome-full
+++ b/lists/gnome-full
@@ -7,6 +7,6 @@ gnome
 #if DISTRIBUTION lenny
 gdm
 #endif
-#if DISTRIBUTION squeeze sid
+#if DISTRIBUTION squeeze wheezy sid
 gdm3
 #endif
diff --git a/lists/kde b/lists/kde
index 72d3fa6..b781fe8 100644
--- a/lists/kde
+++ b/lists/kde
@@ -6,7 +6,7 @@
 #if DISTRIBUTION lenny
 kde
 #endif
-#if DISTRIBUTION squeeze sid
+#if DISTRIBUTION squeeze wheezy sid
 kde-standard
 #endif
 kdm
diff --git a/lists/kde-core b/lists/kde-core
index 57dc986..174eeb6 100644
--- a/lists/kde-core
+++ b/lists/kde-core
@@ -6,7 +6,7 @@
 #if DISTRIBUTION lenny
 kde-core
 #endif
-#if DISTRIBUTION squeeze sid
+#if DISTRIBUTION squeeze wheezy sid
 kde-plasma-desktop
 #endif
 kdm
diff --git a/lists/kde-full b/lists/kde-full
index 60f1f07..b375ee2 100644
--- a/lists/kde-full
+++ b/lists/kde-full
@@ -6,6 +6,6 @@
 #if DISTRIBUTION lenny
 koffice
 #endif
-#if DISTRIBUTION squeeze sid
+#if DISTRIBUTION squeeze wheezy sid
 kde-full
 #endif
diff --git a/lists/lxde b/lists/lxde
index 26bffd3..3884bfd 100644
--- a/lists/lxde
+++ b/lists/lxde
@@ -8,7 +8,7 @@ gdm
 #if DISTRIBUTION lenny
 lxnm
 #endif
-#if DISTRIBUTION squeeze sid
+#if DISTRIBUTION squeeze wheezy sid
 network-manager-gnome
 #endif
 desktop-base
diff --git a/lists/rescue b/lists/rescue
index 9ee910c..736924b 100644
--- a/lists/rescue
+++ b/lists/rescue
@@ -7,12 +7,12 @@
 #include <debian-forensics>
 
 # Other forensic packages
-#if DISTRIBUTION lenny squeeze sid
+#if DISTRIBUTION lenny squeeze wheezy sid
 scalpel
 #endif
 
 # Bootloaders
-#if DISTRIBUTION lenny squeeze sid
+#if DISTRIBUTION lenny squeeze wheezy sid
 syslinux-common
 #endif
 #if ARCHITECTURE amd64 i386
@@ -86,10 +86,7 @@ colordiff
 chrootuid
 cpio
 cryptcat
-#if DISTRIBUTION lenny sid
-# currently not in squeeze (FIXME)
 directvnc
-#endif
 etherwake
 ftp
 ifenslave-2.6
@@ -329,7 +326,7 @@ hostapd
 #if DISTRIBUTION lenny
 emacs22-nox
 #endif
-#if DISTRIBUTON squeeze sid
+#if DISTRIBUTON squeeze wheezy sid
 emacs23-nox
 #endif
 build-essential gdb gfortran gnat
diff --git a/lists/standard b/lists/standard
index 95a551c..a62f8ee 100644
--- a/lists/standard
+++ b/lists/standard
@@ -7,7 +7,7 @@
 console-setup console-common kbd
 #endif
 
-#if DISTRIBUTION squeeze
+#if DISTRIBUTION squeeze wheezy sid
 keyboard-configuration
 #endif
 
diff --git a/lists/xfce b/lists/xfce
index c554be8..86561a8 100644
--- a/lists/xfce
+++ b/lists/xfce
@@ -7,7 +7,7 @@ xfce4
 #if DISTRIBUTION lenny
 gdm
 #endif
-#if DISTRIBUTION squeeze sid
+#if DISTRIBUTION squeeze wheezy sid
 gdm3
 #endif
 desktop-base

-- 
live-build