diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2014-12-10 08:24:49 +0100 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2014-12-10 08:24:49 +0100 |
| commit | a767601f25c43986250746b3e14b9cc24e35c230 (patch) | |
| tree | a75a0b3f42385c64d1555b750f7a17b367f13b83 | |
| parent | 8233dd2c4f8ed20222522f31e6fc45719a5c835d (diff) | |
| download | vyos-live-build-a767601f25c43986250746b3e14b9cc24e35c230.tar.gz vyos-live-build-a767601f25c43986250746b3e14b9cc24e35c230.zip | |
Releasing debian version 4.0.4-1.debian/4.0.4-1
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
38 files changed, 140 insertions, 89 deletions
@@ -1 +1 @@ -4.0.3-1 +4.0.4-1 diff --git a/debian/changelog b/debian/changelog index 8c1bc62bc..bd9c919c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,51 @@ +live-build (4.0.4-1) unstable; urgency=low + + [ Daniel Baumann ] + * Applying patch from Gabriele Gristina <gabriele.gristina@gmail.com> to + fix automated checks for using aptitude. + * Adding hook to enable cryptsetup (Closes: #767195). + * Dropping prism2-usb-firmware-installer which fetches firmware from (at + least) temporarily broken website. + + [ Raphaël Hertzog ] + * Update linux flavours for armhf/armel. + * Properly support empty package lists. + * binary_syslinux: correct the path used to check if the bootloader is + available. + + [ Daniel Baumann ] + * Cleaning up from python removal (LIVE_IMAGE_ARCHITECTURE). + * Cleaning up from python removal (LIVE_IMAGE_ARCHIVE_AREAS). + * Avoid failing to autocreate live.list.chroot in lb config when using + --clean, thanks to jnqnfe <jnqnfe@gmail.com> (Closes: #770637). + + [ jnqnfe ] + * Fix broken calls to Get_conffiles() from Read_conffiles() and + Print_conffiles() (Closes: #770645). + * Fix chroot_package-lists script saving to wrong cache (Closes: + #771002). + * Fix missing grub2 option in bootloader selection (Closes: #772671). + + [ Daniel Baumann ] + * Correcting stage name check in chroot_includes, thanks to jnqnfe + <jnqnfe@gmail.com> (Closes: #771377). + * Correcting typo in apt.conf.d directory name, thanks to jnqnfe + <jnqnfe@gmail.com> (Closes: #771392). + + [ jnqnfe ] + * Fix typo in variable name (LH_LINUX_FLAVOURS instead of + LB_LINUX_FLAVOURS) in installer_debian-installer script, affecting the + armel architecture (Closes: #770796). + + [ Daniel Baumann ] + * Somewhat fixing sysvinit and casper legacy support, slightly improved + patch from Rui Miguel P. Bernardo <rui.bernardo.pt@gmail.com> (Closes: + #772522, #772651). + * Ugly hack to force dbus inclusion when using live-config-systemd + (Closes: #769635). + + -- Daniel Baumann <mail@daniel-baumann.ch> Wed, 10 Dec 2014 08:23:55 +0100 + live-build (4.0.3-1) unstable; urgency=low [ Richard Nelson ] diff --git a/manpages/en/lb.1 b/manpages/en/lb.1 index 94fdc2590..bd43e2d0b 100644 --- a/manpages/en/lb.1 +++ b/manpages/en/lb.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3-1 "Live Systems Project" +.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems 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 70669f4b8..7197bd8f7 100644 --- a/manpages/en/lb_binary.1 +++ b/manpages/en/lb_binary.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3-1 "Live Systems Project" +.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems 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 9d41a4d50..b47d801e3 100644 --- a/manpages/en/lb_bootstrap.1 +++ b/manpages/en/lb_bootstrap.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3-1 "Live Systems Project" +.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems 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 f30113ecb..842117b6b 100644 --- a/manpages/en/lb_build.1 +++ b/manpages/en/lb_build.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3-1 "Live Systems Project" +.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems 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 ea6c27898..ba049ba66 100644 --- a/manpages/en/lb_chroot.1 +++ b/manpages/en/lb_chroot.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3-1 "Live Systems Project" +.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems 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 01b0a3365..ccf7ade49 100644 --- a/manpages/en/lb_clean.1 +++ b/manpages/en/lb_clean.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3-1 "Live Systems Project" +.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems Project" .SH NAME \fBlb clean\fR \- Clean build directory diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1 index b8916cb94..b612f8779 100644 --- a/manpages/en/lb_config.1 +++ b/manpages/en/lb_config.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3-1 "Live Systems Project" +.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems Project" .SH NAME \fBlb config\fR \- Create config directory diff --git a/manpages/en/lb_source.1 b/manpages/en/lb_source.1 index 100b27862..6137ec51a 100644 --- a/manpages/en/lb_source.1 +++ b/manpages/en/lb_source.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3-1 "Live Systems Project" +.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems Project" .SH NAME \fBlb source\fR \- Complete the source stage diff --git a/manpages/en/live-build.7 b/manpages/en/live-build.7 index 4db19b4cf..fec586975 100644 --- a/manpages/en/live-build.7 +++ b/manpages/en/live-build.7 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 7 2014\-10\-25 4.0.3-1 "Live Systems Project" +.TH LIVE\-BUILD 7 2014\-12\-10 4.0.4-1 "Live Systems Project" .SH NAME \fBlive\-build\fR \- the live systems tool suite diff --git a/manpages/ja/lb.ja.1 b/manpages/ja/lb.ja.1 index f680669a0..eadd263e0 100644 --- a/manpages/ja/lb.ja.1 +++ b/manpages/ja/lb.ja.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト" .SH 名前 \fBlb\fP \- live\-build プログラムのラッパー diff --git a/manpages/ja/lb_binary.ja.1 b/manpages/ja/lb_binary.ja.1 index 04bb604b4..470245512 100644 --- a/manpages/ja/lb_binary.ja.1 +++ b/manpages/ja/lb_binary.ja.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト" .SH 名前 \fBlb binary\fP \- バイナリ段階を完了させます diff --git a/manpages/ja/lb_bootstrap.ja.1 b/manpages/ja/lb_bootstrap.ja.1 index 89b624eca..9aaeb1b0c 100644 --- a/manpages/ja/lb_bootstrap.ja.1 +++ b/manpages/ja/lb_bootstrap.ja.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト" .SH 名前 \fBlb bootstrap\fP \- パッケージ収集段階を完了させます diff --git a/manpages/ja/lb_build.ja.1 b/manpages/ja/lb_build.ja.1 index f5b0f8e1e..c0ed7bd2f 100644 --- a/manpages/ja/lb_build.ja.1 +++ b/manpages/ja/lb_build.ja.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト" .SH 名前 \fBlb build\fP \- パッケージ収集、chroot、バイナリ、ソース段階を完了させます diff --git a/manpages/ja/lb_chroot.ja.1 b/manpages/ja/lb_chroot.ja.1 index d4afca2c2..e4f6fe315 100644 --- a/manpages/ja/lb_chroot.ja.1 +++ b/manpages/ja/lb_chroot.ja.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト" .SH 名前 \fBlb chroot\fP \- chroot 段階を完了させます diff --git a/manpages/ja/lb_clean.ja.1 b/manpages/ja/lb_clean.ja.1 index e144d0c76..bb0a06de2 100644 --- a/manpages/ja/lb_clean.ja.1 +++ b/manpages/ja/lb_clean.ja.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト" .SH 名前 \fBlb clean\fP \- 設定ディレクトリを掃除します diff --git a/manpages/ja/lb_config.ja.1 b/manpages/ja/lb_config.ja.1 index b741d797f..70e5eebe2 100644 --- a/manpages/ja/lb_config.ja.1 +++ b/manpages/ja/lb_config.ja.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト" .SH 名前 \fBlb config\fP \- 設定ディレクトリを作成します @@ -44,7 +44,7 @@ .br [\fB\-\-bootappend\-live\fP \fIパラメータ\fP|\fI"パラメータ"\fP] .br - [\fB\-\-bootloader\fP grub|syslinux] + [\fB\-\-bootloader\fP grub|grub2|syslinux] .br [\fB\-\-bootstrap\fP cdebootstrap|cdebootstrap\-static|debootstrap] .br @@ -297,7 +297,7 @@ debian\-installer を収録した場合、debian\-installer 特有のブート .IP "\fB\-\-bootappend\-live\fP \fIパラメータ\fP|\(dq\fIパラメータ\fP\(dq" 4 debian\-live 特有のブートパラメータをセットします。ブートパラメータの全容は \fIlive\-boot\fP(7) 及び \fIlive\-config\fP(7) マニュアルページにあります。 -.IP "\fB\-\-bootloader\fP grub|syslinux" 4 +.IP "\fB\-\-bootloader\fP grub|grub2|syslinux" 4 生成されたイメージで利用するブートローダを選択します。これは選択した種類のバイナリイメージでブートローダを選択できる場合にのみ効果があります。例えば iso をビルドする場合は常に syslinux (さらに言えば isolinux) が利用されます。また、バイナリイメージの種類とブートローダの組み合わせの中には、可能ではあるものの live\-build diff --git a/manpages/ja/lb_source.ja.1 b/manpages/ja/lb_source.ja.1 index a6e969cf9..843452b93 100644 --- a/manpages/ja/lb_source.ja.1 +++ b/manpages/ja/lb_source.ja.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト" .SH 名前 \fBlb source\fP \- ソース段階を完了させます diff --git a/manpages/ja/live-build.ja.7 b/manpages/ja/live-build.ja.7 index 220b42f69..3d65b90d1 100644 --- a/manpages/ja/live-build.ja.7 +++ b/manpages/ja/live-build.ja.7 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 7 2014\-10\-25 4.0.3\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 7 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト" .SH 名前 \fBlive\-build\fP \- Live システムツール集 diff --git a/manpages/po/ja/lb.1.po b/manpages/po/ja/lb.1.po index 5c34cd750..1763e25b8 100644 --- a/manpages/po/ja/lb.1.po +++ b/manpages/po/ja/lb.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory <victory.deb@gmail.com>\n" "Language-Team: none\n" @@ -27,7 +27,7 @@ msgstr "LIVE-BUILD" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "2014-10-25" +msgid "2014-12-10" msgstr "" #. type: TH @@ -35,7 +35,7 @@ msgstr "" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "4.0.3-1" +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/po/ja/lb_binary.1.po b/manpages/po/ja/lb_binary.1.po index 4cc4bcaeb..28a87dbd5 100644 --- a/manpages/po/ja/lb_binary.1.po +++ b/manpages/po/ja/lb_binary.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory <victory.deb@gmail.com>\n" "Language-Team: none\n" @@ -27,7 +27,7 @@ msgstr "LIVE-BUILD" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "2014-10-25" +msgid "2014-12-10" msgstr "" #. type: TH @@ -35,7 +35,7 @@ msgstr "" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "4.0.3-1" +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/po/ja/lb_bootstrap.1.po b/manpages/po/ja/lb_bootstrap.1.po index b1a3d7a15..02103b964 100644 --- a/manpages/po/ja/lb_bootstrap.1.po +++ b/manpages/po/ja/lb_bootstrap.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: 2014-08-29 06:25+0900\n" "Last-Translator: victory <victory.deb@gmail.com>\n" "Language-Team: none\n" @@ -27,7 +27,7 @@ msgstr "LIVE-BUILD" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "2014-10-25" +msgid "2014-12-10" msgstr "" #. type: TH @@ -35,7 +35,7 @@ msgstr "" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "4.0.3-1" +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/po/ja/lb_build.1.po b/manpages/po/ja/lb_build.1.po index 114c3352f..06faa09f3 100644 --- a/manpages/po/ja/lb_build.1.po +++ b/manpages/po/ja/lb_build.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory <victory.deb@gmail.com>\n" "Language-Team: none\n" @@ -27,7 +27,7 @@ msgstr "LIVE-BUILD" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "2014-10-25" +msgid "2014-12-10" msgstr "" #. type: TH @@ -35,7 +35,7 @@ msgstr "" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "4.0.3-1" +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/po/ja/lb_chroot.1.po b/manpages/po/ja/lb_chroot.1.po index c356c85f3..0471d17b4 100644 --- a/manpages/po/ja/lb_chroot.1.po +++ b/manpages/po/ja/lb_chroot.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory <victory.deb@gmail.com>\n" "Language-Team: none\n" @@ -27,7 +27,7 @@ msgstr "LIVE-BUILD" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "2014-10-25" +msgid "2014-12-10" msgstr "" #. type: TH @@ -35,7 +35,7 @@ msgstr "" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "4.0.3-1" +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/po/ja/lb_clean.1.po b/manpages/po/ja/lb_clean.1.po index 41fd5b27c..e2e63e7b4 100644 --- a/manpages/po/ja/lb_clean.1.po +++ b/manpages/po/ja/lb_clean.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory <victory.deb@gmail.com>\n" "Language-Team: none\n" @@ -27,7 +27,7 @@ msgstr "LIVE-BUILD" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "2014-10-25" +msgid "2014-12-10" msgstr "" #. type: TH @@ -35,7 +35,7 @@ msgstr "" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "4.0.3-1" +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/po/ja/lb_config.1.po b/manpages/po/ja/lb_config.1.po index 485858b80..575001e92 100644 --- a/manpages/po/ja/lb_config.1.po +++ b/manpages/po/ja/lb_config.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: 2014-09-07 13:13+0900\n" "Last-Translator: victory <victory.deb@gmail.com>\n" "Language-Team: none\n" @@ -27,7 +27,7 @@ msgstr "LIVE-BUILD" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "2014-10-25" +msgid "2014-12-10" msgstr "" #. type: TH @@ -35,7 +35,7 @@ msgstr "" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "4.0.3-1" +msgid "4.0.4-1" msgstr "" #. type: TH @@ -262,7 +262,9 @@ msgstr " [B<--bootappend-live> I<パラメータ>|I<\"パラメータ\">]" #. type: Plain text #: en/lb_config.1:43 -msgid " [B<--bootloader> grub|syslinux]" +#, fuzzy +#| msgid " [B<--bootloader> grub|syslinux]" +msgid " [B<--bootloader> grub|grub2|syslinux]" msgstr " [B<--bootloader> grub|syslinux]" #. type: Plain text @@ -1048,8 +1050,9 @@ msgstr "" #. type: IP #: en/lb_config.1:268 -#, no-wrap -msgid "B<--bootloader> grub|syslinux" +#, fuzzy, no-wrap +#| msgid "B<--bootloader> grub|syslinux" +msgid "B<--bootloader> grub|grub2|syslinux" msgstr "B<--bootloader> grub|syslinux" #. type: Plain text diff --git a/manpages/po/ja/lb_source.1.po b/manpages/po/ja/lb_source.1.po index 0f3b4d931..22e56944f 100644 --- a/manpages/po/ja/lb_source.1.po +++ b/manpages/po/ja/lb_source.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory <victory.deb@gmail.com>\n" "Language-Team: none\n" @@ -27,7 +27,7 @@ msgstr "LIVE-BUILD" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "2014-10-25" +msgid "2014-12-10" msgstr "" #. type: TH @@ -35,7 +35,7 @@ msgstr "" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "4.0.3-1" +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/po/ja/live-build.7.po b/manpages/po/ja/live-build.7.po index 6161fa748..d39befbd3 100644 --- a/manpages/po/ja/live-build.7.po +++ b/manpages/po/ja/live-build.7.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory <victory.deb@gmail.com>\n" "Language-Team: none\n" @@ -27,7 +27,7 @@ msgstr "LIVE-BUILD" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "2014-10-25" +msgid "2014-12-10" msgstr "" #. type: TH @@ -35,7 +35,7 @@ msgstr "" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "4.0.3-1" +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/pot/lb.1.pot b/manpages/pot/lb.1.pot index 01caf0ac7..eab6c1a0b 100644 --- a/manpages/pot/lb.1.pot +++ b/manpages/pot/lb.1.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: live-build 4.0.3-1\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"Project-Id-Version: live-build 4.0.4-1\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@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/live-build.7:1 #, no-wrap -msgid "2014-10-25" +msgid "2014-12-10" msgstr "" #. type: TH @@ -37,7 +37,7 @@ msgstr "" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "4.0.3-1" +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/pot/lb_binary.1.pot b/manpages/pot/lb_binary.1.pot index 0250b9bda..6307d4acf 100644 --- a/manpages/pot/lb_binary.1.pot +++ b/manpages/pot/lb_binary.1.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: live-build 4.0.3-1\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"Project-Id-Version: live-build 4.0.4-1\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@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/live-build.7:1 #, no-wrap -msgid "2014-10-25" +msgid "2014-12-10" msgstr "" #. type: TH @@ -37,7 +37,7 @@ msgstr "" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "4.0.3-1" +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/pot/lb_bootstrap.1.pot b/manpages/pot/lb_bootstrap.1.pot index 45ff39f86..09212462b 100644 --- a/manpages/pot/lb_bootstrap.1.pot +++ b/manpages/pot/lb_bootstrap.1.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: live-build 4.0.3-1\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"Project-Id-Version: live-build 4.0.4-1\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@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/live-build.7:1 #, no-wrap -msgid "2014-10-25" +msgid "2014-12-10" msgstr "" #. type: TH @@ -37,7 +37,7 @@ msgstr "" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "4.0.3-1" +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/pot/lb_build.1.pot b/manpages/pot/lb_build.1.pot index 616312282..7e71ed1fc 100644 --- a/manpages/pot/lb_build.1.pot +++ b/manpages/pot/lb_build.1.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: live-build 4.0.3-1\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"Project-Id-Version: live-build 4.0.4-1\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@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/live-build.7:1 #, no-wrap -msgid "2014-10-25" +msgid "2014-12-10" msgstr "" #. type: TH @@ -37,7 +37,7 @@ msgstr "" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "4.0.3-1" +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/pot/lb_chroot.1.pot b/manpages/pot/lb_chroot.1.pot index 0bca67b78..2ff4665eb 100644 --- a/manpages/pot/lb_chroot.1.pot +++ b/manpages/pot/lb_chroot.1.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: live-build 4.0.3-1\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"Project-Id-Version: live-build 4.0.4-1\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@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/live-build.7:1 #, no-wrap -msgid "2014-10-25" +msgid "2014-12-10" msgstr "" #. type: TH @@ -37,7 +37,7 @@ msgstr "" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "4.0.3-1" +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/pot/lb_clean.1.pot b/manpages/pot/lb_clean.1.pot index cea254e25..5c3e10af0 100644 --- a/manpages/pot/lb_clean.1.pot +++ b/manpages/pot/lb_clean.1.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: live-build 4.0.3-1\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"Project-Id-Version: live-build 4.0.4-1\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@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/live-build.7:1 #, no-wrap -msgid "2014-10-25" +msgid "2014-12-10" msgstr "" #. type: TH @@ -37,7 +37,7 @@ msgstr "" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "4.0.3-1" +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot index 2a67ae2f7..68414dba9 100644 --- a/manpages/pot/lb_config.1.pot +++ b/manpages/pot/lb_config.1.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: live-build 4.0.3-1\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"Project-Id-Version: live-build 4.0.4-1\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@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/live-build.7:1 #, no-wrap -msgid "2014-10-25" +msgid "2014-12-10" msgstr "" #. type: TH @@ -37,7 +37,7 @@ msgstr "" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "4.0.3-1" +msgid "4.0.4-1" msgstr "" #. type: TH @@ -255,7 +255,7 @@ msgstr "" #. type: Plain text #: en/lb_config.1:43 -msgid " [B<--bootloader> grub|syslinux]" +msgid " [B<--bootloader> grub|grub2|syslinux]" msgstr "" #. type: Plain text @@ -970,7 +970,7 @@ msgstr "" #. type: IP #: en/lb_config.1:268 #, no-wrap -msgid "B<--bootloader> grub|syslinux" +msgid "B<--bootloader> grub|grub2|syslinux" msgstr "" #. type: Plain text diff --git a/manpages/pot/lb_source.1.pot b/manpages/pot/lb_source.1.pot index 87c346f45..e22eb85e7 100644 --- a/manpages/pot/lb_source.1.pot +++ b/manpages/pot/lb_source.1.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: live-build 4.0.3-1\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"Project-Id-Version: live-build 4.0.4-1\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@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/live-build.7:1 #, no-wrap -msgid "2014-10-25" +msgid "2014-12-10" msgstr "" #. type: TH @@ -37,7 +37,7 @@ msgstr "" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "4.0.3-1" +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/pot/live-build.7.pot b/manpages/pot/live-build.7.pot index efbb2d632..bc9a1a5bc 100644 --- a/manpages/pot/live-build.7.pot +++ b/manpages/pot/live-build.7.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: live-build 4.0.3-1\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"Project-Id-Version: live-build 4.0.4-1\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@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/live-build.7:1 #, no-wrap -msgid "2014-10-25" +msgid "2014-12-10" msgstr "" #. type: TH @@ -37,7 +37,7 @@ msgstr "" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "4.0.3-1" +msgid "4.0.4-1" msgstr "" #. type: TH |