[SCM] live-manual branch, debian, updated. debian/2.0_a10-1-4-g3633c64
Ben Armstrong
synrg at debian.org
Wed Nov 24 21:38:47 UTC 2010
The following commit has been merged in the debian branch:
commit 3633c64c24b292ecc68abc015ee5a4f400c5fe67
Author: Ben Armstrong <synrg at debian.org>
Date: Wed Nov 24 17:38:11 2010 -0400
Adding tasks section.
diff --git a/manual/de/live-manual.ssm b/manual/de/live-manual.ssm
index b367e6d..3894a68 100644
--- a/manual/de/live-manual.ssm
+++ b/manual/de/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2010-11-21
+ :published: 2010-11-24
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index 4848216..df2ab9b 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -81,8 +81,9 @@ deb http://live.debian.net/ sid-snapshots main contrib non-free
}code
-If you add the line to #{config/chroot_sources/live.binary}#, the repository
-will be added to your live system's #{/etc/apt/sources.list.d/}# directory.
+If you add the same line to #{config/chroot_sources/live.binary}#, the
+repository will be added to your live system's #{/etc/apt/sources.list.d/}#
+directory.
If such files exist, they will be picked up automatically.
@@ -99,22 +100,21 @@ $ lb config --repository live.debian.net
}code
-2~installing-additional-packages Installing additional packages
-
-live-build has a number of mechanisms for indicating that additional
-packages should be installed, including:
-
-_* The #{--packages}# option
+2~choosing-packages-to-install Choosing packages to install
-_* Package lists
+There are a number of ways to choose which packages live-build will install
+in your image, covering a variety of different needs. You can simply name
+individual packages to install, either with the #{--packages}# option for a
+few packages, or in a package list of your own for larger numbers. You can
+also choose larger predefined lists of packages, or use APT tasks. And
+finally, you may place package files in your #{config/}# tree, which is well
+suited to testing of new or experimental packages before they are available
+from a repository.
-_* Local packages (#{config/chroot_local-packages/}#)
+3~ Choosing a few packages
-_* Tasks
-
-3~ The #{--packages}# option
-
-To install additional packages, simply specify #{--packages}#. For example:
+When the number of packages added is small, simply specify
+#{--packages}#. For example:
code{
@@ -127,8 +127,8 @@ determined by your choice of APT utility. See {Choosing apt or
aptitude}#choosing-apt-or-aptitude for more details.
If you need to specify a large number of packages to be installed or you
-need flexibility regarding which packages to install, you should probably be
-using package lists. See {Package lists}#package-lists for more information.
+need flexibility regarding which packages to install, use package lists as
+discussed in the following section, {Package lists}#package-lists.
3~package-lists Package lists
@@ -137,7 +137,7 @@ installed. live-build ships with a number of predefined package lists which
provide sensible default package selections for the major desktop
environments, as well as standard systems.
-To specify one or more package list, you can use:
+To specify one or more package lists, you can use:
code{
@@ -197,9 +197,9 @@ code{
}code
-You may test for any one of a number of values, e.g. to install
-#{memtest86+} if either #{--architecture i386}# or #{--architecture amd64}#
-is specified:
+You may test for any one of a number of values, e.g. to install #{memtest86+
+}# if either #{--architecture i386}# or #{--architecture amd64}# is
+specified:
code{
@@ -229,7 +229,60 @@ The nesting of conditionals is not supported.
3~ Tasks
-%FIXME
+The Debian Installer offers the user choices of a number of preselected
+lists of packages, each one focused on a particular kind of system, or task
+a system may be used for, such as "Graphical desktop environment", "Mail
+server" or "Laptop". These lists are called "tasks" and are supported by APT
+through the "Task:" field. You can specify one or more tasks in live-build
+via the #{--tasks}# option, as in the example below.
+
+code{
+
+$ lb config --tasks "mail-server file-server"
+
+}code
+
+The primary tasks available in the Debian Installer can be listed with
+#{tasksel --list-tasks}# in the live system. The contents of any task,
+including ones not included in this list, may be examined with #{tasksel
+--task-packages}#.
+
+4~ Desktop and language tasks
+
+Desktop and language tasks are special cases. In the Debian Installer, if
+the medium was prepared for a particular desktop environment flavour, the
+corresponding task will be automatically installed. Thus, there are there
+are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and
+#{xfce-desktop}# tasks, none of which are offered in #{tasksel}#'s
+menu. Likewise, there are no menu entries for tasks for languages, but the
+user's language choice during the install influences the selection of
+corresponding language tasks.
+
+In live-build, therefore, these special cases are also given special
+consideration, but with three notable differences at the time of writing.
+
+First, there is no provision made yet automatically for language tasks,
+although a subset of those packages are included if you specify #{lb config
+--language}#. If you need those tasks, which include such things as
+language-specific fonts and input-method packages, you need to specify them
+in your configuration. For example:
+
+code{
+
+$ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
+
+}code
+
+Second, if you specify #{--packages gnome-desktop}#, or any of the other
+three desktop flavours mentioned above, it is equivalent to specifying
+#{--packages standard-x11 --tasks "gnome-desktop desktop standard laptop"}#,
+except substituting the #{*-desktop}# task for the flavour you specified.
+
+Third, if any of the tasks for these desktop flavours are selected, either
+explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build
+will preseed the corresponding desktop value for Debian Installer (if it is
+included) to ensure it follows its own rules for installing different
+desktop flavours.
2~ Installing modified or third-party packages
@@ -281,8 +334,8 @@ control.
3~ Using an APT repository to install custom packages
Unlike using #{chroot_local-packages}#, when using a custom APT repository
-you must ensure that you specify the packages elsewhere. See #{Installing
-additional packages}#installing-additional-packages for details.
+you must ensure that you specify the packages elsewhere. See #{Choosing
+packages to install}#choosing-packages-to-install for details.
Whilst it may seem unnecessary effort to create an APT repository to install
custom packages, the infrastructure can be easily re-used at a later date to
diff --git a/manual/en/live-manual.ssm b/manual/en/live-manual.ssm
index e18c0bd..2d80bae 100644
--- a/manual/en/live-manual.ssm
+++ b/manual/en/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2010-11-21
+ :published: 2010-11-24
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/en/user_customization-packages.ssi b/manual/en/user_customization-packages.ssi
index dcce549..22e4c47 100644
--- a/manual/en/user_customization-packages.ssi
+++ b/manual/en/user_customization-packages.ssi
@@ -46,7 +46,7 @@ deb http://live.debian.net/ sid-snapshots main contrib non-free
}code
-If you add the line to #{config/chroot_sources/live.binary}#, the repository will be added to your live system's #{/etc/apt/sources.list.d/}# directory.
+If you add the same line to #{config/chroot_sources/live.binary}#, the repository will be added to your live system's #{/etc/apt/sources.list.d/}# directory.
If such files exist, they will be picked up automatically.
@@ -60,21 +60,13 @@ $ lb config --repository live.debian.net
}code
-2~installing-additional-packages Installing additional packages
+2~choosing-packages-to-install Choosing packages to install
-live-build has a number of mechanisms for indicating that additional packages should be installed, including:
+There are a number of ways to choose which packages live-build will install in your image, covering a variety of different needs. You can simply name individual packages to install, either with the #{--packages}# option for a few packages, or in a package list of your own for larger numbers. You can also choose larger predefined lists of packages, or use APT tasks. And finally, you may place package files in your #{config/}# tree, which is well suited to testing of new or experimental packages before they are available from a repository.
-_* The #{--packages}# option
+3~ Choosing a few packages
-_* Package lists
-
-_* Local packages (#{config/chroot_local-packages/}#)
-
-_* Tasks
-
-3~ The #{--packages}# option
-
-To install additional packages, simply specify #{--packages}#. For example:
+When the number of packages added is small, simply specify #{--packages}#. For example:
code{
@@ -84,13 +76,13 @@ $ lb config --packages "package1 package2 package3"
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.
-If you need to specify a large number of packages to be installed or you need flexibility regarding which packages to install, you should probably be using package lists. See {Package lists}#package-lists for more information.
+If you need to specify a large number of packages to be installed or you need flexibility regarding which packages to install, use package lists as discussed in the following section, {Package lists}#package-lists.
3~package-lists Package lists
Package lists are a powerful way of expressing which packages should be installed. live-build ships with a number of predefined package lists which provide sensible default package selections for the major desktop environments, as well as standard systems.
-To specify one or more package list, you can use:
+To specify one or more package lists, you can use:
code{
@@ -139,7 +131,7 @@ ia32-libs
}code
-You may test for any one of a number of values, e.g. to install #{memtest86+} if either #{--architecture i386}# or #{--architecture amd64}# is specified:
+You may test for any one of a number of values, e.g. to install #{memtest86+ }# if either #{--architecture i386}# or #{--architecture amd64}# is specified:
code{
@@ -173,7 +165,33 @@ The nesting of conditionals is not supported.
3~ Tasks
-%FIXME
+The Debian Installer offers the user choices of a number of preselected lists of packages, each one focused on a particular kind of system, or task a system may be used for, such as "Graphical desktop environment", "Mail server" or "Laptop". These lists are called "tasks" and are supported by APT through the "Task:" field. You can specify one or more tasks in live-build via the #{--tasks}# option, as in the example below.
+
+code{
+
+$ lb config --tasks "mail-server file-server"
+
+}code
+
+The primary tasks available in the Debian Installer can be listed with #{tasksel --list-tasks}# in the live system. The contents of any task, including ones not included in this list, may be examined with #{tasksel --task-packages}#.
+
+4~ Desktop and language tasks
+
+Desktop and language tasks are special cases. In the Debian Installer, if the medium was prepared for a particular desktop environment flavour, the corresponding task will be automatically installed. Thus, there are there are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}# tasks, none of which are offered in #{tasksel}#'s menu. Likewise, there are no menu entries for tasks for languages, but the user's language choice during the install influences the selection of corresponding language tasks.
+
+In live-build, therefore, these special cases are also given special consideration, but with three notable differences at the time of writing.
+
+First, there is no provision made yet automatically for language tasks, although a subset of those packages are included if you specify #{lb config --language}#. If you need those tasks, which include such things as language-specific fonts and input-method packages, you need to specify them in your configuration. For example:
+
+code{
+
+$ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
+
+}code
+
+Second, if you specify #{--packages gnome-desktop}#, or any of the other three desktop flavours mentioned above, it is equivalent to specifying #{--packages standard-x11 --tasks "gnome-desktop desktop standard laptop"}#, except substituting the #{*-desktop}# task for the flavour you specified.
+
+Third, if any of the tasks for these desktop flavours are selected, either explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build will preseed the corresponding desktop value for Debian Installer (if it is included) to ensure it follows its own rules for installing different desktop flavours.
2~ Installing modified or third-party packages
@@ -205,7 +223,7 @@ _* It does not lend itself to storing Debian Live configurations in revision con
3~ Using an APT repository to install custom packages
-Unlike using #{chroot_local-packages}#, when using a custom APT repository you must ensure that you specify the packages elsewhere. See #{Installing additional packages}#installing-additional-packages for details.
+Unlike using #{chroot_local-packages}#, when using a custom APT repository you must ensure that you specify the packages elsewhere. See #{Choosing packages to install}#choosing-packages-to-install for details.
Whilst it may seem unnecessary effort to create an APT repository to install custom packages, the infrastructure can be easily re-used at a later date to offer updates of the modified packages.
diff --git a/manual/fr/live-manual.ssm b/manual/fr/live-manual.ssm
index cbe920d..fc96ee4 100644
--- a/manual/fr/live-manual.ssm
+++ b/manual/fr/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2010-11-21
+ :published: 2010-11-24
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/fr/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
index 4848216..df2ab9b 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -81,8 +81,9 @@ deb http://live.debian.net/ sid-snapshots main contrib non-free
}code
-If you add the line to #{config/chroot_sources/live.binary}#, the repository
-will be added to your live system's #{/etc/apt/sources.list.d/}# directory.
+If you add the same line to #{config/chroot_sources/live.binary}#, the
+repository will be added to your live system's #{/etc/apt/sources.list.d/}#
+directory.
If such files exist, they will be picked up automatically.
@@ -99,22 +100,21 @@ $ lb config --repository live.debian.net
}code
-2~installing-additional-packages Installing additional packages
-
-live-build has a number of mechanisms for indicating that additional
-packages should be installed, including:
-
-_* The #{--packages}# option
+2~choosing-packages-to-install Choosing packages to install
-_* Package lists
+There are a number of ways to choose which packages live-build will install
+in your image, covering a variety of different needs. You can simply name
+individual packages to install, either with the #{--packages}# option for a
+few packages, or in a package list of your own for larger numbers. You can
+also choose larger predefined lists of packages, or use APT tasks. And
+finally, you may place package files in your #{config/}# tree, which is well
+suited to testing of new or experimental packages before they are available
+from a repository.
-_* Local packages (#{config/chroot_local-packages/}#)
+3~ Choosing a few packages
-_* Tasks
-
-3~ The #{--packages}# option
-
-To install additional packages, simply specify #{--packages}#. For example:
+When the number of packages added is small, simply specify
+#{--packages}#. For example:
code{
@@ -127,8 +127,8 @@ determined by your choice of APT utility. See {Choosing apt or
aptitude}#choosing-apt-or-aptitude for more details.
If you need to specify a large number of packages to be installed or you
-need flexibility regarding which packages to install, you should probably be
-using package lists. See {Package lists}#package-lists for more information.
+need flexibility regarding which packages to install, use package lists as
+discussed in the following section, {Package lists}#package-lists.
3~package-lists Package lists
@@ -137,7 +137,7 @@ installed. live-build ships with a number of predefined package lists which
provide sensible default package selections for the major desktop
environments, as well as standard systems.
-To specify one or more package list, you can use:
+To specify one or more package lists, you can use:
code{
@@ -197,9 +197,9 @@ code{
}code
-You may test for any one of a number of values, e.g. to install
-#{memtest86+} if either #{--architecture i386}# or #{--architecture amd64}#
-is specified:
+You may test for any one of a number of values, e.g. to install #{memtest86+
+}# if either #{--architecture i386}# or #{--architecture amd64}# is
+specified:
code{
@@ -229,7 +229,60 @@ The nesting of conditionals is not supported.
3~ Tasks
-%FIXME
+The Debian Installer offers the user choices of a number of preselected
+lists of packages, each one focused on a particular kind of system, or task
+a system may be used for, such as "Graphical desktop environment", "Mail
+server" or "Laptop". These lists are called "tasks" and are supported by APT
+through the "Task:" field. You can specify one or more tasks in live-build
+via the #{--tasks}# option, as in the example below.
+
+code{
+
+$ lb config --tasks "mail-server file-server"
+
+}code
+
+The primary tasks available in the Debian Installer can be listed with
+#{tasksel --list-tasks}# in the live system. The contents of any task,
+including ones not included in this list, may be examined with #{tasksel
+--task-packages}#.
+
+4~ Desktop and language tasks
+
+Desktop and language tasks are special cases. In the Debian Installer, if
+the medium was prepared for a particular desktop environment flavour, the
+corresponding task will be automatically installed. Thus, there are there
+are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and
+#{xfce-desktop}# tasks, none of which are offered in #{tasksel}#'s
+menu. Likewise, there are no menu entries for tasks for languages, but the
+user's language choice during the install influences the selection of
+corresponding language tasks.
+
+In live-build, therefore, these special cases are also given special
+consideration, but with three notable differences at the time of writing.
+
+First, there is no provision made yet automatically for language tasks,
+although a subset of those packages are included if you specify #{lb config
+--language}#. If you need those tasks, which include such things as
+language-specific fonts and input-method packages, you need to specify them
+in your configuration. For example:
+
+code{
+
+$ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
+
+}code
+
+Second, if you specify #{--packages gnome-desktop}#, or any of the other
+three desktop flavours mentioned above, it is equivalent to specifying
+#{--packages standard-x11 --tasks "gnome-desktop desktop standard laptop"}#,
+except substituting the #{*-desktop}# task for the flavour you specified.
+
+Third, if any of the tasks for these desktop flavours are selected, either
+explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build
+will preseed the corresponding desktop value for Debian Installer (if it is
+included) to ensure it follows its own rules for installing different
+desktop flavours.
2~ Installing modified or third-party packages
@@ -281,8 +334,8 @@ control.
3~ Using an APT repository to install custom packages
Unlike using #{chroot_local-packages}#, when using a custom APT repository
-you must ensure that you specify the packages elsewhere. See #{Installing
-additional packages}#installing-additional-packages for details.
+you must ensure that you specify the packages elsewhere. See #{Choosing
+packages to install}#choosing-packages-to-install for details.
Whilst it may seem unnecessary effort to create an APT repository to install
custom packages, the infrastructure can be easily re-used at a later date to
diff --git a/manual/po/de/live-manual.ssm.po b/manual/po/de/live-manual.ssm.po
index 7c898e6..c6c7033 100644
--- a/manual/po/de/live-manual.ssm.po
+++ b/manual/po/de/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-21 13:45-0400\n"
+"POT-Creation-Date: 2010-11-24 17:37-0400\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2010-11-21\n"
+" :published: 2010-11-24\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/de/user_customization-packages.ssi.po
index 68fc921..6fc7fe4 100644
--- a/manual/po/de/user_customization-packages.ssi.po
+++ b/manual/po/de/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-21 20:09-0400\n"
+"POT-Creation-Date: 2010-11-24 17:37-0400\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -55,14 +55,16 @@ msgstr ""
#: en/user_customization-internationalization.ssi:38
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:80 en/user_customization-packages.ssi:96
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:145
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:237
-#: en/user_customization-packages.ssi:249
-#: en/user_customization-packages.ssi:259 en/user_examples.ssi:24
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:88
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:137
+#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:277 en/user_examples.ssi:24
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:76 en/user_installation.ssi:84
@@ -113,15 +115,16 @@ msgstr ""
#: en/user_customization-internationalization.ssi:42
#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:100
-#: en/user_customization-packages.ssi:141
-#: en/user_customization-packages.ssi:151
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:241
-#: en/user_customization-packages.ssi:253
-#: en/user_customization-packages.ssi:263 en/user_examples.ssi:33
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:92
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:281 en/user_examples.ssi:33
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -134,7 +137,7 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:118
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:110
msgid "% FIXME"
msgstr ""
@@ -273,8 +276,9 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:50
msgid ""
-"If you add the line to #{config/chroot_sources/live.binary}#, the repository "
-"will be added to your live system's #{/etc/apt/sources.list.d/}# directory."
+"If you add the same line to #{config/chroot_sources/live.binary}#, the "
+"repository will be added to your live system's #{/etc/apt/sources.list.d/}# "
+"directory."
msgstr ""
#. type: Plain text
@@ -304,54 +308,41 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:64
-msgid "2~installing-additional-packages Installing additional packages"
+msgid "2~choosing-packages-to-install Choosing packages to install"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:66
msgid ""
-"live-build has a number of mechanisms for indicating that additional "
-"packages should be installed, including:"
+"There are a number of ways to choose which packages live-build will install "
+"in your image, covering a variety of different needs. You can simply name "
+"individual packages to install, either with the #{--packages}# option for a "
+"few packages, or in a package list of your own for larger numbers. You can "
+"also choose larger predefined lists of packages, or use APT tasks. And "
+"finally, you may place package files in your #{config/}# tree, which is well "
+"suited to testing of new or experimental packages before they are available "
+"from a repository."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:68
-msgid "_* The #{--packages}# option"
+msgid "3~ Choosing a few packages"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:70
-msgid "_* Package lists"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:72
-msgid "_* Local packages (#{config/chroot_local-packages/}#)"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:74
-msgid "_* Tasks"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:76
-msgid "3~ The #{--packages}# option"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:78
msgid ""
-"To install additional packages, simply specify #{--packages}#. For example:"
+"When the number of packages added is small, simply specify #{--packages}#. "
+"For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:82
+#: en/user_customization-packages.ssi:74
msgid "$ lb config --packages \"package1 package2 package3\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:86
+#: en/user_customization-packages.ssi:78
msgid ""
"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}"
@@ -359,20 +350,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:88
+#: en/user_customization-packages.ssi:80
msgid ""
"If you need to specify a large number of packages to be installed or you "
-"need flexibility regarding which packages to install, you should probably be "
-"using package lists. See {Package lists}#package-lists for more information."
+"need flexibility regarding which packages to install, use package lists as "
+"discussed in the following section, {Package lists}#package-lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:82
msgid "3~package-lists Package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:92
+#: en/user_customization-packages.ssi:84
msgid ""
"Package lists are a powerful way of expressing which packages should be "
"installed. live-build ships with a number of predefined package lists which "
@@ -381,36 +372,36 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:94
-msgid "To specify one or more package list, you can use:"
+#: en/user_customization-packages.ssi:86
+msgid "To specify one or more package lists, you can use:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:98
+#: en/user_customization-packages.ssi:90
msgid "$ lb config --packages-lists \"list1 list2 list3\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:102
+#: en/user_customization-packages.ssi:94
msgid ""
"Note: Package lists that are distributed with live-build reside in the #{/"
"usr/share/live/build/lists/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:104
+#: en/user_customization-packages.ssi:96
msgid "4~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:98
msgid ""
"You may supplement the supplied lists using local package lists stored in #"
"{config/chroot_local-packageslists/}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:108
+#: en/user_customization-packages.ssi:100
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed. Local package lists always override package lists "
@@ -419,12 +410,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:110
+#: en/user_customization-packages.ssi:102
msgid "4~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:104
msgid ""
"In case you want to include some required .deb packages to live media's #"
"{pool/}# (without installing them onto the live image) you may need to use "
@@ -434,24 +425,24 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:106
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:108
msgid "4~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:117
msgid "% code{ % % #include <gnome> % iceweasel % % }code"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:119
msgid ""
"The package lists that are included with live-build make extensive use of "
"includes. They are available to view in the #{/usr/share/live/build/lists/}# "
@@ -459,12 +450,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:121
msgid "4~ Using conditionals inside package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:123
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -475,32 +466,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:125
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:131
msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:135
msgid ""
"You may test for any one of a number of values, e.g. to install #"
-"{memtest86+} if either #{--architecture i386}# or #{--architecture amd64}# "
+"{memtest86+ }# if either #{--architecture i386}# or #{--architecture amd64}# "
"is specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:141
msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:145
msgid ""
"You may also test against variables that may contain more than one value, e."
"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
@@ -508,43 +499,122 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:151
msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:155
msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:161
msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:165
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:167
msgid "3~ Tasks"
msgstr ""
#. type: Plain text
+#: en/user_customization-packages.ssi:169
+msgid ""
+"The Debian Installer offers the user choices of a number of preselected "
+"lists of packages, each one focused on a particular kind of system, or task "
+"a system may be used for, such as \"Graphical desktop environment\", \"Mail "
+"server\" or \"Laptop\". These lists are called \"tasks\" and are supported "
+"by APT through the \"Task:\" field. You can specify one or more tasks in "
+"live-build via the #{--tasks}# option, as in the example below."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:173
+msgid "$ lb config --tasks \"mail-server file-server\""
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-packages.ssi:177
-msgid "%FIXME"
+msgid ""
+"The primary tasks available in the Debian Installer can be listed with #"
+"{tasksel --list-tasks}# in the live system. The contents of any task, "
+"including ones not included in this list, may be examined with #{tasksel --"
+"task-packages}#."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:179
-msgid "2~ Installing modified or third-party packages"
+msgid "4~ Desktop and language tasks"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:181
msgid ""
+"Desktop and language tasks are special cases. In the Debian Installer, if "
+"the medium was prepared for a particular desktop environment flavour, the "
+"corresponding task will be automatically installed. Thus, there are there "
+"are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}"
+"# tasks, none of which are offered in #{tasksel}#'s menu. Likewise, there "
+"are no menu entries for tasks for languages, but the user's language choice "
+"during the install influences the selection of corresponding language tasks."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:183
+msgid ""
+"In live-build, therefore, these special cases are also given special "
+"consideration, but with three notable differences at the time of writing."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:185
+msgid ""
+"First, there is no provision made yet automatically for language tasks, "
+"although a subset of those packages are included if you specify #{lb config "
+"--language}#. If you need those tasks, which include such things as language-"
+"specific fonts and input-method packages, you need to specify them in your "
+"configuration. For example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:189
+msgid ""
+"$ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:193
+msgid ""
+"Second, if you specify #{--packages gnome-desktop}#, or any of the other "
+"three desktop flavours mentioned above, it is equivalent to specifying #{--"
+"packages standard-x11 --tasks \"gnome-desktop desktop standard laptop\"}#, "
+"except substituting the #{*-desktop}# task for the flavour you specified."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:195
+msgid ""
+"Third, if any of the tasks for these desktop flavours are selected, either "
+"explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build "
+"will preseed the corresponding desktop value for Debian Installer (if it is "
+"included) to ensure it follows its own rules for installing different "
+"desktop flavours."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:197
+msgid "2~ Installing modified or third-party packages"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:199
+msgid ""
"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 "
@@ -554,7 +624,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:201
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -565,22 +635,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:203
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:209
msgid ""
"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
"off\" customizations but has a number of drawbacks, whilst using a custom "
@@ -588,12 +658,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:213
msgid ""
"To install a custom package, simply copy it to the #{config/chroot_local-"
"packages/}# directory. Packages that are inside this directory will be "
@@ -602,53 +672,53 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:215
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:217
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:219
msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:221
msgid ""
"_* You must install all appropriate packages in the #{config/chroot_local-"
"packages/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:223
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:225
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:227
msgid ""
"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
-"you must ensure that you specify the packages elsewhere. See #{Installing "
-"additional packages}#installing-additional-packages for details."
+"you must ensure that you specify the packages elsewhere. See #{Choosing "
+"packages to install}#choosing-packages-to-install for details."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:229
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
@@ -656,12 +726,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:231
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:233
msgid ""
"live-build uses APT to install all packages into the live system so will "
"therefore inherit behaviours from this program. One relevant example is that "
@@ -671,7 +741,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:235
msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -681,17 +751,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:237
msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:239
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:241
msgid ""
"You can configure APT through a number of options applied only at build "
"time. (APT configuration used in the running live system may be configured "
@@ -702,12 +772,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:243
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:245
msgid ""
"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
"at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -717,26 +787,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:247
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:249
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:251
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:253
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -744,17 +814,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:257
msgid "lb config --apt-http-proxy http://proxy/"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:261
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:263
msgid ""
"You may find yourself needing to save some space on the image media, in "
"which case one or the other or both of the following options may be of "
@@ -762,19 +832,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:265
msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:269
msgid "$ lb config --binary-indices false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:273
msgid ""
"This will not influence the entries in /etc/apt/sources.list, but merely "
"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
@@ -784,19 +854,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:275
msgid ""
"If you find the installation of recommended packages bloats your image too "
"much, you may disable that default option of APT with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:279
msgid "$ lb config -apt-recommends false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:283
msgid ""
"The tradeoff here is that recommended packages are defined as \"packages "
"that would be found together with this one in all but unusual installations"
@@ -808,12 +878,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:285
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:287
msgid ""
"If there is not an #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -822,11 +892,11 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:289
msgid "3~ APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:291
msgid "% FIXME: needs content"
msgstr ""
diff --git a/manual/po/fr/live-manual.ssm.po b/manual/po/fr/live-manual.ssm.po
index f900fda..27c95ee 100644
--- a/manual/po/fr/live-manual.ssm.po
+++ b/manual/po/fr/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-21 13:45-0400\n"
+"POT-Creation-Date: 2010-11-24 17:37-0400\n"
"PO-Revision-Date: 2010-10-21 07:06-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2010-11-21\n"
+" :published: 2010-11-24\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index 82f9f3a..a846d58 100644
--- a/manual/po/fr/user_customization-packages.ssi.po
+++ b/manual/po/fr/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-21 20:09-0400\n"
+"POT-Creation-Date: 2010-11-24 17:37-0400\n"
"PO-Revision-Date: 2010-10-16 14:45-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -55,14 +55,16 @@ msgstr ""
#: en/user_customization-internationalization.ssi:38
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:80 en/user_customization-packages.ssi:96
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:145
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:237
-#: en/user_customization-packages.ssi:249
-#: en/user_customization-packages.ssi:259 en/user_examples.ssi:24
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:88
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:137
+#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:277 en/user_examples.ssi:24
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:76 en/user_installation.ssi:84
@@ -113,15 +115,16 @@ msgstr "code{"
#: en/user_customization-internationalization.ssi:42
#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:100
-#: en/user_customization-packages.ssi:141
-#: en/user_customization-packages.ssi:151
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:241
-#: en/user_customization-packages.ssi:253
-#: en/user_customization-packages.ssi:263 en/user_examples.ssi:33
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:92
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:281 en/user_examples.ssi:33
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -134,7 +137,7 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:118
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:110
msgid "% FIXME"
msgstr ""
@@ -273,8 +276,9 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:50
msgid ""
-"If you add the line to #{config/chroot_sources/live.binary}#, the repository "
-"will be added to your live system's #{/etc/apt/sources.list.d/}# directory."
+"If you add the same line to #{config/chroot_sources/live.binary}#, the "
+"repository will be added to your live system's #{/etc/apt/sources.list.d/}# "
+"directory."
msgstr ""
#. type: Plain text
@@ -304,54 +308,41 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:64
-msgid "2~installing-additional-packages Installing additional packages"
+msgid "2~choosing-packages-to-install Choosing packages to install"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:66
msgid ""
-"live-build has a number of mechanisms for indicating that additional "
-"packages should be installed, including:"
+"There are a number of ways to choose which packages live-build will install "
+"in your image, covering a variety of different needs. You can simply name "
+"individual packages to install, either with the #{--packages}# option for a "
+"few packages, or in a package list of your own for larger numbers. You can "
+"also choose larger predefined lists of packages, or use APT tasks. And "
+"finally, you may place package files in your #{config/}# tree, which is well "
+"suited to testing of new or experimental packages before they are available "
+"from a repository."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:68
-msgid "_* The #{--packages}# option"
+msgid "3~ Choosing a few packages"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:70
-msgid "_* Package lists"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:72
-msgid "_* Local packages (#{config/chroot_local-packages/}#)"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:74
-msgid "_* Tasks"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:76
-msgid "3~ The #{--packages}# option"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:78
msgid ""
-"To install additional packages, simply specify #{--packages}#. For example:"
+"When the number of packages added is small, simply specify #{--packages}#. "
+"For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:82
+#: en/user_customization-packages.ssi:74
msgid "$ lb config --packages \"package1 package2 package3\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:86
+#: en/user_customization-packages.ssi:78
msgid ""
"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}"
@@ -359,20 +350,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:88
+#: en/user_customization-packages.ssi:80
msgid ""
"If you need to specify a large number of packages to be installed or you "
-"need flexibility regarding which packages to install, you should probably be "
-"using package lists. See {Package lists}#package-lists for more information."
+"need flexibility regarding which packages to install, use package lists as "
+"discussed in the following section, {Package lists}#package-lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:82
msgid "3~package-lists Package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:92
+#: en/user_customization-packages.ssi:84
msgid ""
"Package lists are a powerful way of expressing which packages should be "
"installed. live-build ships with a number of predefined package lists which "
@@ -381,36 +372,36 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:94
-msgid "To specify one or more package list, you can use:"
+#: en/user_customization-packages.ssi:86
+msgid "To specify one or more package lists, you can use:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:98
+#: en/user_customization-packages.ssi:90
msgid "$ lb config --packages-lists \"list1 list2 list3\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:102
+#: en/user_customization-packages.ssi:94
msgid ""
"Note: Package lists that are distributed with live-build reside in the #{/"
"usr/share/live/build/lists/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:104
+#: en/user_customization-packages.ssi:96
msgid "4~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:98
msgid ""
"You may supplement the supplied lists using local package lists stored in #"
"{config/chroot_local-packageslists/}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:108
+#: en/user_customization-packages.ssi:100
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed. Local package lists always override package lists "
@@ -419,12 +410,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:110
+#: en/user_customization-packages.ssi:102
msgid "4~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:104
msgid ""
"In case you want to include some required .deb packages to live media's #"
"{pool/}# (without installing them onto the live image) you may need to use "
@@ -434,24 +425,24 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:106
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:108
msgid "4~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:117
msgid "% code{ % % #include <gnome> % iceweasel % % }code"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:119
msgid ""
"The package lists that are included with live-build make extensive use of "
"includes. They are available to view in the #{/usr/share/live/build/lists/}# "
@@ -459,12 +450,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:121
msgid "4~ Using conditionals inside package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:123
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -475,32 +466,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:125
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:131
msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:135
msgid ""
"You may test for any one of a number of values, e.g. to install #"
-"{memtest86+} if either #{--architecture i386}# or #{--architecture amd64}# "
+"{memtest86+ }# if either #{--architecture i386}# or #{--architecture amd64}# "
"is specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:141
msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:145
msgid ""
"You may also test against variables that may contain more than one value, e."
"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
@@ -508,43 +499,122 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:151
msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:155
msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:161
msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:165
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:167
msgid "3~ Tasks"
msgstr ""
#. type: Plain text
+#: en/user_customization-packages.ssi:169
+msgid ""
+"The Debian Installer offers the user choices of a number of preselected "
+"lists of packages, each one focused on a particular kind of system, or task "
+"a system may be used for, such as \"Graphical desktop environment\", \"Mail "
+"server\" or \"Laptop\". These lists are called \"tasks\" and are supported "
+"by APT through the \"Task:\" field. You can specify one or more tasks in "
+"live-build via the #{--tasks}# option, as in the example below."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:173
+msgid "$ lb config --tasks \"mail-server file-server\""
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-packages.ssi:177
-msgid "%FIXME"
+msgid ""
+"The primary tasks available in the Debian Installer can be listed with #"
+"{tasksel --list-tasks}# in the live system. The contents of any task, "
+"including ones not included in this list, may be examined with #{tasksel --"
+"task-packages}#."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:179
-msgid "2~ Installing modified or third-party packages"
+msgid "4~ Desktop and language tasks"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:181
msgid ""
+"Desktop and language tasks are special cases. In the Debian Installer, if "
+"the medium was prepared for a particular desktop environment flavour, the "
+"corresponding task will be automatically installed. Thus, there are there "
+"are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}"
+"# tasks, none of which are offered in #{tasksel}#'s menu. Likewise, there "
+"are no menu entries for tasks for languages, but the user's language choice "
+"during the install influences the selection of corresponding language tasks."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:183
+msgid ""
+"In live-build, therefore, these special cases are also given special "
+"consideration, but with three notable differences at the time of writing."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:185
+msgid ""
+"First, there is no provision made yet automatically for language tasks, "
+"although a subset of those packages are included if you specify #{lb config "
+"--language}#. If you need those tasks, which include such things as language-"
+"specific fonts and input-method packages, you need to specify them in your "
+"configuration. For example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:189
+msgid ""
+"$ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:193
+msgid ""
+"Second, if you specify #{--packages gnome-desktop}#, or any of the other "
+"three desktop flavours mentioned above, it is equivalent to specifying #{--"
+"packages standard-x11 --tasks \"gnome-desktop desktop standard laptop\"}#, "
+"except substituting the #{*-desktop}# task for the flavour you specified."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:195
+msgid ""
+"Third, if any of the tasks for these desktop flavours are selected, either "
+"explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build "
+"will preseed the corresponding desktop value for Debian Installer (if it is "
+"included) to ensure it follows its own rules for installing different "
+"desktop flavours."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:197
+msgid "2~ Installing modified or third-party packages"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:199
+msgid ""
"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 "
@@ -554,7 +624,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:201
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -565,22 +635,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:203
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:209
msgid ""
"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
"off\" customizations but has a number of drawbacks, whilst using a custom "
@@ -588,12 +658,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:213
msgid ""
"To install a custom package, simply copy it to the #{config/chroot_local-"
"packages/}# directory. Packages that are inside this directory will be "
@@ -602,53 +672,53 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:215
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:217
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:219
msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:221
msgid ""
"_* You must install all appropriate packages in the #{config/chroot_local-"
"packages/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:223
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:225
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:227
msgid ""
"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
-"you must ensure that you specify the packages elsewhere. See #{Installing "
-"additional packages}#installing-additional-packages for details."
+"you must ensure that you specify the packages elsewhere. See #{Choosing "
+"packages to install}#choosing-packages-to-install for details."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:229
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
@@ -656,12 +726,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:231
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:233
msgid ""
"live-build uses APT to install all packages into the live system so will "
"therefore inherit behaviours from this program. One relevant example is that "
@@ -671,7 +741,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:235
msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -681,17 +751,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:237
msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:239
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:241
msgid ""
"You can configure APT through a number of options applied only at build "
"time. (APT configuration used in the running live system may be configured "
@@ -702,12 +772,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:243
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:245
msgid ""
"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
"at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -717,26 +787,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:247
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:249
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:251
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:253
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -744,17 +814,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:257
msgid "lb config --apt-http-proxy http://proxy/"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:261
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:263
msgid ""
"You may find yourself needing to save some space on the image media, in "
"which case one or the other or both of the following options may be of "
@@ -762,19 +832,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:265
msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:269
msgid "$ lb config --binary-indices false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:273
msgid ""
"This will not influence the entries in /etc/apt/sources.list, but merely "
"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
@@ -784,19 +854,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:275
msgid ""
"If you find the installation of recommended packages bloats your image too "
"much, you may disable that default option of APT with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:279
msgid "$ lb config -apt-recommends false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:283
msgid ""
"The tradeoff here is that recommended packages are defined as \"packages "
"that would be found together with this one in all but unusual installations"
@@ -808,12 +878,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:285
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:287
msgid ""
"If there is not an #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -822,11 +892,11 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:289
msgid "3~ APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:291
msgid "% FIXME: needs content"
msgstr ""
diff --git a/manual/po/pt_BR/live-manual.ssm.po b/manual/po/pt_BR/live-manual.ssm.po
index e6f17c4..e783ab7 100644
--- a/manual/po/pt_BR/live-manual.ssm.po
+++ b/manual/po/pt_BR/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-21 13:45-0400\n"
+"POT-Creation-Date: 2010-11-24 17:37-0400\n"
"PO-Revision-Date: 2010-10-22 07:52-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2010-11-21\n"
+" :published: 2010-11-24\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/pt_BR/user_customization-packages.ssi.po b/manual/po/pt_BR/user_customization-packages.ssi.po
index e9a7efa..3abeda6 100644
--- a/manual/po/pt_BR/user_customization-packages.ssi.po
+++ b/manual/po/pt_BR/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-21 20:09-0400\n"
+"POT-Creation-Date: 2010-11-24 17:37-0400\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -55,14 +55,16 @@ msgstr ""
#: en/user_customization-internationalization.ssi:38
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:80 en/user_customization-packages.ssi:96
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:145
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:237
-#: en/user_customization-packages.ssi:249
-#: en/user_customization-packages.ssi:259 en/user_examples.ssi:24
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:88
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:137
+#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:277 en/user_examples.ssi:24
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:76 en/user_installation.ssi:84
@@ -113,15 +115,16 @@ msgstr "code{"
#: en/user_customization-internationalization.ssi:42
#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:100
-#: en/user_customization-packages.ssi:141
-#: en/user_customization-packages.ssi:151
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:241
-#: en/user_customization-packages.ssi:253
-#: en/user_customization-packages.ssi:263 en/user_examples.ssi:33
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:92
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:281 en/user_examples.ssi:33
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -134,7 +137,7 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:118
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:110
msgid "% FIXME"
msgstr ""
@@ -273,8 +276,9 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:50
msgid ""
-"If you add the line to #{config/chroot_sources/live.binary}#, the repository "
-"will be added to your live system's #{/etc/apt/sources.list.d/}# directory."
+"If you add the same line to #{config/chroot_sources/live.binary}#, the "
+"repository will be added to your live system's #{/etc/apt/sources.list.d/}# "
+"directory."
msgstr ""
#. type: Plain text
@@ -304,54 +308,41 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:64
-msgid "2~installing-additional-packages Installing additional packages"
+msgid "2~choosing-packages-to-install Choosing packages to install"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:66
msgid ""
-"live-build has a number of mechanisms for indicating that additional "
-"packages should be installed, including:"
+"There are a number of ways to choose which packages live-build will install "
+"in your image, covering a variety of different needs. You can simply name "
+"individual packages to install, either with the #{--packages}# option for a "
+"few packages, or in a package list of your own for larger numbers. You can "
+"also choose larger predefined lists of packages, or use APT tasks. And "
+"finally, you may place package files in your #{config/}# tree, which is well "
+"suited to testing of new or experimental packages before they are available "
+"from a repository."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:68
-msgid "_* The #{--packages}# option"
+msgid "3~ Choosing a few packages"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:70
-msgid "_* Package lists"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:72
-msgid "_* Local packages (#{config/chroot_local-packages/}#)"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:74
-msgid "_* Tasks"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:76
-msgid "3~ The #{--packages}# option"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:78
msgid ""
-"To install additional packages, simply specify #{--packages}#. For example:"
+"When the number of packages added is small, simply specify #{--packages}#. "
+"For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:82
+#: en/user_customization-packages.ssi:74
msgid "$ lb config --packages \"package1 package2 package3\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:86
+#: en/user_customization-packages.ssi:78
msgid ""
"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}"
@@ -359,20 +350,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:88
+#: en/user_customization-packages.ssi:80
msgid ""
"If you need to specify a large number of packages to be installed or you "
-"need flexibility regarding which packages to install, you should probably be "
-"using package lists. See {Package lists}#package-lists for more information."
+"need flexibility regarding which packages to install, use package lists as "
+"discussed in the following section, {Package lists}#package-lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:82
msgid "3~package-lists Package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:92
+#: en/user_customization-packages.ssi:84
msgid ""
"Package lists are a powerful way of expressing which packages should be "
"installed. live-build ships with a number of predefined package lists which "
@@ -381,36 +372,36 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:94
-msgid "To specify one or more package list, you can use:"
+#: en/user_customization-packages.ssi:86
+msgid "To specify one or more package lists, you can use:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:98
+#: en/user_customization-packages.ssi:90
msgid "$ lb config --packages-lists \"list1 list2 list3\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:102
+#: en/user_customization-packages.ssi:94
msgid ""
"Note: Package lists that are distributed with live-build reside in the #{/"
"usr/share/live/build/lists/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:104
+#: en/user_customization-packages.ssi:96
msgid "4~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:98
msgid ""
"You may supplement the supplied lists using local package lists stored in #"
"{config/chroot_local-packageslists/}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:108
+#: en/user_customization-packages.ssi:100
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed. Local package lists always override package lists "
@@ -419,12 +410,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:110
+#: en/user_customization-packages.ssi:102
msgid "4~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:104
msgid ""
"In case you want to include some required .deb packages to live media's #"
"{pool/}# (without installing them onto the live image) you may need to use "
@@ -434,24 +425,24 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:106
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:108
msgid "4~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:117
msgid "% code{ % % #include <gnome> % iceweasel % % }code"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:119
msgid ""
"The package lists that are included with live-build make extensive use of "
"includes. They are available to view in the #{/usr/share/live/build/lists/}# "
@@ -459,12 +450,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:121
msgid "4~ Using conditionals inside package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:123
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -475,32 +466,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:125
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:131
msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:135
msgid ""
"You may test for any one of a number of values, e.g. to install #"
-"{memtest86+} if either #{--architecture i386}# or #{--architecture amd64}# "
+"{memtest86+ }# if either #{--architecture i386}# or #{--architecture amd64}# "
"is specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:141
msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:145
msgid ""
"You may also test against variables that may contain more than one value, e."
"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
@@ -508,43 +499,122 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:151
msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:155
msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:161
msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:165
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:167
msgid "3~ Tasks"
msgstr ""
#. type: Plain text
+#: en/user_customization-packages.ssi:169
+msgid ""
+"The Debian Installer offers the user choices of a number of preselected "
+"lists of packages, each one focused on a particular kind of system, or task "
+"a system may be used for, such as \"Graphical desktop environment\", \"Mail "
+"server\" or \"Laptop\". These lists are called \"tasks\" and are supported "
+"by APT through the \"Task:\" field. You can specify one or more tasks in "
+"live-build via the #{--tasks}# option, as in the example below."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:173
+msgid "$ lb config --tasks \"mail-server file-server\""
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-packages.ssi:177
-msgid "%FIXME"
+msgid ""
+"The primary tasks available in the Debian Installer can be listed with #"
+"{tasksel --list-tasks}# in the live system. The contents of any task, "
+"including ones not included in this list, may be examined with #{tasksel --"
+"task-packages}#."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:179
-msgid "2~ Installing modified or third-party packages"
+msgid "4~ Desktop and language tasks"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:181
msgid ""
+"Desktop and language tasks are special cases. In the Debian Installer, if "
+"the medium was prepared for a particular desktop environment flavour, the "
+"corresponding task will be automatically installed. Thus, there are there "
+"are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}"
+"# tasks, none of which are offered in #{tasksel}#'s menu. Likewise, there "
+"are no menu entries for tasks for languages, but the user's language choice "
+"during the install influences the selection of corresponding language tasks."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:183
+msgid ""
+"In live-build, therefore, these special cases are also given special "
+"consideration, but with three notable differences at the time of writing."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:185
+msgid ""
+"First, there is no provision made yet automatically for language tasks, "
+"although a subset of those packages are included if you specify #{lb config "
+"--language}#. If you need those tasks, which include such things as language-"
+"specific fonts and input-method packages, you need to specify them in your "
+"configuration. For example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:189
+msgid ""
+"$ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:193
+msgid ""
+"Second, if you specify #{--packages gnome-desktop}#, or any of the other "
+"three desktop flavours mentioned above, it is equivalent to specifying #{--"
+"packages standard-x11 --tasks \"gnome-desktop desktop standard laptop\"}#, "
+"except substituting the #{*-desktop}# task for the flavour you specified."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:195
+msgid ""
+"Third, if any of the tasks for these desktop flavours are selected, either "
+"explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build "
+"will preseed the corresponding desktop value for Debian Installer (if it is "
+"included) to ensure it follows its own rules for installing different "
+"desktop flavours."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:197
+msgid "2~ Installing modified or third-party packages"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:199
+msgid ""
"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 "
@@ -554,7 +624,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:201
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -565,22 +635,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:203
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:209
msgid ""
"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
"off\" customizations but has a number of drawbacks, whilst using a custom "
@@ -588,12 +658,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:213
msgid ""
"To install a custom package, simply copy it to the #{config/chroot_local-"
"packages/}# directory. Packages that are inside this directory will be "
@@ -602,53 +672,53 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:215
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:217
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:219
msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:221
msgid ""
"_* You must install all appropriate packages in the #{config/chroot_local-"
"packages/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:223
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:225
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:227
msgid ""
"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
-"you must ensure that you specify the packages elsewhere. See #{Installing "
-"additional packages}#installing-additional-packages for details."
+"you must ensure that you specify the packages elsewhere. See #{Choosing "
+"packages to install}#choosing-packages-to-install for details."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:229
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
@@ -656,12 +726,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:231
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:233
msgid ""
"live-build uses APT to install all packages into the live system so will "
"therefore inherit behaviours from this program. One relevant example is that "
@@ -671,7 +741,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:235
msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -681,17 +751,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:237
msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:239
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:241
msgid ""
"You can configure APT through a number of options applied only at build "
"time. (APT configuration used in the running live system may be configured "
@@ -702,12 +772,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:243
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:245
msgid ""
"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
"at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -717,26 +787,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:247
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:249
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:251
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:253
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -744,17 +814,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:257
msgid "lb config --apt-http-proxy http://proxy/"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:261
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:263
msgid ""
"You may find yourself needing to save some space on the image media, in "
"which case one or the other or both of the following options may be of "
@@ -762,19 +832,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:265
msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:269
msgid "$ lb config --binary-indices false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:273
msgid ""
"This will not influence the entries in /etc/apt/sources.list, but merely "
"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
@@ -784,19 +854,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:275
msgid ""
"If you find the installation of recommended packages bloats your image too "
"much, you may disable that default option of APT with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:279
msgid "$ lb config -apt-recommends false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:283
msgid ""
"The tradeoff here is that recommended packages are defined as \"packages "
"that would be found together with this one in all but unusual installations"
@@ -808,12 +878,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:285
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:287
msgid ""
"If there is not an #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -822,11 +892,11 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:289
msgid "3~ APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:291
msgid "% FIXME: needs content"
msgstr ""
diff --git a/manual/po/ro/live-manual.ssm.po b/manual/po/ro/live-manual.ssm.po
index 81e1ebe..1716e14 100644
--- a/manual/po/ro/live-manual.ssm.po
+++ b/manual/po/ro/live-manual.ssm.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-21 13:45-0400\n"
+"POT-Creation-Date: 2010-11-24 17:37-0400\n"
"PO-Revision-Date: 2010-10-23 00:04+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -46,7 +46,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2010-11-21\n"
+" :published: 2010-11-24\n"
msgstr ""
#. type: Plain text
diff --git a/manual/po/ro/user_customization-packages.ssi.po b/manual/po/ro/user_customization-packages.ssi.po
index 5991048..cebbc99 100644
--- a/manual/po/ro/user_customization-packages.ssi.po
+++ b/manual/po/ro/user_customization-packages.ssi.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-21 20:09-0400\n"
+"POT-Creation-Date: 2010-11-24 17:37-0400\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -56,14 +56,16 @@ msgstr ""
#: en/user_customization-internationalization.ssi:38
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:80 en/user_customization-packages.ssi:96
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:145
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:237
-#: en/user_customization-packages.ssi:249
-#: en/user_customization-packages.ssi:259 en/user_examples.ssi:24
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:88
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:137
+#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:277 en/user_examples.ssi:24
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:76 en/user_installation.ssi:84
@@ -114,15 +116,16 @@ msgstr "code{"
#: en/user_customization-internationalization.ssi:42
#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:100
-#: en/user_customization-packages.ssi:141
-#: en/user_customization-packages.ssi:151
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:241
-#: en/user_customization-packages.ssi:253
-#: en/user_customization-packages.ssi:263 en/user_examples.ssi:33
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:92
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:281 en/user_examples.ssi:33
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -135,7 +138,7 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:118
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:110
msgid "% FIXME"
msgstr ""
@@ -274,8 +277,9 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:50
msgid ""
-"If you add the line to #{config/chroot_sources/live.binary}#, the repository "
-"will be added to your live system's #{/etc/apt/sources.list.d/}# directory."
+"If you add the same line to #{config/chroot_sources/live.binary}#, the "
+"repository will be added to your live system's #{/etc/apt/sources.list.d/}# "
+"directory."
msgstr ""
#. type: Plain text
@@ -305,54 +309,41 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:64
-msgid "2~installing-additional-packages Installing additional packages"
+msgid "2~choosing-packages-to-install Choosing packages to install"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:66
msgid ""
-"live-build has a number of mechanisms for indicating that additional "
-"packages should be installed, including:"
+"There are a number of ways to choose which packages live-build will install "
+"in your image, covering a variety of different needs. You can simply name "
+"individual packages to install, either with the #{--packages}# option for a "
+"few packages, or in a package list of your own for larger numbers. You can "
+"also choose larger predefined lists of packages, or use APT tasks. And "
+"finally, you may place package files in your #{config/}# tree, which is well "
+"suited to testing of new or experimental packages before they are available "
+"from a repository."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:68
-msgid "_* The #{--packages}# option"
+msgid "3~ Choosing a few packages"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:70
-msgid "_* Package lists"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:72
-msgid "_* Local packages (#{config/chroot_local-packages/}#)"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:74
-msgid "_* Tasks"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:76
-msgid "3~ The #{--packages}# option"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:78
msgid ""
-"To install additional packages, simply specify #{--packages}#. For example:"
+"When the number of packages added is small, simply specify #{--packages}#. "
+"For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:82
+#: en/user_customization-packages.ssi:74
msgid "$ lb config --packages \"package1 package2 package3\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:86
+#: en/user_customization-packages.ssi:78
msgid ""
"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}"
@@ -360,20 +351,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:88
+#: en/user_customization-packages.ssi:80
msgid ""
"If you need to specify a large number of packages to be installed or you "
-"need flexibility regarding which packages to install, you should probably be "
-"using package lists. See {Package lists}#package-lists for more information."
+"need flexibility regarding which packages to install, use package lists as "
+"discussed in the following section, {Package lists}#package-lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:82
msgid "3~package-lists Package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:92
+#: en/user_customization-packages.ssi:84
msgid ""
"Package lists are a powerful way of expressing which packages should be "
"installed. live-build ships with a number of predefined package lists which "
@@ -382,36 +373,36 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:94
-msgid "To specify one or more package list, you can use:"
+#: en/user_customization-packages.ssi:86
+msgid "To specify one or more package lists, you can use:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:98
+#: en/user_customization-packages.ssi:90
msgid "$ lb config --packages-lists \"list1 list2 list3\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:102
+#: en/user_customization-packages.ssi:94
msgid ""
"Note: Package lists that are distributed with live-build reside in the #{/"
"usr/share/live/build/lists/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:104
+#: en/user_customization-packages.ssi:96
msgid "4~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:98
msgid ""
"You may supplement the supplied lists using local package lists stored in #"
"{config/chroot_local-packageslists/}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:108
+#: en/user_customization-packages.ssi:100
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed. Local package lists always override package lists "
@@ -420,12 +411,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:110
+#: en/user_customization-packages.ssi:102
msgid "4~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:104
msgid ""
"In case you want to include some required .deb packages to live media's #"
"{pool/}# (without installing them onto the live image) you may need to use "
@@ -435,24 +426,24 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:106
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:108
msgid "4~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:117
msgid "% code{ % % #include <gnome> % iceweasel % % }code"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:119
msgid ""
"The package lists that are included with live-build make extensive use of "
"includes. They are available to view in the #{/usr/share/live/build/lists/}# "
@@ -460,12 +451,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:121
msgid "4~ Using conditionals inside package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:123
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -476,32 +467,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:125
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:131
msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:135
msgid ""
"You may test for any one of a number of values, e.g. to install #"
-"{memtest86+} if either #{--architecture i386}# or #{--architecture amd64}# "
+"{memtest86+ }# if either #{--architecture i386}# or #{--architecture amd64}# "
"is specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:141
msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:145
msgid ""
"You may also test against variables that may contain more than one value, e."
"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
@@ -509,43 +500,122 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:151
msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:155
msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:161
msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:165
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:167
msgid "3~ Tasks"
msgstr ""
#. type: Plain text
+#: en/user_customization-packages.ssi:169
+msgid ""
+"The Debian Installer offers the user choices of a number of preselected "
+"lists of packages, each one focused on a particular kind of system, or task "
+"a system may be used for, such as \"Graphical desktop environment\", \"Mail "
+"server\" or \"Laptop\". These lists are called \"tasks\" and are supported "
+"by APT through the \"Task:\" field. You can specify one or more tasks in "
+"live-build via the #{--tasks}# option, as in the example below."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:173
+msgid "$ lb config --tasks \"mail-server file-server\""
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-packages.ssi:177
-msgid "%FIXME"
+msgid ""
+"The primary tasks available in the Debian Installer can be listed with #"
+"{tasksel --list-tasks}# in the live system. The contents of any task, "
+"including ones not included in this list, may be examined with #{tasksel --"
+"task-packages}#."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:179
-msgid "2~ Installing modified or third-party packages"
+msgid "4~ Desktop and language tasks"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:181
msgid ""
+"Desktop and language tasks are special cases. In the Debian Installer, if "
+"the medium was prepared for a particular desktop environment flavour, the "
+"corresponding task will be automatically installed. Thus, there are there "
+"are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}"
+"# tasks, none of which are offered in #{tasksel}#'s menu. Likewise, there "
+"are no menu entries for tasks for languages, but the user's language choice "
+"during the install influences the selection of corresponding language tasks."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:183
+msgid ""
+"In live-build, therefore, these special cases are also given special "
+"consideration, but with three notable differences at the time of writing."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:185
+msgid ""
+"First, there is no provision made yet automatically for language tasks, "
+"although a subset of those packages are included if you specify #{lb config "
+"--language}#. If you need those tasks, which include such things as language-"
+"specific fonts and input-method packages, you need to specify them in your "
+"configuration. For example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:189
+msgid ""
+"$ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:193
+msgid ""
+"Second, if you specify #{--packages gnome-desktop}#, or any of the other "
+"three desktop flavours mentioned above, it is equivalent to specifying #{--"
+"packages standard-x11 --tasks \"gnome-desktop desktop standard laptop\"}#, "
+"except substituting the #{*-desktop}# task for the flavour you specified."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:195
+msgid ""
+"Third, if any of the tasks for these desktop flavours are selected, either "
+"explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build "
+"will preseed the corresponding desktop value for Debian Installer (if it is "
+"included) to ensure it follows its own rules for installing different "
+"desktop flavours."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:197
+msgid "2~ Installing modified or third-party packages"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:199
+msgid ""
"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 "
@@ -555,7 +625,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:201
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -566,22 +636,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:203
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:209
msgid ""
"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
"off\" customizations but has a number of drawbacks, whilst using a custom "
@@ -589,12 +659,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:213
msgid ""
"To install a custom package, simply copy it to the #{config/chroot_local-"
"packages/}# directory. Packages that are inside this directory will be "
@@ -603,53 +673,53 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:215
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:217
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:219
msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:221
msgid ""
"_* You must install all appropriate packages in the #{config/chroot_local-"
"packages/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:223
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:225
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:227
msgid ""
"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
-"you must ensure that you specify the packages elsewhere. See #{Installing "
-"additional packages}#installing-additional-packages for details."
+"you must ensure that you specify the packages elsewhere. See #{Choosing "
+"packages to install}#choosing-packages-to-install for details."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:229
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
@@ -657,12 +727,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:231
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:233
msgid ""
"live-build uses APT to install all packages into the live system so will "
"therefore inherit behaviours from this program. One relevant example is that "
@@ -672,7 +742,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:235
msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -682,17 +752,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:237
msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:239
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:241
msgid ""
"You can configure APT through a number of options applied only at build "
"time. (APT configuration used in the running live system may be configured "
@@ -703,12 +773,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:243
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:245
msgid ""
"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
"at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -718,26 +788,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:247
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:249
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:251
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:253
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -745,17 +815,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:257
msgid "lb config --apt-http-proxy http://proxy/"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:261
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:263
msgid ""
"You may find yourself needing to save some space on the image media, in "
"which case one or the other or both of the following options may be of "
@@ -763,19 +833,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:265
msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:269
msgid "$ lb config --binary-indices false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:273
msgid ""
"This will not influence the entries in /etc/apt/sources.list, but merely "
"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
@@ -785,19 +855,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:275
msgid ""
"If you find the installation of recommended packages bloats your image too "
"much, you may disable that default option of APT with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:279
msgid "$ lb config -apt-recommends false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:283
msgid ""
"The tradeoff here is that recommended packages are defined as \"packages "
"that would be found together with this one in all but unusual installations"
@@ -809,12 +879,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:285
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:287
msgid ""
"If there is not an #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -823,11 +893,11 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:289
msgid "3~ APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:291
msgid "% FIXME: needs content"
msgstr ""
diff --git a/manual/pot/live-manual.ssm.pot b/manual/pot/live-manual.ssm.pot
index 620d7a0..ef8aa9c 100644
--- a/manual/pot/live-manual.ssm.pot
+++ b/manual/pot/live-manual.ssm.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-21 13:45-0400\n"
+"POT-Creation-Date: 2010-11-24 17:37-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -45,7 +45,7 @@ msgstr ""
#, no-wrap
msgid ""
"@date:\n"
-" :published: 2010-11-21\n"
+" :published: 2010-11-24\n"
msgstr ""
#. type: Plain text
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index aef7d39..de47650 100644
--- a/manual/pot/user_customization-packages.ssi.pot
+++ b/manual/pot/user_customization-packages.ssi.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-manual VERSION\n"
-"POT-Creation-Date: 2010-11-21 20:09-0400\n"
+"POT-Creation-Date: 2010-11-24 17:37-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -55,14 +55,16 @@ msgstr ""
#: en/user_customization-internationalization.ssi:38
#: en/user_customization-packages.ssi:18 en/user_customization-packages.ssi:31
#: en/user_customization-packages.ssi:44 en/user_customization-packages.ssi:58
-#: en/user_customization-packages.ssi:80 en/user_customization-packages.ssi:96
-#: en/user_customization-packages.ssi:135
-#: en/user_customization-packages.ssi:145
-#: en/user_customization-packages.ssi:155
-#: en/user_customization-packages.ssi:165
-#: en/user_customization-packages.ssi:237
-#: en/user_customization-packages.ssi:249
-#: en/user_customization-packages.ssi:259 en/user_examples.ssi:24
+#: en/user_customization-packages.ssi:72 en/user_customization-packages.ssi:88
+#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:137
+#: en/user_customization-packages.ssi:147
+#: en/user_customization-packages.ssi:157
+#: en/user_customization-packages.ssi:171
+#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:277 en/user_examples.ssi:24
#: en/user_installation.ssi:38 en/user_installation.ssi:46
#: en/user_installation.ssi:56 en/user_installation.ssi:64
#: en/user_installation.ssi:76 en/user_installation.ssi:84
@@ -113,15 +115,16 @@ msgstr ""
#: en/user_customization-internationalization.ssi:42
#: en/user_customization-packages.ssi:23 en/user_customization-packages.ssi:36
#: en/user_customization-packages.ssi:48 en/user_customization-packages.ssi:62
-#: en/user_customization-packages.ssi:84
-#: en/user_customization-packages.ssi:100
-#: en/user_customization-packages.ssi:141
-#: en/user_customization-packages.ssi:151
-#: en/user_customization-packages.ssi:161
-#: en/user_customization-packages.ssi:171
-#: en/user_customization-packages.ssi:241
-#: en/user_customization-packages.ssi:253
-#: en/user_customization-packages.ssi:263 en/user_examples.ssi:33
+#: en/user_customization-packages.ssi:76 en/user_customization-packages.ssi:92
+#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:259
+#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:281 en/user_examples.ssi:33
#: en/user_installation.ssi:42 en/user_installation.ssi:50
#: en/user_installation.ssi:60 en/user_installation.ssi:72
#: en/user_installation.ssi:80 en/user_installation.ssi:88
@@ -134,7 +137,7 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:118
+#: en/user_basics.ssi:218 en/user_customization-packages.ssi:110
msgid "% FIXME"
msgstr ""
@@ -273,8 +276,9 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:50
msgid ""
-"If you add the line to #{config/chroot_sources/live.binary}#, the repository "
-"will be added to your live system's #{/etc/apt/sources.list.d/}# directory."
+"If you add the same line to #{config/chroot_sources/live.binary}#, the "
+"repository will be added to your live system's #{/etc/apt/sources.list.d/}# "
+"directory."
msgstr ""
#. type: Plain text
@@ -304,54 +308,41 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:64
-msgid "2~installing-additional-packages Installing additional packages"
+msgid "2~choosing-packages-to-install Choosing packages to install"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:66
msgid ""
-"live-build has a number of mechanisms for indicating that additional "
-"packages should be installed, including:"
+"There are a number of ways to choose which packages live-build will install "
+"in your image, covering a variety of different needs. You can simply name "
+"individual packages to install, either with the #{--packages}# option for a "
+"few packages, or in a package list of your own for larger numbers. You can "
+"also choose larger predefined lists of packages, or use APT tasks. And "
+"finally, you may place package files in your #{config/}# tree, which is well "
+"suited to testing of new or experimental packages before they are available "
+"from a repository."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:68
-msgid "_* The #{--packages}# option"
+msgid "3~ Choosing a few packages"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:70
-msgid "_* Package lists"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:72
-msgid "_* Local packages (#{config/chroot_local-packages/}#)"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:74
-msgid "_* Tasks"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:76
-msgid "3~ The #{--packages}# option"
-msgstr ""
-
-#. type: Plain text
-#: en/user_customization-packages.ssi:78
msgid ""
-"To install additional packages, simply specify #{--packages}#. For example:"
+"When the number of packages added is small, simply specify #{--packages}#. "
+"For example:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:82
+#: en/user_customization-packages.ssi:74
msgid "$ lb config --packages \"package1 package2 package3\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:86
+#: en/user_customization-packages.ssi:78
msgid ""
"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}"
@@ -359,20 +350,20 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:88
+#: en/user_customization-packages.ssi:80
msgid ""
"If you need to specify a large number of packages to be installed or you "
-"need flexibility regarding which packages to install, you should probably be "
-"using package lists. See {Package lists}#package-lists for more information."
+"need flexibility regarding which packages to install, use package lists as "
+"discussed in the following section, {Package lists}#package-lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:82
msgid "3~package-lists Package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:92
+#: en/user_customization-packages.ssi:84
msgid ""
"Package lists are a powerful way of expressing which packages should be "
"installed. live-build ships with a number of predefined package lists which "
@@ -381,36 +372,36 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:94
-msgid "To specify one or more package list, you can use:"
+#: en/user_customization-packages.ssi:86
+msgid "To specify one or more package lists, you can use:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:98
+#: en/user_customization-packages.ssi:90
msgid "$ lb config --packages-lists \"list1 list2 list3\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:102
+#: en/user_customization-packages.ssi:94
msgid ""
"Note: Package lists that are distributed with live-build reside in the #{/"
"usr/share/live/build/lists/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:104
+#: en/user_customization-packages.ssi:96
msgid "4~ Local package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:98
msgid ""
"You may supplement the supplied lists using local package lists stored in #"
"{config/chroot_local-packageslists/}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:108
+#: en/user_customization-packages.ssi:100
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed. Local package lists always override package lists "
@@ -419,12 +410,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:110
+#: en/user_customization-packages.ssi:102
msgid "4~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:112
+#: en/user_customization-packages.ssi:104
msgid ""
"In case you want to include some required .deb packages to live media's #"
"{pool/}# (without installing them onto the live image) you may need to use "
@@ -434,24 +425,24 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:114
+#: en/user_customization-packages.ssi:106
msgid ""
"Package lists that exist in this directory need to have a #{.list}# suffix "
"in order to be processed."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:116
+#: en/user_customization-packages.ssi:108
msgid "4~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:117
msgid "% code{ % % #include <gnome> % iceweasel % % }code"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:127
+#: en/user_customization-packages.ssi:119
msgid ""
"The package lists that are included with live-build make extensive use of "
"includes. They are available to view in the #{/usr/share/live/build/lists/}# "
@@ -459,12 +450,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:129
+#: en/user_customization-packages.ssi:121
msgid "4~ Using conditionals inside package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:123
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -475,32 +466,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:133
+#: en/user_customization-packages.ssi:125
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:131
msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:143
+#: en/user_customization-packages.ssi:135
msgid ""
"You may test for any one of a number of values, e.g. to install #"
-"{memtest86+} if either #{--architecture i386}# or #{--architecture amd64}# "
+"{memtest86+ }# if either #{--architecture i386}# or #{--architecture amd64}# "
"is specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:141
msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:153
+#: en/user_customization-packages.ssi:145
msgid ""
"You may also test against variables that may contain more than one value, e."
"g. to install #{vrms}# if either #{contrib}# or #{non-free}# is specified "
@@ -508,43 +499,122 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:151
msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:163
+#: en/user_customization-packages.ssi:155
msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:161
msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:165
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:175
+#: en/user_customization-packages.ssi:167
msgid "3~ Tasks"
msgstr ""
#. type: Plain text
+#: en/user_customization-packages.ssi:169
+msgid ""
+"The Debian Installer offers the user choices of a number of preselected "
+"lists of packages, each one focused on a particular kind of system, or task "
+"a system may be used for, such as \"Graphical desktop environment\", \"Mail "
+"server\" or \"Laptop\". These lists are called \"tasks\" and are supported "
+"by APT through the \"Task:\" field. You can specify one or more tasks in "
+"live-build via the #{--tasks}# option, as in the example below."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:173
+msgid "$ lb config --tasks \"mail-server file-server\""
+msgstr ""
+
+#. type: Plain text
#: en/user_customization-packages.ssi:177
-msgid "%FIXME"
+msgid ""
+"The primary tasks available in the Debian Installer can be listed with #"
+"{tasksel --list-tasks}# in the live system. The contents of any task, "
+"including ones not included in this list, may be examined with #{tasksel --"
+"task-packages}#."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:179
-msgid "2~ Installing modified or third-party packages"
+msgid "4~ Desktop and language tasks"
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:181
msgid ""
+"Desktop and language tasks are special cases. In the Debian Installer, if "
+"the medium was prepared for a particular desktop environment flavour, the "
+"corresponding task will be automatically installed. Thus, there are there "
+"are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}"
+"# tasks, none of which are offered in #{tasksel}#'s menu. Likewise, there "
+"are no menu entries for tasks for languages, but the user's language choice "
+"during the install influences the selection of corresponding language tasks."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:183
+msgid ""
+"In live-build, therefore, these special cases are also given special "
+"consideration, but with three notable differences at the time of writing."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:185
+msgid ""
+"First, there is no provision made yet automatically for language tasks, "
+"although a subset of those packages are included if you specify #{lb config "
+"--language}#. If you need those tasks, which include such things as language-"
+"specific fonts and input-method packages, you need to specify them in your "
+"configuration. For example:"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:189
+msgid ""
+"$ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\""
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:193
+msgid ""
+"Second, if you specify #{--packages gnome-desktop}#, or any of the other "
+"three desktop flavours mentioned above, it is equivalent to specifying #{--"
+"packages standard-x11 --tasks \"gnome-desktop desktop standard laptop\"}#, "
+"except substituting the #{*-desktop}# task for the flavour you specified."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:195
+msgid ""
+"Third, if any of the tasks for these desktop flavours are selected, either "
+"explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build "
+"will preseed the corresponding desktop value for Debian Installer (if it is "
+"included) to ensure it follows its own rules for installing different "
+"desktop flavours."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:197
+msgid "2~ Installing modified or third-party packages"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:199
+msgid ""
"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 "
@@ -554,7 +624,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:201
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -565,22 +635,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:185
+#: en/user_customization-packages.ssi:203
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:187
+#: en/user_customization-packages.ssi:205
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:207
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:191
+#: en/user_customization-packages.ssi:209
msgid ""
"Using #{chroot_local-packages}# is simpler to achieve and useful for \"one-"
"off\" customizations but has a number of drawbacks, whilst using a custom "
@@ -588,12 +658,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:211
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:213
msgid ""
"To install a custom package, simply copy it to the #{config/chroot_local-"
"packages/}# directory. Packages that are inside this directory will be "
@@ -602,53 +672,53 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:215
msgid ""
"Packages *{must}* be named in the prescribed way. One simple way to do this "
"is to use #{dpkg-name}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:217
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:219
msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:221
msgid ""
"_* You must install all appropriate packages in the #{config/chroot_local-"
"packages/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:223
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:225
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:227
msgid ""
"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
-"you must ensure that you specify the packages elsewhere. See #{Installing "
-"additional packages}#installing-additional-packages for details."
+"you must ensure that you specify the packages elsewhere. See #{Choosing "
+"packages to install}#choosing-packages-to-install for details."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:229
msgid ""
"Whilst it may seem unnecessary effort to create an APT repository to install "
"custom packages, the infrastructure can be easily re-used at a later date to "
@@ -656,12 +726,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:231
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:233
msgid ""
"live-build uses APT to install all packages into the live system so will "
"therefore inherit behaviours from this program. One relevant example is that "
@@ -671,7 +741,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:217
+#: en/user_customization-packages.ssi:235
msgid ""
"Because of this, you may wish to increment the version number in your custom "
"packages' #{debian/changelog}# files to ensure that your modified version is "
@@ -681,17 +751,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:237
msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:239
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:241
msgid ""
"You can configure APT through a number of options applied only at build "
"time. (APT configuration used in the running live system may be configured "
@@ -702,12 +772,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:243
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:245
msgid ""
"You can elect to use either #{apt}# or #{aptitude}# when installing packages "
"at build time. Which utility is used is governed by the #{--apt}# argument "
@@ -717,26 +787,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:247
msgid ""
"_* #{apt}#: With this method, if a missing package is specified, the package "
"installation will fail. This is the default setting."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:249
msgid ""
"_* #{aptitude}#: With this method, if a missing package is specified, the "
"package installation will succeed."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:251
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:253
msgid ""
"One commonly required APT configuration is to deal with building an image "
"behind a proxy. You may specify your APT proxy with the #{--apt-ftp-proxy}# "
@@ -744,17 +814,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:257
msgid "lb config --apt-http-proxy http://proxy/"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:261
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:263
msgid ""
"You may find yourself needing to save some space on the image media, in "
"which case one or the other or both of the following options may be of "
@@ -762,19 +832,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:265
msgid ""
"If you don't want to include APT indices in the image, you can omit those "
"with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:251
+#: en/user_customization-packages.ssi:269
msgid "$ lb config --binary-indices false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:255
+#: en/user_customization-packages.ssi:273
msgid ""
"This will not influence the entries in /etc/apt/sources.list, but merely "
"whether /var/lib/apt contains the indices files or not. The tradeoff is that "
@@ -784,19 +854,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:275
msgid ""
"If you find the installation of recommended packages bloats your image too "
"much, you may disable that default option of APT with:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:279
msgid "$ lb config -apt-recommends false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:283
msgid ""
"The tradeoff here is that recommended packages are defined as \"packages "
"that would be found together with this one in all but unusual installations"
@@ -808,12 +878,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:267
+#: en/user_customization-packages.ssi:285
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:269
+#: en/user_customization-packages.ssi:287
msgid ""
"If there is not an #{lb config}# option to alter APT's behaviour in the way "
"you need, use #{--apt-options}# or #{--aptitude-options}# to pass any "
@@ -822,11 +892,11 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:271
+#: en/user_customization-packages.ssi:289
msgid "3~ APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:291
msgid "% FIXME: needs content"
msgstr ""
diff --git a/manual/pt_BR/live-manual.ssm b/manual/pt_BR/live-manual.ssm
index cbe920d..fc96ee4 100644
--- a/manual/pt_BR/live-manual.ssm
+++ b/manual/pt_BR/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2010-11-21
+ :published: 2010-11-24
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/pt_BR/user_customization-packages.ssi b/manual/pt_BR/user_customization-packages.ssi
index 4848216..df2ab9b 100644
--- a/manual/pt_BR/user_customization-packages.ssi
+++ b/manual/pt_BR/user_customization-packages.ssi
@@ -81,8 +81,9 @@ deb http://live.debian.net/ sid-snapshots main contrib non-free
}code
-If you add the line to #{config/chroot_sources/live.binary}#, the repository
-will be added to your live system's #{/etc/apt/sources.list.d/}# directory.
+If you add the same line to #{config/chroot_sources/live.binary}#, the
+repository will be added to your live system's #{/etc/apt/sources.list.d/}#
+directory.
If such files exist, they will be picked up automatically.
@@ -99,22 +100,21 @@ $ lb config --repository live.debian.net
}code
-2~installing-additional-packages Installing additional packages
-
-live-build has a number of mechanisms for indicating that additional
-packages should be installed, including:
-
-_* The #{--packages}# option
+2~choosing-packages-to-install Choosing packages to install
-_* Package lists
+There are a number of ways to choose which packages live-build will install
+in your image, covering a variety of different needs. You can simply name
+individual packages to install, either with the #{--packages}# option for a
+few packages, or in a package list of your own for larger numbers. You can
+also choose larger predefined lists of packages, or use APT tasks. And
+finally, you may place package files in your #{config/}# tree, which is well
+suited to testing of new or experimental packages before they are available
+from a repository.
-_* Local packages (#{config/chroot_local-packages/}#)
+3~ Choosing a few packages
-_* Tasks
-
-3~ The #{--packages}# option
-
-To install additional packages, simply specify #{--packages}#. For example:
+When the number of packages added is small, simply specify
+#{--packages}#. For example:
code{
@@ -127,8 +127,8 @@ determined by your choice of APT utility. See {Choosing apt or
aptitude}#choosing-apt-or-aptitude for more details.
If you need to specify a large number of packages to be installed or you
-need flexibility regarding which packages to install, you should probably be
-using package lists. See {Package lists}#package-lists for more information.
+need flexibility regarding which packages to install, use package lists as
+discussed in the following section, {Package lists}#package-lists.
3~package-lists Package lists
@@ -137,7 +137,7 @@ installed. live-build ships with a number of predefined package lists which
provide sensible default package selections for the major desktop
environments, as well as standard systems.
-To specify one or more package list, you can use:
+To specify one or more package lists, you can use:
code{
@@ -197,9 +197,9 @@ code{
}code
-You may test for any one of a number of values, e.g. to install
-#{memtest86+} if either #{--architecture i386}# or #{--architecture amd64}#
-is specified:
+You may test for any one of a number of values, e.g. to install #{memtest86+
+}# if either #{--architecture i386}# or #{--architecture amd64}# is
+specified:
code{
@@ -229,7 +229,60 @@ The nesting of conditionals is not supported.
3~ Tasks
-%FIXME
+The Debian Installer offers the user choices of a number of preselected
+lists of packages, each one focused on a particular kind of system, or task
+a system may be used for, such as "Graphical desktop environment", "Mail
+server" or "Laptop". These lists are called "tasks" and are supported by APT
+through the "Task:" field. You can specify one or more tasks in live-build
+via the #{--tasks}# option, as in the example below.
+
+code{
+
+$ lb config --tasks "mail-server file-server"
+
+}code
+
+The primary tasks available in the Debian Installer can be listed with
+#{tasksel --list-tasks}# in the live system. The contents of any task,
+including ones not included in this list, may be examined with #{tasksel
+--task-packages}#.
+
+4~ Desktop and language tasks
+
+Desktop and language tasks are special cases. In the Debian Installer, if
+the medium was prepared for a particular desktop environment flavour, the
+corresponding task will be automatically installed. Thus, there are there
+are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and
+#{xfce-desktop}# tasks, none of which are offered in #{tasksel}#'s
+menu. Likewise, there are no menu entries for tasks for languages, but the
+user's language choice during the install influences the selection of
+corresponding language tasks.
+
+In live-build, therefore, these special cases are also given special
+consideration, but with three notable differences at the time of writing.
+
+First, there is no provision made yet automatically for language tasks,
+although a subset of those packages are included if you specify #{lb config
+--language}#. If you need those tasks, which include such things as
+language-specific fonts and input-method packages, you need to specify them
+in your configuration. For example:
+
+code{
+
+$ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
+
+}code
+
+Second, if you specify #{--packages gnome-desktop}#, or any of the other
+three desktop flavours mentioned above, it is equivalent to specifying
+#{--packages standard-x11 --tasks "gnome-desktop desktop standard laptop"}#,
+except substituting the #{*-desktop}# task for the flavour you specified.
+
+Third, if any of the tasks for these desktop flavours are selected, either
+explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build
+will preseed the corresponding desktop value for Debian Installer (if it is
+included) to ensure it follows its own rules for installing different
+desktop flavours.
2~ Installing modified or third-party packages
@@ -281,8 +334,8 @@ control.
3~ Using an APT repository to install custom packages
Unlike using #{chroot_local-packages}#, when using a custom APT repository
-you must ensure that you specify the packages elsewhere. See #{Installing
-additional packages}#installing-additional-packages for details.
+you must ensure that you specify the packages elsewhere. See #{Choosing
+packages to install}#choosing-packages-to-install for details.
Whilst it may seem unnecessary effort to create an APT repository to install
custom packages, the infrastructure can be easily re-used at a later date to
diff --git a/manual/ro/live-manual.ssm b/manual/ro/live-manual.ssm
index cbe920d..fc96ee4 100644
--- a/manual/ro/live-manual.ssm
+++ b/manual/ro/live-manual.ssm
@@ -9,7 +9,7 @@
:license: This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br><br>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br><br>You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. <br><br>On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-3 file.
@date:
- :published: 2010-11-21
+ :published: 2010-11-24
@publisher: Debian Live Project <debian-live at lists.debian.org>
diff --git a/manual/ro/user_customization-packages.ssi b/manual/ro/user_customization-packages.ssi
index 4848216..df2ab9b 100644
--- a/manual/ro/user_customization-packages.ssi
+++ b/manual/ro/user_customization-packages.ssi
@@ -81,8 +81,9 @@ deb http://live.debian.net/ sid-snapshots main contrib non-free
}code
-If you add the line to #{config/chroot_sources/live.binary}#, the repository
-will be added to your live system's #{/etc/apt/sources.list.d/}# directory.
+If you add the same line to #{config/chroot_sources/live.binary}#, the
+repository will be added to your live system's #{/etc/apt/sources.list.d/}#
+directory.
If such files exist, they will be picked up automatically.
@@ -99,22 +100,21 @@ $ lb config --repository live.debian.net
}code
-2~installing-additional-packages Installing additional packages
-
-live-build has a number of mechanisms for indicating that additional
-packages should be installed, including:
-
-_* The #{--packages}# option
+2~choosing-packages-to-install Choosing packages to install
-_* Package lists
+There are a number of ways to choose which packages live-build will install
+in your image, covering a variety of different needs. You can simply name
+individual packages to install, either with the #{--packages}# option for a
+few packages, or in a package list of your own for larger numbers. You can
+also choose larger predefined lists of packages, or use APT tasks. And
+finally, you may place package files in your #{config/}# tree, which is well
+suited to testing of new or experimental packages before they are available
+from a repository.
-_* Local packages (#{config/chroot_local-packages/}#)
+3~ Choosing a few packages
-_* Tasks
-
-3~ The #{--packages}# option
-
-To install additional packages, simply specify #{--packages}#. For example:
+When the number of packages added is small, simply specify
+#{--packages}#. For example:
code{
@@ -127,8 +127,8 @@ determined by your choice of APT utility. See {Choosing apt or
aptitude}#choosing-apt-or-aptitude for more details.
If you need to specify a large number of packages to be installed or you
-need flexibility regarding which packages to install, you should probably be
-using package lists. See {Package lists}#package-lists for more information.
+need flexibility regarding which packages to install, use package lists as
+discussed in the following section, {Package lists}#package-lists.
3~package-lists Package lists
@@ -137,7 +137,7 @@ installed. live-build ships with a number of predefined package lists which
provide sensible default package selections for the major desktop
environments, as well as standard systems.
-To specify one or more package list, you can use:
+To specify one or more package lists, you can use:
code{
@@ -197,9 +197,9 @@ code{
}code
-You may test for any one of a number of values, e.g. to install
-#{memtest86+} if either #{--architecture i386}# or #{--architecture amd64}#
-is specified:
+You may test for any one of a number of values, e.g. to install #{memtest86+
+}# if either #{--architecture i386}# or #{--architecture amd64}# is
+specified:
code{
@@ -229,7 +229,60 @@ The nesting of conditionals is not supported.
3~ Tasks
-%FIXME
+The Debian Installer offers the user choices of a number of preselected
+lists of packages, each one focused on a particular kind of system, or task
+a system may be used for, such as "Graphical desktop environment", "Mail
+server" or "Laptop". These lists are called "tasks" and are supported by APT
+through the "Task:" field. You can specify one or more tasks in live-build
+via the #{--tasks}# option, as in the example below.
+
+code{
+
+$ lb config --tasks "mail-server file-server"
+
+}code
+
+The primary tasks available in the Debian Installer can be listed with
+#{tasksel --list-tasks}# in the live system. The contents of any task,
+including ones not included in this list, may be examined with #{tasksel
+--task-packages}#.
+
+4~ Desktop and language tasks
+
+Desktop and language tasks are special cases. In the Debian Installer, if
+the medium was prepared for a particular desktop environment flavour, the
+corresponding task will be automatically installed. Thus, there are there
+are #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and
+#{xfce-desktop}# tasks, none of which are offered in #{tasksel}#'s
+menu. Likewise, there are no menu entries for tasks for languages, but the
+user's language choice during the install influences the selection of
+corresponding language tasks.
+
+In live-build, therefore, these special cases are also given special
+consideration, but with three notable differences at the time of writing.
+
+First, there is no provision made yet automatically for language tasks,
+although a subset of those packages are included if you specify #{lb config
+--language}#. If you need those tasks, which include such things as
+language-specific fonts and input-method packages, you need to specify them
+in your configuration. For example:
+
+code{
+
+$ lb config --tasks "japanese japanese-desktop japanese-gnome-desktop"
+
+}code
+
+Second, if you specify #{--packages gnome-desktop}#, or any of the other
+three desktop flavours mentioned above, it is equivalent to specifying
+#{--packages standard-x11 --tasks "gnome-desktop desktop standard laptop"}#,
+except substituting the #{*-desktop}# task for the flavour you specified.
+
+Third, if any of the tasks for these desktop flavours are selected, either
+explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build
+will preseed the corresponding desktop value for Debian Installer (if it is
+included) to ensure it follows its own rules for installing different
+desktop flavours.
2~ Installing modified or third-party packages
@@ -281,8 +334,8 @@ control.
3~ Using an APT repository to install custom packages
Unlike using #{chroot_local-packages}#, when using a custom APT repository
-you must ensure that you specify the packages elsewhere. See #{Installing
-additional packages}#installing-additional-packages for details.
+you must ensure that you specify the packages elsewhere. See #{Choosing
+packages to install}#choosing-packages-to-install for details.
Whilst it may seem unnecessary effort to create an APT repository to install
custom packages, the infrastructure can be easily re-used at a later date to
--
live-manual
More information about the debian-live-changes
mailing list