[SCM] live-build branch, debian-old-2.0, updated. debian/2.0.11-1-15-g1fd3dfe

Daniel Baumann daniel at debian.org
Tue Jan 25 06:26:50 UTC 2011


The following commit has been merged in the debian-old-2.0 branch:
commit 1fd3dfeb85ce3c27f8e50cc5fdcf3b39a90e45b0
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Jan 25 07:25:43 2011 +0100

    Don't add debian-installer-launcher on desktop flavours by default as squeeze will have no installer by default.

diff --git a/functions/defaults.sh b/functions/defaults.sh
index bd6c679..cab865c 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -728,7 +728,6 @@ Set_defaults ()
 
 					*)
 						LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|gnome-desktop||' -e 's|desktop||' -e 's|laptop||') standard gnome-desktop desktop laptop"
-						LB_PACKAGES="$(echo ${LB_PACKAGES} | sed -e 's|debian-installer-launcher||') debian-installer-launcher"
 						;;
 				esac
 				;;
@@ -743,7 +742,6 @@ Set_defaults ()
 
 					*)
 						LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|kde-desktop||' -e 's|desktop||' -e 's|laptop||') standard kde-desktop desktop laptop"
-						LB_PACKAGES="$(echo ${LB_PACKAGES} | sed -e 's|debian-installer-launcher||') debian-installer-launcher"
 				esac
 				;;
 
@@ -757,7 +755,6 @@ Set_defaults ()
 
 					*)
 						LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|lxde-desktop||' -e 's|desktop||' -e 's|laptop||') standard lxde-desktop desktop laptop"
-						LB_PACKAGES="$(echo ${LB_PACKAGES} | sed -e 's|debian-installer-launcher||') debian-installer-launcher"
 						;;
 				esac
 				;;
@@ -772,7 +769,6 @@ Set_defaults ()
 
 					*)
 						LB_TASKS="$(echo ${LB_TASKS} | sed -e 's|standard||' -e 's|xfce-desktop||' -e 's|desktop||' -e 's|laptop||') standard xfce-desktop desktop laptop"
-						LB_PACKAGES="$(echo ${LB_PACKAGES} | sed -e 's|debian-installer-launcher||') debian-installer-launcher"
 						;;
 				esac
 				;;

-- 
live-build



More information about the debian-live-changes mailing list