[SCM] live-manual branch, debian, updated. debian/2.0_a10-1-6-g2fb02c6
Ben Armstrong
synrg at debian.org
Thu Nov 25 17:02:35 UTC 2010
The following commit has been merged in the debian branch:
commit 2fb02c6a8c59a5024ec3a5970b08c4700e672f11
Author: Ben Armstrong <synrg at debian.org>
Date: Thu Nov 25 13:02:11 2010 -0400
Expanding, clarifying packages lists, particularly virtual lists.
diff --git a/manual/de/user_customization-packages.ssi b/manual/de/user_customization-packages.ssi
index df2ab9b..14015f9 100644
--- a/manual/de/user_customization-packages.ssi
+++ b/manual/de/user_customization-packages.ssi
@@ -87,7 +87,7 @@ directory.
If such files exist, they will be picked up automatically.
-You can also put the GPG key used to sign the repository into
+You should also put the GPG key used to sign the repository into
#{config/chroot_sources/your-repository.{binary,chroot}.gpg}# files.
Note: some preconfigured package repositories are available for easy
@@ -133,25 +133,45 @@ 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.
+installed. The list syntax supports included files and conditional sections
+which makes it easy to build lists from other lists and adapt them for use
+in multiple configurations. You can use predefined package lists, providing
+in a modular fashion package selections from each of the major desktop
+environments and some special purpose lists, as well as standard lists the
+others are based upon. You can also provide your own package lists, or use a
+combination of both.
-To specify one or more package lists, you can use:
+4~ Predefined package lists
+
+The simplest way to use lists is to specify one or more predefined lists
+with the #{--packages-lists}# option. For example:
code{
-$ lb config --packages-lists "list1 list2 list3"
+$ lb config --packages-lists "gnome-core rescue"
}code
-Note: Package lists that are distributed with live-build reside in the
-#{/usr/share/live/build/lists/}# directory.
+In addition to these lists, live-build supports four virtual package lists:
+#{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#,
+each of which provide a more extensive selection of packages that
+corresponds with Debian Installer defaults for these desktop
+environments. See {Desktop and language tasks}#desktop-and-language-tasks
+for more details.
+
+Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download
+at http://live.debian.net are built using the corresponding virtual
+#{*-desktop}# lists.
+
+The default location for the list files on your system is
+#{/usr/share/live/build/lists/}#. To determine the packages in a given list,
+read the corresponding file, paying attention to included files and
+conditionals as described in the following sections.
4~ Local package lists
-You may supplement the supplied lists using local package lists stored in
-#{config/chroot_local-packageslists/}#.
+You may supplement or replace entirely the supplied lists using local
+package lists stored in #{config/chroot_local-packageslists/}#.
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
@@ -171,13 +191,19 @@ in order to be processed.
4~ Extending a provided package list using includes
-% FIXME
+The package lists that are included with live-build make extensive use of
+includes. Refer to these in the #{/usr/share/live/build/lists/}# directory,
+as they serve as good examples of how to write your own lists.
-% code{ % % #include <gnome> % iceweasel % % }code
+For example, to make a list that includes the predefined #{gnome}# list plus
+iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with
+the following contents:
-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/}#
-directory.
+code{
+
+#include <gnome> iceweasel
+
+}code
4~ Using conditionals inside package lists
@@ -247,7 +273,7 @@ The primary tasks available in the Debian Installer can be listed with
including ones not included in this list, may be examined with #{tasksel
--task-packages}#.
-4~ Desktop and language tasks
+4~desktop-and-language-tasks 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
@@ -273,10 +299,12 @@ $ 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.
+Second, live-build supports #{*-desktop}# virtual package lists for each of
+the desktop flavours mentioned above, which select the #{standard-x11}#
+predefined package list, the corresponding #{*-desktop} task and three
+additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example,
+if you specify #{--packages gnome-desktop}#, it is equivalent to specifying
+#{--packages standard-x11 --tasks "gnome-desktop desktop standard laptop"}#.
Third, if any of the tasks for these desktop flavours are selected, either
explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build
diff --git a/manual/en/user_customization-packages.ssi b/manual/en/user_customization-packages.ssi
index 22e4c47..1e108a9 100644
--- a/manual/en/user_customization-packages.ssi
+++ b/manual/en/user_customization-packages.ssi
@@ -50,7 +50,7 @@ If you add the same line to #{config/chroot_sources/live.binary}#, the repositor
If such files exist, they will be picked up automatically.
-You can also put the GPG key used to sign the repository into #{config/chroot_sources/your-repository.{binary,chroot}.gpg}# files.
+You should also put the GPG key used to sign the repository into #{config/chroot_sources/your-repository.{binary,chroot}.gpg}# files.
Note: some preconfigured package repositories are available for easy selection through the #{--repository}# option, e.g. for enabling live snapshots, a simple command is enough to enable it:
@@ -80,21 +80,27 @@ If you need to specify a large number of packages to be installed or you need fl
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.
+Package lists are a powerful way of expressing which packages should be installed. The list syntax supports included files and conditional sections which makes it easy to build lists from other lists and adapt them for use in multiple configurations. You can use predefined package lists, providing in a modular fashion package selections from each of the major desktop environments and some special purpose lists, as well as standard lists the others are based upon. You can also provide your own package lists, or use a combination of both.
-To specify one or more package lists, you can use:
+4~ Predefined package lists
+
+The simplest way to use lists is to specify one or more predefined lists with the #{--packages-lists}# option. For example:
code{
-$ lb config --packages-lists "list1 list2 list3"
+$ lb config --packages-lists "gnome-core rescue"
}code
-Note: Package lists that are distributed with live-build reside in the #{/usr/share/live/build/lists/}# directory.
+In addition to these lists, live-build supports four virtual package lists: #{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, each of which provide a more extensive selection of packages that corresponds with Debian Installer defaults for these desktop environments. See {Desktop and language tasks}#desktop-and-language-tasks for more details.
+
+Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download at http://live.debian.net are built using the corresponding virtual #{*-desktop}# lists.
+
+The default location for the list files on your system is #{/usr/share/live/build/lists/}#. To determine the packages in a given list, read the corresponding file, paying attention to included files and conditionals as described in the following sections.
4~ Local package lists
-You may supplement the supplied lists using local package lists stored in #{config/chroot_local-packageslists/}#.
+You may supplement or replace entirely the supplied lists using local package lists stored in #{config/chroot_local-packageslists/}#.
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 distributed with live-build. This can cause undesired effects, we therefore recommend to use unique names for local package lists.
@@ -106,16 +112,16 @@ Package lists that exist in this directory need to have a #{.list}# suffix in or
4~ Extending a provided package list using includes
-% FIXME
+The package lists that are included with live-build make extensive use of includes. Refer to these in the #{/usr/share/live/build/lists/}# directory, as they serve as good examples of how to write your own lists.
-% code{
-%
-% #include <gnome>
-% iceweasel
-%
-% }code
+For example, to make a list that includes the predefined #{gnome}# list plus iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with the following contents:
-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/}# directory.
+code{
+
+#include <gnome>
+iceweasel
+
+}code
4~ Using conditionals inside package lists
@@ -175,7 +181,7 @@ $ lb config --tasks "mail-server file-server"
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
+4~desktop-and-language-tasks 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.
@@ -189,7 +195,7 @@ $ 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.
+Second, live-build supports #{*-desktop}# virtual package lists for each of the desktop flavours mentioned above, which select the #{standard-x11}# predefined package list, the corresponding #{*-desktop} task and three additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example, if you specify #{--packages gnome-desktop}#, it is equivalent to specifying #{--packages standard-x11 --tasks "gnome-desktop desktop standard laptop"}#.
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.
diff --git a/manual/fr/user_customization-packages.ssi b/manual/fr/user_customization-packages.ssi
index df2ab9b..14015f9 100644
--- a/manual/fr/user_customization-packages.ssi
+++ b/manual/fr/user_customization-packages.ssi
@@ -87,7 +87,7 @@ directory.
If such files exist, they will be picked up automatically.
-You can also put the GPG key used to sign the repository into
+You should also put the GPG key used to sign the repository into
#{config/chroot_sources/your-repository.{binary,chroot}.gpg}# files.
Note: some preconfigured package repositories are available for easy
@@ -133,25 +133,45 @@ 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.
+installed. The list syntax supports included files and conditional sections
+which makes it easy to build lists from other lists and adapt them for use
+in multiple configurations. You can use predefined package lists, providing
+in a modular fashion package selections from each of the major desktop
+environments and some special purpose lists, as well as standard lists the
+others are based upon. You can also provide your own package lists, or use a
+combination of both.
-To specify one or more package lists, you can use:
+4~ Predefined package lists
+
+The simplest way to use lists is to specify one or more predefined lists
+with the #{--packages-lists}# option. For example:
code{
-$ lb config --packages-lists "list1 list2 list3"
+$ lb config --packages-lists "gnome-core rescue"
}code
-Note: Package lists that are distributed with live-build reside in the
-#{/usr/share/live/build/lists/}# directory.
+In addition to these lists, live-build supports four virtual package lists:
+#{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#,
+each of which provide a more extensive selection of packages that
+corresponds with Debian Installer defaults for these desktop
+environments. See {Desktop and language tasks}#desktop-and-language-tasks
+for more details.
+
+Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download
+at http://live.debian.net are built using the corresponding virtual
+#{*-desktop}# lists.
+
+The default location for the list files on your system is
+#{/usr/share/live/build/lists/}#. To determine the packages in a given list,
+read the corresponding file, paying attention to included files and
+conditionals as described in the following sections.
4~ Local package lists
-You may supplement the supplied lists using local package lists stored in
-#{config/chroot_local-packageslists/}#.
+You may supplement or replace entirely the supplied lists using local
+package lists stored in #{config/chroot_local-packageslists/}#.
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
@@ -171,13 +191,19 @@ in order to be processed.
4~ Extending a provided package list using includes
-% FIXME
+The package lists that are included with live-build make extensive use of
+includes. Refer to these in the #{/usr/share/live/build/lists/}# directory,
+as they serve as good examples of how to write your own lists.
-% code{ % % #include <gnome> % iceweasel % % }code
+For example, to make a list that includes the predefined #{gnome}# list plus
+iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with
+the following contents:
-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/}#
-directory.
+code{
+
+#include <gnome> iceweasel
+
+}code
4~ Using conditionals inside package lists
@@ -247,7 +273,7 @@ The primary tasks available in the Debian Installer can be listed with
including ones not included in this list, may be examined with #{tasksel
--task-packages}#.
-4~ Desktop and language tasks
+4~desktop-and-language-tasks 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
@@ -273,10 +299,12 @@ $ 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.
+Second, live-build supports #{*-desktop}# virtual package lists for each of
+the desktop flavours mentioned above, which select the #{standard-x11}#
+predefined package list, the corresponding #{*-desktop} task and three
+additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example,
+if you specify #{--packages gnome-desktop}#, it is equivalent to specifying
+#{--packages standard-x11 --tasks "gnome-desktop desktop standard laptop"}#.
Third, if any of the tasks for these desktop flavours are selected, either
explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build
diff --git a/manual/po/de/user_customization-packages.ssi.po b/manual/po/de/user_customization-packages.ssi.po
index 6fc7fe4..7e30041 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-24 17:37-0400\n"
+"POT-Creation-Date: 2010-11-25 13:00-0400\n"
"PO-Revision-Date: 2010-10-03 20:30+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -55,16 +55,17 @@ 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: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_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: 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:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 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
@@ -115,16 +116,17 @@ 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: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_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 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
@@ -137,11 +139,6 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:110
-msgid "% FIXME"
-msgstr ""
-
-#. type: Plain text
#: en/user_customization-packages.ssi:2
msgid ":B~ Customizing package installation"
msgstr ""
@@ -289,7 +286,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:54
msgid ""
-"You can also put the GPG key used to sign the repository into #{config/"
+"You should also put the GPG key used to sign the repository into #{config/"
"chroot_sources/your-repository.{binary,chroot}.gpg}# files."
msgstr ""
@@ -366,43 +363,74 @@ msgstr ""
#: 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 "
-"provide sensible default package selections for the major desktop "
-"environments, as well as standard systems."
+"installed. The list syntax supports included files and conditional sections "
+"which makes it easy to build lists from other lists and adapt them for use "
+"in multiple configurations. You can use predefined package lists, providing "
+"in a modular fashion package selections from each of the major desktop "
+"environments and some special purpose lists, as well as standard lists the "
+"others are based upon. You can also provide your own package lists, or use a "
+"combination of both."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:86
-msgid "To specify one or more package lists, you can use:"
+msgid "4~ Predefined package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:90
-msgid "$ lb config --packages-lists \"list1 list2 list3\""
+#: en/user_customization-packages.ssi:88
+msgid ""
+"The simplest way to use lists is to specify one or more predefined lists "
+"with the #{--packages-lists}# option. For example:"
msgstr ""
#. type: Plain text
-#: 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."
+#: en/user_customization-packages.ssi:92
+msgid "$ lb config --packages-lists \"gnome-core rescue\""
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:96
-msgid "4~ Local package lists"
+msgid ""
+"In addition to these lists, live-build supports four virtual package lists: #"
+"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
+"each of which provide a more extensive selection of packages that "
+"corresponds with Debian Installer defaults for these desktop environments. "
+"See {Desktop and language tasks}#desktop-and-language-tasks for more details."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:98
msgid ""
-"You may supplement the supplied lists using local package lists stored in #"
-"{config/chroot_local-packageslists/}#."
+"Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download "
+"at http://live.debian.net are built using the corresponding virtual #{*-"
+"desktop}# lists."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:100
msgid ""
+"The default location for the list files on your system is #{/usr/share/live/"
+"build/lists/}#. To determine the packages in a given list, read the "
+"corresponding file, paying attention to included files and conditionals as "
+"described in the following sections."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:102
+msgid "4~ Local package lists"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:104
+msgid ""
+"You may supplement or replace entirely the supplied lists using local "
+"package lists stored in #{config/chroot_local-packageslists/}#."
+msgstr ""
+
+#. type: Plain text
+#: 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. Local package lists always override package lists "
"distributed with live-build. This can cause undesired effects, we therefore "
@@ -410,12 +438,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:102
+#: en/user_customization-packages.ssi:108
msgid "4~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:104
+#: en/user_customization-packages.ssi:110
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 "
@@ -425,37 +453,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:112
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:108
+#: en/user_customization-packages.ssi:114
msgid "4~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:117
-msgid "% code{ % % #include <gnome> % iceweasel % % }code"
+#: en/user_customization-packages.ssi:116
+msgid ""
+"The package lists that are included with live-build make extensive use of "
+"includes. Refer to these in the #{/usr/share/live/build/lists/}# directory, "
+"as they serve as good examples of how to write your own lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:118
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/}# "
-"directory."
+"For example, to make a list that includes the predefined #{gnome}# list plus "
+"iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with "
+"the following contents:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:121
+#: en/user_customization-packages.ssi:123
+msgid "#include <gnome> iceweasel"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:127
msgid "4~ Using conditionals inside package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:129
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -466,19 +502,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:131
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:137
msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:141
msgid ""
"You may test for any one of a number of values, e.g. to install #"
"{memtest86+ }# if either #{--architecture i386}# or #{--architecture amd64}# "
@@ -486,12 +522,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:141
+#: en/user_customization-packages.ssi:147
msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:151
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 "
@@ -499,32 +535,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:157
msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:155
+#: en/user_customization-packages.ssi:161
msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:161
+#: en/user_customization-packages.ssi:167
msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:171
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:173
msgid "3~ Tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:175
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 "
@@ -535,12 +571,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:179
msgid "$ lb config --tasks \"mail-server file-server\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:183
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, "
@@ -549,12 +585,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:179
-msgid "4~ Desktop and language tasks"
+#: en/user_customization-packages.ssi:185
+msgid "4~desktop-and-language-tasks Desktop and language tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:187
msgid ""
"Desktop and language tasks are special cases. In the Debian Installer, if "
"the medium was prepared for a particular desktop environment flavour, the "
@@ -566,14 +602,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:189
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
+#: en/user_customization-packages.ssi:191
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 "
@@ -583,22 +619,24 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:195
msgid ""
"$ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:199
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."
+"Second, live-build supports #{*-desktop}# virtual package lists for each of "
+"the desktop flavours mentioned above, which select the #{standard-x11}# "
+"predefined package list, the corresponding #{*-desktop} task and three "
+"additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example, "
+"if you specify #{--packages gnome-desktop}#, it is equivalent to specifying #"
+"{--packages standard-x11 --tasks \"gnome-desktop desktop standard laptop\"}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:201
msgid ""
"Third, if any of the tasks for these desktop flavours are selected, either "
"explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build "
@@ -608,12 +646,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:203
msgid "2~ Installing modified or third-party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:205
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 "
@@ -624,7 +662,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:207
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -635,22 +673,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:209
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:211
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:213
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:215
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 "
@@ -658,12 +696,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:217
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:219
msgid ""
"To install a custom package, simply copy it to the #{config/chroot_local-"
"packages/}# directory. Packages that are inside this directory will be "
@@ -672,45 +710,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:221
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:217
+#: en/user_customization-packages.ssi:223
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:225
msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:227
msgid ""
"_* You must install all appropriate packages in the #{config/chroot_local-"
"packages/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:229
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:231
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:233
msgid ""
"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
"you must ensure that you specify the packages elsewhere. See #{Choosing "
@@ -718,7 +756,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:235
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 "
@@ -726,12 +764,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:237
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:239
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 "
@@ -741,7 +779,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:241
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 "
@@ -751,17 +789,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:243
msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:245
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:247
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 "
@@ -772,12 +810,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:249
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:251
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 "
@@ -787,26 +825,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:253
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:249
+#: en/user_customization-packages.ssi:255
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:251
+#: en/user_customization-packages.ssi:257
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:259
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}# "
@@ -814,17 +852,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:263
msgid "lb config --apt-http-proxy http://proxy/"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:267
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:269
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 "
@@ -832,19 +870,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:271
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:269
+#: en/user_customization-packages.ssi:275
msgid "$ lb config --binary-indices false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:279
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 "
@@ -854,19 +892,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:281
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:279
+#: en/user_customization-packages.ssi:285
msgid "$ lb config -apt-recommends false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:283
+#: en/user_customization-packages.ssi:289
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"
@@ -878,12 +916,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:291
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:287
+#: en/user_customization-packages.ssi:293
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 "
@@ -892,11 +930,11 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:295
msgid "3~ APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:297
msgid "% FIXME: needs content"
msgstr ""
diff --git a/manual/po/fr/user_customization-packages.ssi.po b/manual/po/fr/user_customization-packages.ssi.po
index a846d58..35421ec 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-24 17:37-0400\n"
+"POT-Creation-Date: 2010-11-25 13:00-0400\n"
"PO-Revision-Date: 2010-10-16 14:45-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -55,16 +55,17 @@ 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: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_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: 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:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 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
@@ -115,16 +116,17 @@ 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: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_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 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
@@ -137,11 +139,6 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:110
-msgid "% FIXME"
-msgstr ""
-
-#. type: Plain text
#: en/user_customization-packages.ssi:2
msgid ":B~ Customizing package installation"
msgstr ""
@@ -289,7 +286,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:54
msgid ""
-"You can also put the GPG key used to sign the repository into #{config/"
+"You should also put the GPG key used to sign the repository into #{config/"
"chroot_sources/your-repository.{binary,chroot}.gpg}# files."
msgstr ""
@@ -366,43 +363,74 @@ msgstr ""
#: 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 "
-"provide sensible default package selections for the major desktop "
-"environments, as well as standard systems."
+"installed. The list syntax supports included files and conditional sections "
+"which makes it easy to build lists from other lists and adapt them for use "
+"in multiple configurations. You can use predefined package lists, providing "
+"in a modular fashion package selections from each of the major desktop "
+"environments and some special purpose lists, as well as standard lists the "
+"others are based upon. You can also provide your own package lists, or use a "
+"combination of both."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:86
-msgid "To specify one or more package lists, you can use:"
+msgid "4~ Predefined package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:90
-msgid "$ lb config --packages-lists \"list1 list2 list3\""
+#: en/user_customization-packages.ssi:88
+msgid ""
+"The simplest way to use lists is to specify one or more predefined lists "
+"with the #{--packages-lists}# option. For example:"
msgstr ""
#. type: Plain text
-#: 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."
+#: en/user_customization-packages.ssi:92
+msgid "$ lb config --packages-lists \"gnome-core rescue\""
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:96
-msgid "4~ Local package lists"
+msgid ""
+"In addition to these lists, live-build supports four virtual package lists: #"
+"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
+"each of which provide a more extensive selection of packages that "
+"corresponds with Debian Installer defaults for these desktop environments. "
+"See {Desktop and language tasks}#desktop-and-language-tasks for more details."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:98
msgid ""
-"You may supplement the supplied lists using local package lists stored in #"
-"{config/chroot_local-packageslists/}#."
+"Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download "
+"at http://live.debian.net are built using the corresponding virtual #{*-"
+"desktop}# lists."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:100
msgid ""
+"The default location for the list files on your system is #{/usr/share/live/"
+"build/lists/}#. To determine the packages in a given list, read the "
+"corresponding file, paying attention to included files and conditionals as "
+"described in the following sections."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:102
+msgid "4~ Local package lists"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:104
+msgid ""
+"You may supplement or replace entirely the supplied lists using local "
+"package lists stored in #{config/chroot_local-packageslists/}#."
+msgstr ""
+
+#. type: Plain text
+#: 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. Local package lists always override package lists "
"distributed with live-build. This can cause undesired effects, we therefore "
@@ -410,12 +438,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:102
+#: en/user_customization-packages.ssi:108
msgid "4~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:104
+#: en/user_customization-packages.ssi:110
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 "
@@ -425,37 +453,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:112
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:108
+#: en/user_customization-packages.ssi:114
msgid "4~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:117
-msgid "% code{ % % #include <gnome> % iceweasel % % }code"
+#: en/user_customization-packages.ssi:116
+msgid ""
+"The package lists that are included with live-build make extensive use of "
+"includes. Refer to these in the #{/usr/share/live/build/lists/}# directory, "
+"as they serve as good examples of how to write your own lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:118
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/}# "
-"directory."
+"For example, to make a list that includes the predefined #{gnome}# list plus "
+"iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with "
+"the following contents:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:121
+#: en/user_customization-packages.ssi:123
+msgid "#include <gnome> iceweasel"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:127
msgid "4~ Using conditionals inside package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:129
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -466,19 +502,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:131
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:137
msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:141
msgid ""
"You may test for any one of a number of values, e.g. to install #"
"{memtest86+ }# if either #{--architecture i386}# or #{--architecture amd64}# "
@@ -486,12 +522,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:141
+#: en/user_customization-packages.ssi:147
msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:151
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 "
@@ -499,32 +535,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:157
msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:155
+#: en/user_customization-packages.ssi:161
msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:161
+#: en/user_customization-packages.ssi:167
msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:171
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:173
msgid "3~ Tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:175
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 "
@@ -535,12 +571,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:179
msgid "$ lb config --tasks \"mail-server file-server\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:183
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, "
@@ -549,12 +585,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:179
-msgid "4~ Desktop and language tasks"
+#: en/user_customization-packages.ssi:185
+msgid "4~desktop-and-language-tasks Desktop and language tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:187
msgid ""
"Desktop and language tasks are special cases. In the Debian Installer, if "
"the medium was prepared for a particular desktop environment flavour, the "
@@ -566,14 +602,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:189
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
+#: en/user_customization-packages.ssi:191
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 "
@@ -583,22 +619,24 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:195
msgid ""
"$ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:199
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."
+"Second, live-build supports #{*-desktop}# virtual package lists for each of "
+"the desktop flavours mentioned above, which select the #{standard-x11}# "
+"predefined package list, the corresponding #{*-desktop} task and three "
+"additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example, "
+"if you specify #{--packages gnome-desktop}#, it is equivalent to specifying #"
+"{--packages standard-x11 --tasks \"gnome-desktop desktop standard laptop\"}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:201
msgid ""
"Third, if any of the tasks for these desktop flavours are selected, either "
"explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build "
@@ -608,12 +646,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:203
msgid "2~ Installing modified or third-party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:205
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 "
@@ -624,7 +662,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:207
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -635,22 +673,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:209
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:211
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:213
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:215
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 "
@@ -658,12 +696,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:217
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:219
msgid ""
"To install a custom package, simply copy it to the #{config/chroot_local-"
"packages/}# directory. Packages that are inside this directory will be "
@@ -672,45 +710,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:221
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:217
+#: en/user_customization-packages.ssi:223
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:225
msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:227
msgid ""
"_* You must install all appropriate packages in the #{config/chroot_local-"
"packages/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:229
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:231
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:233
msgid ""
"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
"you must ensure that you specify the packages elsewhere. See #{Choosing "
@@ -718,7 +756,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:235
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 "
@@ -726,12 +764,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:237
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:239
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 "
@@ -741,7 +779,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:241
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 "
@@ -751,17 +789,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:243
msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:245
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:247
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 "
@@ -772,12 +810,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:249
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:251
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 "
@@ -787,26 +825,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:253
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:249
+#: en/user_customization-packages.ssi:255
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:251
+#: en/user_customization-packages.ssi:257
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:259
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}# "
@@ -814,17 +852,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:263
msgid "lb config --apt-http-proxy http://proxy/"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:267
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:269
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 "
@@ -832,19 +870,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:271
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:269
+#: en/user_customization-packages.ssi:275
msgid "$ lb config --binary-indices false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:279
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 "
@@ -854,19 +892,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:281
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:279
+#: en/user_customization-packages.ssi:285
msgid "$ lb config -apt-recommends false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:283
+#: en/user_customization-packages.ssi:289
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"
@@ -878,12 +916,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:291
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:287
+#: en/user_customization-packages.ssi:293
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 "
@@ -892,11 +930,11 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:295
msgid "3~ APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:297
msgid "% FIXME: needs content"
msgstr ""
diff --git a/manual/po/pt_BR/user_customization-packages.ssi.po b/manual/po/pt_BR/user_customization-packages.ssi.po
index 3abeda6..b1f0cb8 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-24 17:37-0400\n"
+"POT-Creation-Date: 2010-11-25 13:00-0400\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -55,16 +55,17 @@ 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: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_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: 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:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 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
@@ -115,16 +116,17 @@ 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: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_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 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
@@ -137,11 +139,6 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:110
-msgid "% FIXME"
-msgstr ""
-
-#. type: Plain text
#: en/user_customization-packages.ssi:2
msgid ":B~ Customizing package installation"
msgstr ""
@@ -289,7 +286,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:54
msgid ""
-"You can also put the GPG key used to sign the repository into #{config/"
+"You should also put the GPG key used to sign the repository into #{config/"
"chroot_sources/your-repository.{binary,chroot}.gpg}# files."
msgstr ""
@@ -366,43 +363,74 @@ msgstr ""
#: 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 "
-"provide sensible default package selections for the major desktop "
-"environments, as well as standard systems."
+"installed. The list syntax supports included files and conditional sections "
+"which makes it easy to build lists from other lists and adapt them for use "
+"in multiple configurations. You can use predefined package lists, providing "
+"in a modular fashion package selections from each of the major desktop "
+"environments and some special purpose lists, as well as standard lists the "
+"others are based upon. You can also provide your own package lists, or use a "
+"combination of both."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:86
-msgid "To specify one or more package lists, you can use:"
+msgid "4~ Predefined package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:90
-msgid "$ lb config --packages-lists \"list1 list2 list3\""
+#: en/user_customization-packages.ssi:88
+msgid ""
+"The simplest way to use lists is to specify one or more predefined lists "
+"with the #{--packages-lists}# option. For example:"
msgstr ""
#. type: Plain text
-#: 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."
+#: en/user_customization-packages.ssi:92
+msgid "$ lb config --packages-lists \"gnome-core rescue\""
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:96
-msgid "4~ Local package lists"
+msgid ""
+"In addition to these lists, live-build supports four virtual package lists: #"
+"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
+"each of which provide a more extensive selection of packages that "
+"corresponds with Debian Installer defaults for these desktop environments. "
+"See {Desktop and language tasks}#desktop-and-language-tasks for more details."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:98
msgid ""
-"You may supplement the supplied lists using local package lists stored in #"
-"{config/chroot_local-packageslists/}#."
+"Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download "
+"at http://live.debian.net are built using the corresponding virtual #{*-"
+"desktop}# lists."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:100
msgid ""
+"The default location for the list files on your system is #{/usr/share/live/"
+"build/lists/}#. To determine the packages in a given list, read the "
+"corresponding file, paying attention to included files and conditionals as "
+"described in the following sections."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:102
+msgid "4~ Local package lists"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:104
+msgid ""
+"You may supplement or replace entirely the supplied lists using local "
+"package lists stored in #{config/chroot_local-packageslists/}#."
+msgstr ""
+
+#. type: Plain text
+#: 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. Local package lists always override package lists "
"distributed with live-build. This can cause undesired effects, we therefore "
@@ -410,12 +438,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:102
+#: en/user_customization-packages.ssi:108
msgid "4~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:104
+#: en/user_customization-packages.ssi:110
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 "
@@ -425,37 +453,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:112
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:108
+#: en/user_customization-packages.ssi:114
msgid "4~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:117
-msgid "% code{ % % #include <gnome> % iceweasel % % }code"
+#: en/user_customization-packages.ssi:116
+msgid ""
+"The package lists that are included with live-build make extensive use of "
+"includes. Refer to these in the #{/usr/share/live/build/lists/}# directory, "
+"as they serve as good examples of how to write your own lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:118
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/}# "
-"directory."
+"For example, to make a list that includes the predefined #{gnome}# list plus "
+"iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with "
+"the following contents:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:121
+#: en/user_customization-packages.ssi:123
+msgid "#include <gnome> iceweasel"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:127
msgid "4~ Using conditionals inside package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:129
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -466,19 +502,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:131
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:137
msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:141
msgid ""
"You may test for any one of a number of values, e.g. to install #"
"{memtest86+ }# if either #{--architecture i386}# or #{--architecture amd64}# "
@@ -486,12 +522,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:141
+#: en/user_customization-packages.ssi:147
msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:151
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 "
@@ -499,32 +535,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:157
msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:155
+#: en/user_customization-packages.ssi:161
msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:161
+#: en/user_customization-packages.ssi:167
msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:171
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:173
msgid "3~ Tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:175
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 "
@@ -535,12 +571,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:179
msgid "$ lb config --tasks \"mail-server file-server\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:183
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, "
@@ -549,12 +585,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:179
-msgid "4~ Desktop and language tasks"
+#: en/user_customization-packages.ssi:185
+msgid "4~desktop-and-language-tasks Desktop and language tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:187
msgid ""
"Desktop and language tasks are special cases. In the Debian Installer, if "
"the medium was prepared for a particular desktop environment flavour, the "
@@ -566,14 +602,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:189
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
+#: en/user_customization-packages.ssi:191
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 "
@@ -583,22 +619,24 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:195
msgid ""
"$ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:199
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."
+"Second, live-build supports #{*-desktop}# virtual package lists for each of "
+"the desktop flavours mentioned above, which select the #{standard-x11}# "
+"predefined package list, the corresponding #{*-desktop} task and three "
+"additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example, "
+"if you specify #{--packages gnome-desktop}#, it is equivalent to specifying #"
+"{--packages standard-x11 --tasks \"gnome-desktop desktop standard laptop\"}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:201
msgid ""
"Third, if any of the tasks for these desktop flavours are selected, either "
"explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build "
@@ -608,12 +646,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:203
msgid "2~ Installing modified or third-party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:205
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 "
@@ -624,7 +662,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:207
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -635,22 +673,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:209
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:211
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:213
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:215
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 "
@@ -658,12 +696,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:217
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:219
msgid ""
"To install a custom package, simply copy it to the #{config/chroot_local-"
"packages/}# directory. Packages that are inside this directory will be "
@@ -672,45 +710,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:221
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:217
+#: en/user_customization-packages.ssi:223
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:225
msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:227
msgid ""
"_* You must install all appropriate packages in the #{config/chroot_local-"
"packages/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:229
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:231
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:233
msgid ""
"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
"you must ensure that you specify the packages elsewhere. See #{Choosing "
@@ -718,7 +756,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:235
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 "
@@ -726,12 +764,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:237
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:239
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 "
@@ -741,7 +779,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:241
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 "
@@ -751,17 +789,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:243
msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:245
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:247
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 "
@@ -772,12 +810,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:249
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:251
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 "
@@ -787,26 +825,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:253
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:249
+#: en/user_customization-packages.ssi:255
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:251
+#: en/user_customization-packages.ssi:257
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:259
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}# "
@@ -814,17 +852,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:263
msgid "lb config --apt-http-proxy http://proxy/"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:267
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:269
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 "
@@ -832,19 +870,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:271
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:269
+#: en/user_customization-packages.ssi:275
msgid "$ lb config --binary-indices false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:279
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 "
@@ -854,19 +892,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:281
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:279
+#: en/user_customization-packages.ssi:285
msgid "$ lb config -apt-recommends false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:283
+#: en/user_customization-packages.ssi:289
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"
@@ -878,12 +916,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:291
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:287
+#: en/user_customization-packages.ssi:293
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 "
@@ -892,11 +930,11 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:295
msgid "3~ APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:297
msgid "% FIXME: needs content"
msgstr ""
diff --git a/manual/po/ro/user_customization-packages.ssi.po b/manual/po/ro/user_customization-packages.ssi.po
index cebbc99..37557f7 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-24 17:37-0400\n"
+"POT-Creation-Date: 2010-11-25 13:00-0400\n"
"PO-Revision-Date: 2010-10-22 08:58-0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -56,16 +56,17 @@ 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: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_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: 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:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 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
@@ -116,16 +117,17 @@ 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: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_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 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
@@ -138,11 +140,6 @@ msgid "}code"
msgstr "}code"
#. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:110
-msgid "% FIXME"
-msgstr ""
-
-#. type: Plain text
#: en/user_customization-packages.ssi:2
msgid ":B~ Customizing package installation"
msgstr ""
@@ -290,7 +287,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:54
msgid ""
-"You can also put the GPG key used to sign the repository into #{config/"
+"You should also put the GPG key used to sign the repository into #{config/"
"chroot_sources/your-repository.{binary,chroot}.gpg}# files."
msgstr ""
@@ -367,43 +364,74 @@ msgstr ""
#: 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 "
-"provide sensible default package selections for the major desktop "
-"environments, as well as standard systems."
+"installed. The list syntax supports included files and conditional sections "
+"which makes it easy to build lists from other lists and adapt them for use "
+"in multiple configurations. You can use predefined package lists, providing "
+"in a modular fashion package selections from each of the major desktop "
+"environments and some special purpose lists, as well as standard lists the "
+"others are based upon. You can also provide your own package lists, or use a "
+"combination of both."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:86
-msgid "To specify one or more package lists, you can use:"
+msgid "4~ Predefined package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:90
-msgid "$ lb config --packages-lists \"list1 list2 list3\""
+#: en/user_customization-packages.ssi:88
+msgid ""
+"The simplest way to use lists is to specify one or more predefined lists "
+"with the #{--packages-lists}# option. For example:"
msgstr ""
#. type: Plain text
-#: 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."
+#: en/user_customization-packages.ssi:92
+msgid "$ lb config --packages-lists \"gnome-core rescue\""
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:96
-msgid "4~ Local package lists"
+msgid ""
+"In addition to these lists, live-build supports four virtual package lists: #"
+"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
+"each of which provide a more extensive selection of packages that "
+"corresponds with Debian Installer defaults for these desktop environments. "
+"See {Desktop and language tasks}#desktop-and-language-tasks for more details."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:98
msgid ""
-"You may supplement the supplied lists using local package lists stored in #"
-"{config/chroot_local-packageslists/}#."
+"Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download "
+"at http://live.debian.net are built using the corresponding virtual #{*-"
+"desktop}# lists."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:100
msgid ""
+"The default location for the list files on your system is #{/usr/share/live/"
+"build/lists/}#. To determine the packages in a given list, read the "
+"corresponding file, paying attention to included files and conditionals as "
+"described in the following sections."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:102
+msgid "4~ Local package lists"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:104
+msgid ""
+"You may supplement or replace entirely the supplied lists using local "
+"package lists stored in #{config/chroot_local-packageslists/}#."
+msgstr ""
+
+#. type: Plain text
+#: 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. Local package lists always override package lists "
"distributed with live-build. This can cause undesired effects, we therefore "
@@ -411,12 +439,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:102
+#: en/user_customization-packages.ssi:108
msgid "4~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:104
+#: en/user_customization-packages.ssi:110
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 "
@@ -426,37 +454,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:112
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:108
+#: en/user_customization-packages.ssi:114
msgid "4~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:117
-msgid "% code{ % % #include <gnome> % iceweasel % % }code"
+#: en/user_customization-packages.ssi:116
+msgid ""
+"The package lists that are included with live-build make extensive use of "
+"includes. Refer to these in the #{/usr/share/live/build/lists/}# directory, "
+"as they serve as good examples of how to write your own lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:118
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/}# "
-"directory."
+"For example, to make a list that includes the predefined #{gnome}# list plus "
+"iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with "
+"the following contents:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:121
+#: en/user_customization-packages.ssi:123
+msgid "#include <gnome> iceweasel"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:127
msgid "4~ Using conditionals inside package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:129
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -467,19 +503,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:131
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:137
msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:141
msgid ""
"You may test for any one of a number of values, e.g. to install #"
"{memtest86+ }# if either #{--architecture i386}# or #{--architecture amd64}# "
@@ -487,12 +523,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:141
+#: en/user_customization-packages.ssi:147
msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:151
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 "
@@ -500,32 +536,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:157
msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:155
+#: en/user_customization-packages.ssi:161
msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:161
+#: en/user_customization-packages.ssi:167
msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:171
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:173
msgid "3~ Tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:175
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 "
@@ -536,12 +572,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:179
msgid "$ lb config --tasks \"mail-server file-server\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:183
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, "
@@ -550,12 +586,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:179
-msgid "4~ Desktop and language tasks"
+#: en/user_customization-packages.ssi:185
+msgid "4~desktop-and-language-tasks Desktop and language tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:187
msgid ""
"Desktop and language tasks are special cases. In the Debian Installer, if "
"the medium was prepared for a particular desktop environment flavour, the "
@@ -567,14 +603,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:189
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
+#: en/user_customization-packages.ssi:191
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 "
@@ -584,22 +620,24 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:195
msgid ""
"$ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:199
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."
+"Second, live-build supports #{*-desktop}# virtual package lists for each of "
+"the desktop flavours mentioned above, which select the #{standard-x11}# "
+"predefined package list, the corresponding #{*-desktop} task and three "
+"additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example, "
+"if you specify #{--packages gnome-desktop}#, it is equivalent to specifying #"
+"{--packages standard-x11 --tasks \"gnome-desktop desktop standard laptop\"}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:201
msgid ""
"Third, if any of the tasks for these desktop flavours are selected, either "
"explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build "
@@ -609,12 +647,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:203
msgid "2~ Installing modified or third-party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:205
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 "
@@ -625,7 +663,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:207
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -636,22 +674,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:209
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:211
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:213
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:215
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 "
@@ -659,12 +697,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:217
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:219
msgid ""
"To install a custom package, simply copy it to the #{config/chroot_local-"
"packages/}# directory. Packages that are inside this directory will be "
@@ -673,45 +711,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:221
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:217
+#: en/user_customization-packages.ssi:223
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:225
msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:227
msgid ""
"_* You must install all appropriate packages in the #{config/chroot_local-"
"packages/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:229
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:231
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:233
msgid ""
"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
"you must ensure that you specify the packages elsewhere. See #{Choosing "
@@ -719,7 +757,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:235
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 "
@@ -727,12 +765,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:237
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:239
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 "
@@ -742,7 +780,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:241
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 "
@@ -752,17 +790,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:243
msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:245
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:247
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 "
@@ -773,12 +811,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:249
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:251
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 "
@@ -788,26 +826,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:253
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:249
+#: en/user_customization-packages.ssi:255
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:251
+#: en/user_customization-packages.ssi:257
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:259
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}# "
@@ -815,17 +853,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:263
msgid "lb config --apt-http-proxy http://proxy/"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:267
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:269
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 "
@@ -833,19 +871,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:271
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:269
+#: en/user_customization-packages.ssi:275
msgid "$ lb config --binary-indices false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:279
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 "
@@ -855,19 +893,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:281
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:279
+#: en/user_customization-packages.ssi:285
msgid "$ lb config -apt-recommends false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:283
+#: en/user_customization-packages.ssi:289
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"
@@ -879,12 +917,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:291
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:287
+#: en/user_customization-packages.ssi:293
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 "
@@ -893,11 +931,11 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:295
msgid "3~ APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:297
msgid "% FIXME: needs content"
msgstr ""
diff --git a/manual/pot/user_customization-packages.ssi.pot b/manual/pot/user_customization-packages.ssi.pot
index de47650..75c9e9c 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-24 17:37-0400\n"
+"POT-Creation-Date: 2010-11-25 13:00-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,16 +55,17 @@ 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: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_customization-packages.ssi:72 en/user_customization-packages.ssi:90
+#: en/user_customization-packages.ssi:120
+#: 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:177
+#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:283 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
@@ -115,16 +116,17 @@ 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: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_customization-packages.ssi:76 en/user_customization-packages.ssi:94
+#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:139
+#: en/user_customization-packages.ssi:149
+#: en/user_customization-packages.ssi:159
+#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:277
+#: en/user_customization-packages.ssi:287 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
@@ -137,11 +139,6 @@ msgid "}code"
msgstr ""
#. type: Plain text
-#: en/user_basics.ssi:218 en/user_customization-packages.ssi:110
-msgid "% FIXME"
-msgstr ""
-
-#. type: Plain text
#: en/user_customization-packages.ssi:2
msgid ":B~ Customizing package installation"
msgstr ""
@@ -289,7 +286,7 @@ msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:54
msgid ""
-"You can also put the GPG key used to sign the repository into #{config/"
+"You should also put the GPG key used to sign the repository into #{config/"
"chroot_sources/your-repository.{binary,chroot}.gpg}# files."
msgstr ""
@@ -366,43 +363,74 @@ msgstr ""
#: 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 "
-"provide sensible default package selections for the major desktop "
-"environments, as well as standard systems."
+"installed. The list syntax supports included files and conditional sections "
+"which makes it easy to build lists from other lists and adapt them for use "
+"in multiple configurations. You can use predefined package lists, providing "
+"in a modular fashion package selections from each of the major desktop "
+"environments and some special purpose lists, as well as standard lists the "
+"others are based upon. You can also provide your own package lists, or use a "
+"combination of both."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:86
-msgid "To specify one or more package lists, you can use:"
+msgid "4~ Predefined package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:90
-msgid "$ lb config --packages-lists \"list1 list2 list3\""
+#: en/user_customization-packages.ssi:88
+msgid ""
+"The simplest way to use lists is to specify one or more predefined lists "
+"with the #{--packages-lists}# option. For example:"
msgstr ""
#. type: Plain text
-#: 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."
+#: en/user_customization-packages.ssi:92
+msgid "$ lb config --packages-lists \"gnome-core rescue\""
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:96
-msgid "4~ Local package lists"
+msgid ""
+"In addition to these lists, live-build supports four virtual package lists: #"
+"{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#, "
+"each of which provide a more extensive selection of packages that "
+"corresponds with Debian Installer defaults for these desktop environments. "
+"See {Desktop and language tasks}#desktop-and-language-tasks for more details."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:98
msgid ""
-"You may supplement the supplied lists using local package lists stored in #"
-"{config/chroot_local-packageslists/}#."
+"Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download "
+"at http://live.debian.net are built using the corresponding virtual #{*-"
+"desktop}# lists."
msgstr ""
#. type: Plain text
#: en/user_customization-packages.ssi:100
msgid ""
+"The default location for the list files on your system is #{/usr/share/live/"
+"build/lists/}#. To determine the packages in a given list, read the "
+"corresponding file, paying attention to included files and conditionals as "
+"described in the following sections."
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:102
+msgid "4~ Local package lists"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:104
+msgid ""
+"You may supplement or replace entirely the supplied lists using local "
+"package lists stored in #{config/chroot_local-packageslists/}#."
+msgstr ""
+
+#. type: Plain text
+#: 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. Local package lists always override package lists "
"distributed with live-build. This can cause undesired effects, we therefore "
@@ -410,12 +438,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:102
+#: en/user_customization-packages.ssi:108
msgid "4~ Local binary package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:104
+#: en/user_customization-packages.ssi:110
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 "
@@ -425,37 +453,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:106
+#: en/user_customization-packages.ssi:112
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:108
+#: en/user_customization-packages.ssi:114
msgid "4~ Extending a provided package list using includes"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:117
-msgid "% code{ % % #include <gnome> % iceweasel % % }code"
+#: en/user_customization-packages.ssi:116
+msgid ""
+"The package lists that are included with live-build make extensive use of "
+"includes. Refer to these in the #{/usr/share/live/build/lists/}# directory, "
+"as they serve as good examples of how to write your own lists."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:119
+#: en/user_customization-packages.ssi:118
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/}# "
-"directory."
+"For example, to make a list that includes the predefined #{gnome}# list plus "
+"iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with "
+"the following contents:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:121
+#: en/user_customization-packages.ssi:123
+msgid "#include <gnome> iceweasel"
+msgstr ""
+
+#. type: Plain text
+#: en/user_customization-packages.ssi:127
msgid "4~ Using conditionals inside package lists"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:123
+#: en/user_customization-packages.ssi:129
msgid ""
"Any of the live-build configuration variables stored in #{config/*}# (minus "
"the #{LB_}# prefix) may be used in conditional statements in package lists. "
@@ -466,19 +502,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:125
+#: en/user_customization-packages.ssi:131
msgid ""
"For example, to install #{ia32-libs}# if the #{--architecture amd64}# is "
"specified:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:131
+#: en/user_customization-packages.ssi:137
msgid "#if ARCHITECTURE amd64 ia32-libs #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:135
+#: en/user_customization-packages.ssi:141
msgid ""
"You may test for any one of a number of values, e.g. to install #"
"{memtest86+ }# if either #{--architecture i386}# or #{--architecture amd64}# "
@@ -486,12 +522,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:141
+#: en/user_customization-packages.ssi:147
msgid "#if ARCHITECTURE i386 amd64 memtest86+ #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:145
+#: en/user_customization-packages.ssi:151
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 "
@@ -499,32 +535,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:151
+#: en/user_customization-packages.ssi:157
msgid "#if ARCHIVE_AREAS contrib non-free vrms #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:155
+#: en/user_customization-packages.ssi:161
msgid "A conditional may surround an #{#include}# directive:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:161
+#: en/user_customization-packages.ssi:167
msgid "#if ARCHITECTURE amd64 #include <gnome-full> #endif"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:165
+#: en/user_customization-packages.ssi:171
msgid "The nesting of conditionals is not supported."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:167
+#: en/user_customization-packages.ssi:173
msgid "3~ Tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:169
+#: en/user_customization-packages.ssi:175
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 "
@@ -535,12 +571,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:173
+#: en/user_customization-packages.ssi:179
msgid "$ lb config --tasks \"mail-server file-server\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:177
+#: en/user_customization-packages.ssi:183
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, "
@@ -549,12 +585,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:179
-msgid "4~ Desktop and language tasks"
+#: en/user_customization-packages.ssi:185
+msgid "4~desktop-and-language-tasks Desktop and language tasks"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:181
+#: en/user_customization-packages.ssi:187
msgid ""
"Desktop and language tasks are special cases. In the Debian Installer, if "
"the medium was prepared for a particular desktop environment flavour, the "
@@ -566,14 +602,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:183
+#: en/user_customization-packages.ssi:189
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
+#: en/user_customization-packages.ssi:191
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 "
@@ -583,22 +619,24 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:189
+#: en/user_customization-packages.ssi:195
msgid ""
"$ lb config --tasks \"japanese japanese-desktop japanese-gnome-desktop\""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:193
+#: en/user_customization-packages.ssi:199
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."
+"Second, live-build supports #{*-desktop}# virtual package lists for each of "
+"the desktop flavours mentioned above, which select the #{standard-x11}# "
+"predefined package list, the corresponding #{*-desktop} task and three "
+"additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example, "
+"if you specify #{--packages gnome-desktop}#, it is equivalent to specifying #"
+"{--packages standard-x11 --tasks \"gnome-desktop desktop standard laptop\"}#."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:195
+#: en/user_customization-packages.ssi:201
msgid ""
"Third, if any of the tasks for these desktop flavours are selected, either "
"explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build "
@@ -608,12 +646,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:197
+#: en/user_customization-packages.ssi:203
msgid "2~ Installing modified or third-party packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:199
+#: en/user_customization-packages.ssi:205
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 "
@@ -624,7 +662,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:201
+#: en/user_customization-packages.ssi:207
msgid ""
"This section does not cover advice regarding building or maintaining "
"modified packages. Joachim Breitner's 'How to fork privately' method from "
@@ -635,22 +673,22 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:203
+#: en/user_customization-packages.ssi:209
msgid "There are two ways of installing modified custom packages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:205
+#: en/user_customization-packages.ssi:211
msgid "_* #{chroot_local-packages}#"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:207
+#: en/user_customization-packages.ssi:213
msgid "_* Using a custom APT repository"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:209
+#: en/user_customization-packages.ssi:215
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 "
@@ -658,12 +696,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:211
+#: en/user_customization-packages.ssi:217
msgid "3~ Using #{chroot_local-packages}# to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:213
+#: en/user_customization-packages.ssi:219
msgid ""
"To install a custom package, simply copy it to the #{config/chroot_local-"
"packages/}# directory. Packages that are inside this directory will be "
@@ -672,45 +710,45 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:215
+#: en/user_customization-packages.ssi:221
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:217
+#: en/user_customization-packages.ssi:223
msgid ""
"Using #{chroot_local-packages}# for installation of custom packages has "
"disadvantages:"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:219
+#: en/user_customization-packages.ssi:225
msgid "_* It is not possible to use secure APT."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:221
+#: en/user_customization-packages.ssi:227
msgid ""
"_* You must install all appropriate packages in the #{config/chroot_local-"
"packages/}# directory."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:223
+#: en/user_customization-packages.ssi:229
msgid ""
"_* It does not lend itself to storing Debian Live configurations in revision "
"control."
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:225
+#: en/user_customization-packages.ssi:231
msgid "3~ Using an APT repository to install custom packages"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:227
+#: en/user_customization-packages.ssi:233
msgid ""
"Unlike using #{chroot_local-packages}#, when using a custom APT repository "
"you must ensure that you specify the packages elsewhere. See #{Choosing "
@@ -718,7 +756,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:229
+#: en/user_customization-packages.ssi:235
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 "
@@ -726,12 +764,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:231
+#: en/user_customization-packages.ssi:237
msgid "3~ Custom packages and APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:233
+#: en/user_customization-packages.ssi:239
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 "
@@ -741,7 +779,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:235
+#: en/user_customization-packages.ssi:241
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 "
@@ -751,17 +789,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:237
+#: en/user_customization-packages.ssi:243
msgid "% FIXME: <xref linkend=\"apt-preferences\"/>"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:239
+#: en/user_customization-packages.ssi:245
msgid "2~ Configuring APT at build time"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:241
+#: en/user_customization-packages.ssi:247
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 "
@@ -772,12 +810,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:243
+#: en/user_customization-packages.ssi:249
msgid "3~choosing-apt-or-aptitude Choosing apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:245
+#: en/user_customization-packages.ssi:251
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 "
@@ -787,26 +825,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:247
+#: en/user_customization-packages.ssi:253
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:249
+#: en/user_customization-packages.ssi:255
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:251
+#: en/user_customization-packages.ssi:257
msgid "3~ Using a proxy with APT"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:253
+#: en/user_customization-packages.ssi:259
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}# "
@@ -814,17 +852,17 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:257
+#: en/user_customization-packages.ssi:263
msgid "lb config --apt-http-proxy http://proxy/"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:261
+#: en/user_customization-packages.ssi:267
msgid "3~ Tweaking APT to save space"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:263
+#: en/user_customization-packages.ssi:269
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 "
@@ -832,19 +870,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:265
+#: en/user_customization-packages.ssi:271
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:269
+#: en/user_customization-packages.ssi:275
msgid "$ lb config --binary-indices false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:273
+#: en/user_customization-packages.ssi:279
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 "
@@ -854,19 +892,19 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:275
+#: en/user_customization-packages.ssi:281
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:279
+#: en/user_customization-packages.ssi:285
msgid "$ lb config -apt-recommends false"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:283
+#: en/user_customization-packages.ssi:289
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"
@@ -878,12 +916,12 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:285
+#: en/user_customization-packages.ssi:291
msgid "3~ Passing options to apt or aptitude"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:287
+#: en/user_customization-packages.ssi:293
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 "
@@ -892,11 +930,11 @@ msgid ""
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:289
+#: en/user_customization-packages.ssi:295
msgid "3~ APT pinning"
msgstr ""
#. type: Plain text
-#: en/user_customization-packages.ssi:291
+#: en/user_customization-packages.ssi:297
msgid "% FIXME: needs content"
msgstr ""
diff --git a/manual/pt_BR/user_customization-packages.ssi b/manual/pt_BR/user_customization-packages.ssi
index df2ab9b..14015f9 100644
--- a/manual/pt_BR/user_customization-packages.ssi
+++ b/manual/pt_BR/user_customization-packages.ssi
@@ -87,7 +87,7 @@ directory.
If such files exist, they will be picked up automatically.
-You can also put the GPG key used to sign the repository into
+You should also put the GPG key used to sign the repository into
#{config/chroot_sources/your-repository.{binary,chroot}.gpg}# files.
Note: some preconfigured package repositories are available for easy
@@ -133,25 +133,45 @@ 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.
+installed. The list syntax supports included files and conditional sections
+which makes it easy to build lists from other lists and adapt them for use
+in multiple configurations. You can use predefined package lists, providing
+in a modular fashion package selections from each of the major desktop
+environments and some special purpose lists, as well as standard lists the
+others are based upon. You can also provide your own package lists, or use a
+combination of both.
-To specify one or more package lists, you can use:
+4~ Predefined package lists
+
+The simplest way to use lists is to specify one or more predefined lists
+with the #{--packages-lists}# option. For example:
code{
-$ lb config --packages-lists "list1 list2 list3"
+$ lb config --packages-lists "gnome-core rescue"
}code
-Note: Package lists that are distributed with live-build reside in the
-#{/usr/share/live/build/lists/}# directory.
+In addition to these lists, live-build supports four virtual package lists:
+#{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#,
+each of which provide a more extensive selection of packages that
+corresponds with Debian Installer defaults for these desktop
+environments. See {Desktop and language tasks}#desktop-and-language-tasks
+for more details.
+
+Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download
+at http://live.debian.net are built using the corresponding virtual
+#{*-desktop}# lists.
+
+The default location for the list files on your system is
+#{/usr/share/live/build/lists/}#. To determine the packages in a given list,
+read the corresponding file, paying attention to included files and
+conditionals as described in the following sections.
4~ Local package lists
-You may supplement the supplied lists using local package lists stored in
-#{config/chroot_local-packageslists/}#.
+You may supplement or replace entirely the supplied lists using local
+package lists stored in #{config/chroot_local-packageslists/}#.
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
@@ -171,13 +191,19 @@ in order to be processed.
4~ Extending a provided package list using includes
-% FIXME
+The package lists that are included with live-build make extensive use of
+includes. Refer to these in the #{/usr/share/live/build/lists/}# directory,
+as they serve as good examples of how to write your own lists.
-% code{ % % #include <gnome> % iceweasel % % }code
+For example, to make a list that includes the predefined #{gnome}# list plus
+iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with
+the following contents:
-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/}#
-directory.
+code{
+
+#include <gnome> iceweasel
+
+}code
4~ Using conditionals inside package lists
@@ -247,7 +273,7 @@ The primary tasks available in the Debian Installer can be listed with
including ones not included in this list, may be examined with #{tasksel
--task-packages}#.
-4~ Desktop and language tasks
+4~desktop-and-language-tasks 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
@@ -273,10 +299,12 @@ $ 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.
+Second, live-build supports #{*-desktop}# virtual package lists for each of
+the desktop flavours mentioned above, which select the #{standard-x11}#
+predefined package list, the corresponding #{*-desktop} task and three
+additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example,
+if you specify #{--packages gnome-desktop}#, it is equivalent to specifying
+#{--packages standard-x11 --tasks "gnome-desktop desktop standard laptop"}#.
Third, if any of the tasks for these desktop flavours are selected, either
explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build
diff --git a/manual/ro/user_customization-packages.ssi b/manual/ro/user_customization-packages.ssi
index df2ab9b..14015f9 100644
--- a/manual/ro/user_customization-packages.ssi
+++ b/manual/ro/user_customization-packages.ssi
@@ -87,7 +87,7 @@ directory.
If such files exist, they will be picked up automatically.
-You can also put the GPG key used to sign the repository into
+You should also put the GPG key used to sign the repository into
#{config/chroot_sources/your-repository.{binary,chroot}.gpg}# files.
Note: some preconfigured package repositories are available for easy
@@ -133,25 +133,45 @@ 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.
+installed. The list syntax supports included files and conditional sections
+which makes it easy to build lists from other lists and adapt them for use
+in multiple configurations. You can use predefined package lists, providing
+in a modular fashion package selections from each of the major desktop
+environments and some special purpose lists, as well as standard lists the
+others are based upon. You can also provide your own package lists, or use a
+combination of both.
-To specify one or more package lists, you can use:
+4~ Predefined package lists
+
+The simplest way to use lists is to specify one or more predefined lists
+with the #{--packages-lists}# option. For example:
code{
-$ lb config --packages-lists "list1 list2 list3"
+$ lb config --packages-lists "gnome-core rescue"
}code
-Note: Package lists that are distributed with live-build reside in the
-#{/usr/share/live/build/lists/}# directory.
+In addition to these lists, live-build supports four virtual package lists:
+#{gnome-desktop}#, #{kde-desktop}#, #{lxde-desktop}# and #{xfce-desktop}#,
+each of which provide a more extensive selection of packages that
+corresponds with Debian Installer defaults for these desktop
+environments. See {Desktop and language tasks}#desktop-and-language-tasks
+for more details.
+
+Note: The prebuilt GNOME, KDE, LXDE and XFCE images available for download
+at http://live.debian.net are built using the corresponding virtual
+#{*-desktop}# lists.
+
+The default location for the list files on your system is
+#{/usr/share/live/build/lists/}#. To determine the packages in a given list,
+read the corresponding file, paying attention to included files and
+conditionals as described in the following sections.
4~ Local package lists
-You may supplement the supplied lists using local package lists stored in
-#{config/chroot_local-packageslists/}#.
+You may supplement or replace entirely the supplied lists using local
+package lists stored in #{config/chroot_local-packageslists/}#.
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
@@ -171,13 +191,19 @@ in order to be processed.
4~ Extending a provided package list using includes
-% FIXME
+The package lists that are included with live-build make extensive use of
+includes. Refer to these in the #{/usr/share/live/build/lists/}# directory,
+as they serve as good examples of how to write your own lists.
-% code{ % % #include <gnome> % iceweasel % % }code
+For example, to make a list that includes the predefined #{gnome}# list plus
+iceweasel, create #{config/chroot_local-packageslists/mygnome.list}# with
+the following contents:
-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/}#
-directory.
+code{
+
+#include <gnome> iceweasel
+
+}code
4~ Using conditionals inside package lists
@@ -247,7 +273,7 @@ The primary tasks available in the Debian Installer can be listed with
including ones not included in this list, may be examined with #{tasksel
--task-packages}#.
-4~ Desktop and language tasks
+4~desktop-and-language-tasks 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
@@ -273,10 +299,12 @@ $ 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.
+Second, live-build supports #{*-desktop}# virtual package lists for each of
+the desktop flavours mentioned above, which select the #{standard-x11}#
+predefined package list, the corresponding #{*-desktop} task and three
+additional tasks: #{desktop}#, #{standard}# and #{laptop}#. So, for example,
+if you specify #{--packages gnome-desktop}#, it is equivalent to specifying
+#{--packages standard-x11 --tasks "gnome-desktop desktop standard laptop"}#.
Third, if any of the tasks for these desktop flavours are selected, either
explicitly through #{--tasks}# or implicitly by #{--packages}#, live-build
--
live-manual
More information about the debian-live-changes
mailing list