[SCM] live-manual branch, debian-next, updated. debian/3.0_a14-1-48-geba79e7

[Ben Armstrong]

The following commit has been merged in the debian-next branch:
commit eba79e7ec179df410c4c3145877f71896e0ac438
Author: Ben Armstrong <synrg at debian.org>
Date:   Fri Aug 10 07:34:51 2012 -0300

    Updating language tasks section and examples chapter to no longer use task lists.

diff --git a/manual/en/user_customization-packages.ssi b/manual/en/user_customization-packages.ssi
index 9901106..cdb67ce 100644
--- a/manual/en/user_customization-packages.ssi
+++ b/manual/en/user_customization-packages.ssi
@@ -93,7 +93,7 @@ Package lists are a powerful way of expressing which packages should be installe
 
 *{Note:}* The behaviour of live-build when specifying a package that does not exist is determined by your choice of APT utility. See {Choosing apt or aptitude}#choosing-apt-or-aptitude for more details.
 
-3~ Using metapackages
+3~using-metapackages Using metapackages
 
 The simplest way to populate your package list is to use a task metapackage maintained by your distribution. For example:
 
@@ -199,27 +199,16 @@ Desktop and language tasks are special cases that need some extra planning and c
 
 When developing a desktop live image, the image typically boots directly to a working desktop, the choices of both desktop and default language having been made at build time, not at run time as in the case of the Debian Installer. That's not to say that a live image couldn't be built to support multiple desktops or multiple languages and offer the user a choice, but that is not live-build's default behaviour.
 
-Because there is no provision made automatically for language tasks, which include such things as language-specific fonts and input-method packages, if you want them, you need to specify them in your configuration. For example, a GNOME desktop image containing support for Japanese might include these tasks:
+Because there is no provision made automatically for language tasks, which include such things as language-specific fonts and input-method packages, if you want them, you need to specify them in your configuration. For example, a GNOME desktop image containing support for Japanese might include these task metapackages:
 
 code{
 
  $ lb config
- $ echo "gnome-desktop desktop standard laptop" >> config/task-lists/my.list.chroot
- $ echo "japanese japanese-desktop japanese-gnome-desktop" >> config/task-lists/my.list.chroot
+ $ echo "task-gnome-desktop task-laptop" >> config/package-lists/my.list.chroot
+ $ echo "task-japanese task-japanese-desktop task-japanese-gnome-desktop" >> config/package-lists/my.list.chroot
 
 }code
 
-Since desktop tasks are "internal" tasks, for every desktop flavour task included in the image, the corresponding value, if it differs from the default, "gnome", must be preseeded in the "tasksel/desktop" debconf variable or else tasksel will not recognize and install it. Thus:
-
-code{
-
- $ lb config
- $ echo 'tasksel tasksel/desktop multiselect kde' >> config/preseed/my.preseed.chroot
-
-}code
-
-This parameter can take multiple values, e.g. "lxde xfce" instead of "kde".
-
 2~installing-modified-or-third-party-packages Installing modified or third-party packages
 
 Whilst it is against the philosophy of Debian Live, it may sometimes be necessary to build a Live system with modified versions of packages that are in the Debian repository. This may be to modify or support additional features, languages and branding, or even to remove elements of existing packages that are undesirable. Similarly, "third-party" packages may be used to add bespoke and/or proprietary functionality.
diff --git a/manual/en/user_examples.ssi b/manual/en/user_examples.ssi
index 1f02a62..4b42f4d 100644
--- a/manual/en/user_examples.ssi
+++ b/manual/en/user_examples.ssi
@@ -279,7 +279,7 @@ code{
 
 }code
 
-At boot time we will generate the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. We will also need to preseed our desktop choice, "kde" so that tasksel will install the correct desktop task, as it differs from the default (see {Desktop and languages tasks}#desktop-and-language-tasks). Now let's put the pieces together:
+At boot time we will generate the pt_BR.UTF-8 locale and select the pt-latin1 keyboard layout. Now let's put the pieces together. Recalling from {Using metapackages}#using-metapackages that task metapackages are prefixed #{task-}#, we just specify these language boot parameters, then add standard priority packages and all our discovered task metapackages to our package list as follows:
 
 code{
 
@@ -290,10 +290,10 @@ code{
      -k 486 \
      --bootappend-live "locales=pt_BR.UTF-8 keyboard-layouts=pt-latin1" \
      --debian-installer live
- $ echo kde-desktop brazilian-portuguese brazilian-portuguese-desktop \
-     brazilian-portuguese-kde-desktop >> config/task-lists/my.list.chroot
- $ echo debian-installer-launcher >> config/package-lists/my.list.chroot
- $ echo tasksel tasksel/desktop multiselect kde >> config/preseed/my.preseed.chroot
+ $ echo '! Packages Priority standard' > config/package-lists/standard.list.chroot
+ $ echo task-kde-desktop task-brazilian-portuguese task-brazilian-portuguese-desktop \
+     task-brazilian-portuguese-kde-desktop >> config/package-lists/desktop.list.chroot
+ $ echo debian-installer-launcher >> config/package-lists/installer.list.chroot
 
 }code
 

-- 
live-manual