[SCM] live-build branch, debian-next, updated. debian/3.0_a57-1-7-gd6558cc
Daniel Baumann
daniel at debian.org
Tue Aug 14 19:06:30 UTC 2012
The following commit has been merged in the debian-next branch:
commit d6558cc3658386ebaeab737cc725c29c6819fad3
Author: Daniel Baumann <daniel at debian.org>
Date: Tue Aug 14 21:06:22 2012 +0200
Using /etc/live/build/*.conf instead of /etc/live/build.d/*.conf for consistency reasons.
diff --git a/manpages/de/lb.de.1 b/manpages/de/lb.de.1
index 3eb0262..862b3f7 100644
--- a/manpages/de/lb.de.1
+++ b/manpages/de/lb.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57\-1 "Debian Live Project"
.SH NAME
\fBlb\fP \- wrapper for live\-build programs
diff --git a/manpages/de/lb_binary.de.1 b/manpages/de/lb_binary.de.1
index 4ed2815..cdfcc89 100644
--- a/manpages/de/lb_binary.de.1
+++ b/manpages/de/lb_binary.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57\-1 "Debian Live Project"
.SH NAME
\fBlb binary\fP \- Complete the binary stage
diff --git a/manpages/de/lb_bootstrap.de.1 b/manpages/de/lb_bootstrap.de.1
index ab715d0..2787c43 100644
--- a/manpages/de/lb_bootstrap.de.1
+++ b/manpages/de/lb_bootstrap.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57\-1 "Debian Live Project"
.SH NAME
\fBlb bootstrap\fP \- Complete the bootstrap stage
diff --git a/manpages/de/lb_build.de.1 b/manpages/de/lb_build.de.1
index 8d9103e..6c4929c 100644
--- a/manpages/de/lb_build.de.1
+++ b/manpages/de/lb_build.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57\-1 "Debian Live Project"
.SH NAME
\fBlb build\fP \- Complete the bootstrap, chroot, binary, and source stages
diff --git a/manpages/de/lb_chroot.de.1 b/manpages/de/lb_chroot.de.1
index ab93ec1..b70289d 100644
--- a/manpages/de/lb_chroot.de.1
+++ b/manpages/de/lb_chroot.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57\-1 "Debian Live Project"
.SH NAME
\fBlb chroot\fP \- Complete the chroot stage
diff --git a/manpages/de/lb_clean.de.1 b/manpages/de/lb_clean.de.1
index b4cb826..1960bd3 100644
--- a/manpages/de/lb_clean.de.1
+++ b/manpages/de/lb_clean.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57\-1 "Debian Live Project"
.SH NAME
\fBlb clean\fP \- Clean build directory
diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1
index 676bb10..b834507 100644
--- a/manpages/de/lb_config.de.1
+++ b/manpages/de/lb_config.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57\-1 "Debian Live Project"
.SH NAME
\fBlb config\fP \- Create config directory
@@ -489,10 +489,10 @@ defines which hooks available in /usr/share/live/build/examples/hooks should
be activated. Normally, there are no hooks executed. Make sure you know and
understood the hook before you enable it.
.IP \fB\-\-ignore\-system\-defaults\fP 4
-\fBlb config\fP by default reads system defaults from /etc/live/build.conf and
-/etc/live/build.d when generating a new live system config directory. This
-is useful if you want to set global settings, such as mirror locations, and
-don't want to specify them all of the time.
+\fBlb config\fP by default reads system defaults from \fI/etc/live/build.conf\fP
+and \fI/etc/live/build/*\fP when generating a new live system config
+directory. This is useful if you want to set global settings, such as mirror
+locations, and don't want to specify them all of the time.
.IP "\fB\-\-initramfs\fP auto|none|live\-boot|casper" 4
sets the name of package that contains the live system specific initramfs
modification. By default, auto is used, which means that at build time of
@@ -795,7 +795,7 @@ GZIP_OPTIONS, no LB_ prefix is used.
.SH FILES
.\" FIXME
.IP \fBauto/config\fP 4
-.IP "\fB/etc/live/build.conf, /etc/live/build.d\fP" 4
+.IP "\fB/etc/live/build.conf, /etc/live/build/*\fP" 4
.\" FIXME
An optional, global configuration file for \fBlb config\fP variables. It is
useful to specify a few system wide defaults, like
diff --git a/manpages/de/lb_source.de.1 b/manpages/de/lb_source.de.1
index 5413dc3..fded185 100644
--- a/manpages/de/lb_source.de.1
+++ b/manpages/de/lb_source.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57\-1 "Debian Live Project"
.SH NAME
\fBlb source\fP \- Complete the source stage
diff --git a/manpages/de/lb_testroot.de.1 b/manpages/de/lb_testroot.de.1
index 3101ce7..5a094e4 100644
--- a/manpages/de/lb_testroot.de.1
+++ b/manpages/de/lb_testroot.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57\-1 "Debian Live Project"
.SH NAME
\fBlb testroot\fP \- Ensure that a system is built as root
diff --git a/manpages/de/live-build.de.7 b/manpages/de/live-build.de.7
index 99e6c2a..555766c 100644
--- a/manpages/de/live-build.de.7
+++ b/manpages/de/live-build.de.7
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BUILD 7 2012\-08\-10 3.0~a57\-1 "Debian Live Project"
+.TH LIVE\-BUILD 7 2012\-08\-14 3.0~a57\-1 "Debian Live Project"
.SH NAME
\fBlive\-build\fP \- the Debian Live tool suite
@@ -271,7 +271,7 @@ also put comments in these files; lines beginning with "#" are ignored.
.SH FILES
.IP \fB/etc/live/build.conf\fP 4
-.IP \fB/etc/live/build.d/\fP 4
+.IP \fB/etc/live/build/*\fP 4
.SH "SEE ALSO"
\fIlive\-boot\fP(7)
diff --git a/manpages/en/lb.1 b/manpages/en/lb.1
index f7afdf6..b39e38f 100644
--- a/manpages/en/lb.1
+++ b/manpages/en/lb.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project"
.SH NAME
\fBlb\fR \- wrapper for live\-build programs
diff --git a/manpages/en/lb_binary.1 b/manpages/en/lb_binary.1
index 623c371..dfdef32 100644
--- a/manpages/en/lb_binary.1
+++ b/manpages/en/lb_binary.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project"
.SH NAME
\fBlb binary\fR \- Complete the binary stage
diff --git a/manpages/en/lb_bootstrap.1 b/manpages/en/lb_bootstrap.1
index 475a7d9..2b2d0b4 100644
--- a/manpages/en/lb_bootstrap.1
+++ b/manpages/en/lb_bootstrap.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project"
.SH NAME
\fBlb bootstrap\fR \- Complete the bootstrap stage
diff --git a/manpages/en/lb_build.1 b/manpages/en/lb_build.1
index 63f6404..5e3cc5f 100644
--- a/manpages/en/lb_build.1
+++ b/manpages/en/lb_build.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project"
.SH NAME
\fBlb build\fR \- Complete the bootstrap, chroot, binary, and source stages
diff --git a/manpages/en/lb_chroot.1 b/manpages/en/lb_chroot.1
index 652d264..03a958e 100644
--- a/manpages/en/lb_chroot.1
+++ b/manpages/en/lb_chroot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project"
.SH NAME
\fBlb chroot\fR \- Complete the chroot stage
diff --git a/manpages/en/lb_clean.1 b/manpages/en/lb_clean.1
index da805ed..2795db5 100644
--- a/manpages/en/lb_clean.1
+++ b/manpages/en/lb_clean.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project"
.SH NAME
\fBlb clean\fR \- Clean build directory
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index aeb466a..9c1dfcf 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project"
.SH NAME
\fBlb config\fR \- Create config directory
@@ -348,7 +348,7 @@ defines the default options that will be appended to (almost) every gzip call du
.IP "\fB\-\-hooks\fR \fIFILE\fR" 4
defines which hooks available in /usr/share/live/build/examples/hooks should be activated. Normally, there are no hooks executed. Make sure you know and understood the hook before you enable it.
.IP "\fB\-\-ignore\-system\-defaults\fR" 4
-\fBlb config\fR by default reads system defaults from /etc/live/build.conf and /etc/live/build.d when generating a new live system config directory. This is useful if you want to set global settings, such as mirror locations, and don't want to specify them all of the time.
+\fBlb config\fR by default reads system defaults from \fI/etc/live/build.conf\fR and \fI/etc/live/build/*\fR when generating a new live system config directory. This is useful if you want to set global settings, such as mirror locations, and don't want to specify them all of the time.
.IP "\fB\-\-initramfs\fR auto|none|live\-boot|casper" 4
sets the name of package that contains the live system specific initramfs modification. By default, auto is used, which means that at build time of the image rather than on configuration time, the value will be expanded to casper when building ubuntu systems, to live\-boot for all other systems. Using 'none' is useful if the resulting system image should not be a live image (experimental).
.IP "\fB\-\-initramfs\-compression\fR bzip2|gzip|lzma]
@@ -502,7 +502,7 @@ Currently, command line switches can also be specified through the corresponding
.SH FILES
.\" FIXME
.IP "\fBauto/config\fR" 4
-.IP "\fB/etc/live/build.conf, /etc/live/build.d\fR" 4
+.IP "\fB/etc/live/build.conf, /etc/live/build/*\fR" 4
An optional, global configuration file for \fBlb config\fR variables. It is useful to specify a few system wide defaults, like LB_PARENT_MIRROR_BOOTSTRAP. This feature can be false by specifying the \fB\-\-ignore\-system\-defaults\fR option.
.\" FIXME
diff --git a/manpages/en/lb_source.1 b/manpages/en/lb_source.1
index 39df638..a0ccfdd 100644
--- a/manpages/en/lb_source.1
+++ b/manpages/en/lb_source.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project"
.SH NAME
\fBlb source\fR \- Complete the source stage
diff --git a/manpages/en/lb_testroot.1 b/manpages/en/lb_testroot.1
index 160cf87..89f5568 100644
--- a/manpages/en/lb_testroot.1
+++ b/manpages/en/lb_testroot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-08\-14 3.0~a57-1 "Debian Live Project"
.SH NAME
\fBlb testroot\fR \- Ensure that a system is built as root
diff --git a/manpages/en/live-build.7 b/manpages/en/live-build.7
index 54795e3..1d1214c 100644
--- a/manpages/en/live-build.7
+++ b/manpages/en/live-build.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 7 2012\-08\-10 3.0~a57-1 "Debian Live Project"
+.TH LIVE\-BUILD 7 2012\-08\-14 3.0~a57-1 "Debian Live Project"
.SH NAME
\fBlive\-build\fR \- the Debian Live tool suite
@@ -224,7 +224,7 @@ All config files are shell scripts which are sourced by a live\-build program. T
.SH FILES
.IP "\fB/etc/live/build.conf\fR" 4
-.IP "\fB/etc/live/build.d/\fR" 4
+.IP "\fB/etc/live/build/*\fR" 4
.SH SEE ALSO
\fIlive\-boot\fR(7)
diff --git a/manpages/po/de/lb.1.po b/manpages/po/de/lb.1.po
index 7bc7f87..c5857e0 100644
--- a/manpages/po/de/lb.1.po
+++ b/manpages/po/de/lb.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
msgstr ""
#. type: TH
diff --git a/manpages/po/de/lb_binary.1.po b/manpages/po/de/lb_binary.1.po
index dc4df5a..45e0a59 100644
--- a/manpages/po/de/lb_binary.1.po
+++ b/manpages/po/de/lb_binary.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
msgstr ""
#. type: TH
diff --git a/manpages/po/de/lb_bootstrap.1.po b/manpages/po/de/lb_bootstrap.1.po
index 970155b..0996bf3 100644
--- a/manpages/po/de/lb_bootstrap.1.po
+++ b/manpages/po/de/lb_bootstrap.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
msgstr ""
#. type: TH
diff --git a/manpages/po/de/lb_build.1.po b/manpages/po/de/lb_build.1.po
index cbbd06b..8b8967a 100644
--- a/manpages/po/de/lb_build.1.po
+++ b/manpages/po/de/lb_build.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
msgstr ""
#. type: TH
diff --git a/manpages/po/de/lb_chroot.1.po b/manpages/po/de/lb_chroot.1.po
index 76e0f63..bfabe2e 100644
--- a/manpages/po/de/lb_chroot.1.po
+++ b/manpages/po/de/lb_chroot.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
msgstr ""
#. type: TH
diff --git a/manpages/po/de/lb_clean.1.po b/manpages/po/de/lb_clean.1.po
index 6f21617..6b0e2b2 100644
--- a/manpages/po/de/lb_clean.1.po
+++ b/manpages/po/de/lb_clean.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
msgstr ""
#. type: TH
diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po
index a776fd8..4261de1 100644
--- a/manpages/po/de/lb_config.1.po
+++ b/manpages/po/de/lb_config.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
msgstr ""
#. type: TH
@@ -1488,10 +1488,10 @@ msgstr ""
#. type: Plain text
#: en/lb_config.1:352
msgid ""
-"B<lb config> by default reads system defaults from /etc/live/build.conf and /"
-"etc/live/build.d when generating a new live system config directory. This is "
-"useful if you want to set global settings, such as mirror locations, and "
-"don't want to specify them all of the time."
+"B<lb config> by default reads system defaults from I</etc/live/build.conf> "
+"and I</etc/live/build/*> when generating a new live system config directory. "
+"This is useful if you want to set global settings, such as mirror locations, "
+"and don't want to specify them all of the time."
msgstr ""
#. type: IP
@@ -2489,7 +2489,7 @@ msgstr ""
#. type: IP
#: en/lb_config.1:505
#, no-wrap
-msgid "B</etc/live/build.conf, /etc/live/build.d>"
+msgid "B</etc/live/build.conf, /etc/live/build/*>"
msgstr ""
#. FIXME
diff --git a/manpages/po/de/lb_source.1.po b/manpages/po/de/lb_source.1.po
index f1948ed..528d822 100644
--- a/manpages/po/de/lb_source.1.po
+++ b/manpages/po/de/lb_source.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
msgstr ""
#. type: TH
diff --git a/manpages/po/de/lb_testroot.1.po b/manpages/po/de/lb_testroot.1.po
index 0b458e9..13554b4 100644
--- a/manpages/po/de/lb_testroot.1.po
+++ b/manpages/po/de/lb_testroot.1.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
msgstr ""
#. type: TH
diff --git a/manpages/po/de/live-build.7.po b/manpages/po/de/live-build.7.po
index bd3496a..b3c9eec 100644
--- a/manpages/po/de/live-build.7.po
+++ b/manpages/po/de/live-build.7.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
msgstr ""
#. type: TH
@@ -1269,5 +1269,5 @@ msgstr ""
#. type: IP
#: en/live-build.7:227
#, no-wrap
-msgid "B</etc/live/build.d/>"
+msgid "B</etc/live/build/*>"
msgstr ""
diff --git a/manpages/pot/lb.1.pot b/manpages/pot/lb.1.pot
index ea8b9a3..f911ebc 100644
--- a/manpages/pot/lb.1.pot
+++ b/manpages/pot/lb.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\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"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_binary.1.pot b/manpages/pot/lb_binary.1.pot
index 380c65f..4895239 100644
--- a/manpages/pot/lb_binary.1.pot
+++ b/manpages/pot/lb_binary.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\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"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_bootstrap.1.pot b/manpages/pot/lb_bootstrap.1.pot
index 39bb528..edb81e7 100644
--- a/manpages/pot/lb_bootstrap.1.pot
+++ b/manpages/pot/lb_bootstrap.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\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"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_build.1.pot b/manpages/pot/lb_build.1.pot
index c94055f..55f32c9 100644
--- a/manpages/pot/lb_build.1.pot
+++ b/manpages/pot/lb_build.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\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"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_chroot.1.pot b/manpages/pot/lb_chroot.1.pot
index e357e08..e432d83 100644
--- a/manpages/pot/lb_chroot.1.pot
+++ b/manpages/pot/lb_chroot.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\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"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_clean.1.pot b/manpages/pot/lb_clean.1.pot
index 1754746..73330ed 100644
--- a/manpages/pot/lb_clean.1.pot
+++ b/manpages/pot/lb_clean.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\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"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot
index 59499a3..84aa98b 100644
--- a/manpages/pot/lb_config.1.pot
+++ b/manpages/pot/lb_config.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\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"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
msgstr ""
#. type: TH
@@ -1488,10 +1488,10 @@ msgstr ""
#. type: Plain text
#: en/lb_config.1:352
msgid ""
-"B<lb config> by default reads system defaults from /etc/live/build.conf and /"
-"etc/live/build.d when generating a new live system config directory. This is "
-"useful if you want to set global settings, such as mirror locations, and "
-"don't want to specify them all of the time."
+"B<lb config> by default reads system defaults from I</etc/live/build.conf> "
+"and I</etc/live/build/*> when generating a new live system config directory. "
+"This is useful if you want to set global settings, such as mirror locations, "
+"and don't want to specify them all of the time."
msgstr ""
#. type: IP
@@ -2489,7 +2489,7 @@ msgstr ""
#. type: IP
#: en/lb_config.1:505
#, no-wrap
-msgid "B</etc/live/build.conf, /etc/live/build.d>"
+msgid "B</etc/live/build.conf, /etc/live/build/*>"
msgstr ""
#. FIXME
diff --git a/manpages/pot/lb_source.1.pot b/manpages/pot/lb_source.1.pot
index 105fcf1..485c74b 100644
--- a/manpages/pot/lb_source.1.pot
+++ b/manpages/pot/lb_source.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\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"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_testroot.1.pot b/manpages/pot/lb_testroot.1.pot
index eeb2709..d831b96 100644
--- a/manpages/pot/lb_testroot.1.pot
+++ b/manpages/pot/lb_testroot.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\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"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
msgstr ""
#. type: TH
diff --git a/manpages/pot/live-build.7.pot b/manpages/pot/live-build.7.pot
index 5a096d1..751bef3 100644
--- a/manpages/pot/live-build.7.pot
+++ b/manpages/pot/live-build.7.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-08-10 22:42+0300\n"
+"POT-Creation-Date: 2012-08-14 21:05+0300\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"
@@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
-msgid "2012-08-10"
+msgid "2012-08-14"
msgstr ""
#. type: TH
@@ -1269,5 +1269,5 @@ msgstr ""
#. type: IP
#: en/live-build.7:227
#, no-wrap
-msgid "B</etc/live/build.d/>"
+msgid "B</etc/live/build/*>"
msgstr ""
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index cd57d4f..13a81c6 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -916,7 +916,7 @@ if ! In_list "--ignore-system-defaults" "${@}"
then
Echo_message "Considering defaults defined in %s" "/etc/live/build.conf"
- Read_conffiles /etc/live/build.conf /etc/live/build.d/*
+ Read_conffiles /etc/live/build.conf /etc/live/build/*
fi
# Reading existing configuration
--
live-build
More information about the debian-live-changes
mailing list