diff --git a/debian/changelog b/debian/changelog index 1a20220..544297f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +live-build (1:20170920) unstable; urgency=medium + + * Auto-update version strings in manual pages. + * Update default value of PREPARER to correct the embedded URL. + * Pass --partscan to losetup to clean up partition devices lingering + from former operations. Closes: #865586 + Thanks to Matthijs Kooijman for the patch. + * Fix multiple issues with LB_BUILD_WITH_CHROOT=false. Closes: #873513 + Thanks to Matthijs Kooijman for the patch. + * Fix size calculation when we use FAT filesystems that do not support + hardlinks. Closes: #873640 + Thanks to Matthijs Kooijman for the patch. + * Replace "kirkwood" and "orion5x" armel flavors with the new + "marvell" (as done by the linux source package since its version 4.4). + + -- Raphaël Hertzog Wed, 20 Sep 2017 10:01:42 +0200 + live-build (1:20170829) unstable; urgency=medium * Add .disk/mkisofs file recording the xorriso command line. Thanks diff --git a/debian/control b/debian/control index b808c12..bac030d 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,8 @@ Uploaders: Raphaël Hertzog Build-Depends: debhelper (>= 10), + po4a, + gettext, Standards-Version: 4.1.0 Homepage: https://debian-live.alioth.debian.org/live-build/ Vcs-Browser: https://anonscm.debian.org/cgit/debian-live/live-build.git diff --git a/debian/rules b/debian/rules index 92cbff2..6a51ecd 100755 --- a/debian/rules +++ b/debian/rules @@ -1,15 +1,14 @@ #!/usr/bin/make -f - -include /usr/share/dpkg/pkg-info.mk %: dh $@ override_dh_auto_install: + # Update manual pages first + $(MAKE) -C manpages update + $(MAKE) -C manpages build + dh_auto_install -- DESTDIR=debian/live-build - - # Update VERSION file - echo $(DEB_VERSION) >debian/live-build/usr/share/live/build/VERSION # Removing unused files rm -f debian/live-build/usr/share/doc/live-build/COPYING diff --git a/functions/defaults.sh b/functions/defaults.sh index dc60207..78ca358 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -413,7 +413,7 @@ armel) # armel will have special images: one rootfs image and many additional kernel images. # therefore we default to all available armel flavours - LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-kirkwood orion5x}" + LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-marvell}" ;; armhf) @@ -651,7 +651,7 @@ esac # Set iso preparer - LB_ISO_PREPARER="${LB_ISO_PREPARER:-live-build \$VERSION; https://debian-live.alioth.debian.org/devel/live-build}" + LB_ISO_PREPARER="${LB_ISO_PREPARER:-live-build \$VERSION; https://debian-live.alioth.debian.org/live-build}" # Set iso publisher case "${LB_MODE}" in diff --git a/functions/losetup.sh b/functions/losetup.sh index 0346ff6..9d9b46e 100755 --- a/functions/losetup.sh +++ b/functions/losetup.sh @@ -40,7 +40,7 @@ FILE="${2}" PARTITION="${3:-1}" - ${LB_LOSETUP} --read-only "${DEVICE}" "${FILE}" + ${LB_LOSETUP} --read-only --partscan "${DEVICE}" "${FILE}" FDISK_OUT="$(${LB_FDISK} -l -u ${DEVICE} 2>&1)" Lodetach "${DEVICE}" @@ -50,14 +50,14 @@ then Echo_message "Mounting %s with offset 0" "${DEVICE}" - ${LB_LOSETUP} "${DEVICE}" "${FILE}" + ${LB_LOSETUP} --partscan "${DEVICE}" "${FILE}" else SECTORS="$(echo "$FDISK_OUT" | sed -ne "s|^$LOOPDEVICE[ *]*\([0-9]*\).*|\1|p")" OFFSET="$(expr ${SECTORS} '*' 512)" Echo_message "Mounting %s with offset %s" "${DEVICE}" "${OFFSET}" - ${LB_LOSETUP} -o "${OFFSET}" "${DEVICE}" "${FILE}" + ${LB_LOSETUP} --partscan -o "${OFFSET}" "${DEVICE}" "${FILE}" fi } diff --git a/functions/packages.sh b/functions/packages.sh index c2f7cfa..7c3592d 100755 --- a/functions/packages.sh +++ b/functions/packages.sh @@ -16,16 +16,16 @@ Check_installed "${CHROOT}" "${FILE}" "${PACKAGE}" - case "${INSTALL_STATUS}" in - 1) + if [ "${INSTALL_STATUS}" -ne 0 ] + then + if [ "${LB_BUILD_WITH_CHROOT}" != "false" ] + then _LB_PACKAGES="${_LB_PACKAGES} ${PACKAGE}" - ;; - - 2) + else Echo_error "You need to install %s on your host system." "${PACKAGE}" exit 1 - ;; - esac + fi + fi } Install_package () diff --git a/manpages/en/lb.1 b/manpages/en/lb.1 index 847bcfe..e9654cf 100644 --- a/manpages/en/lb.1 +++ b/manpages/en/lb.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Live Systems Project" +.TH LIVE\-BUILD 1 2017\-08\-29 1:20170829 "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 ecc9381..6bd1c47 100644 --- a/manpages/en/lb_binary.1 +++ b/manpages/en/lb_binary.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Live Systems Project" +.TH LIVE\-BUILD 1 2017\-08\-29 1:20170829 "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 387f7a6..e479396 100644 --- a/manpages/en/lb_bootstrap.1 +++ b/manpages/en/lb_bootstrap.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Live Systems Project" +.TH LIVE\-BUILD 1 2017\-08\-29 1:20170829 "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 5bf9847..489aa4e 100644 --- a/manpages/en/lb_build.1 +++ b/manpages/en/lb_build.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Live Systems Project" +.TH LIVE\-BUILD 1 2017\-08\-29 1:20170829 "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 f35e934..5de917c 100644 --- a/manpages/en/lb_chroot.1 +++ b/manpages/en/lb_chroot.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Live Systems Project" +.TH LIVE\-BUILD 1 2017\-08\-29 1:20170829 "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 f5329bd..bc50c00 100644 --- a/manpages/en/lb_clean.1 +++ b/manpages/en/lb_clean.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Live Systems Project" +.TH LIVE\-BUILD 1 2017\-08\-29 1:20170829 "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 5110e96..750a6f2 100644 --- a/manpages/en/lb_config.1 +++ b/manpages/en/lb_config.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Live Systems Project" +.TH LIVE\-BUILD 1 2017\-08\-29 1:20170829 "Live Systems Project" .SH NAME \fBlb_config\fR \- Create config directory @@ -344,7 +344,7 @@ .IP "\fB\-\-iso\-application\fR \fINAME\fR" 4 sets the APPLICATION field in the header of a resulting CD/DVD image and defaults to "Debian Live" in debian mode, and "Ubuntu Live" in ubuntu mode. .IP "\fB\-\-iso\-preparer\fR \fINAME\fR" 4 -sets the PREPARER field in the header of a resulting CD/DVD image. By default this is set to "live\-build \fIVERSION\fR; http://packages.qa.debian.org/live\-build", where VERSION is expanded to the version of live\-build that was used to build the image. +sets the PREPARER field in the header of a resulting CD/DVD image. By default this is set to "live\-build \fIVERSION\fR; http://debian-live.alioth.debian.org/live\-build", where VERSION is expanded to the version of live\-build that was used to build the image. .IP "\fB\-\-iso\-publisher\fR \fINAME\fR" 4 sets the PUBLISHED field in the header of a resulting CD/DVD image. By default, this is set to 'Live Systems project; http:/live-systems.org/; debian\-live@lists.debian.org'. Remember to change this to the appropriate values at latest when you distributing custom and unofficial images. .IP "\fB\-\-iso\-volume\fR \fINAME\fR" 4 diff --git a/manpages/en/lb_installer.1 b/manpages/en/lb_installer.1 index c337147..dba91d0 100644 --- a/manpages/en/lb_installer.1 +++ b/manpages/en/lb_installer.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Live Systems Project" +.TH LIVE\-BUILD 1 2017\-08\-29 1:20170829 "Live Systems Project" .SH NAME \fBlb_installer\fR \- Complete the installer stage diff --git a/manpages/en/lb_source.1 b/manpages/en/lb_source.1 index c9327d4..d11a40e 100644 --- a/manpages/en/lb_source.1 +++ b/manpages/en/lb_source.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Live Systems Project" +.TH LIVE\-BUILD 1 2017\-08\-29 1:20170829 "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 fd49025..5ca06bc 100644 --- a/manpages/en/live-build.7 +++ b/manpages/en/live-build.7 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 7 2017\-08\-29 1:20170807kali1 "Live Systems Project" +.TH LIVE\-BUILD 7 2017\-08\-29 1:20170829 "Live Systems Project" .SH NAME \fBlive\-build\fR \- the live systems tool suite diff --git a/manpages/fr/lb.fr.1 b/manpages/fr/lb.fr.1 index 596793f..7a784d7 100644 --- a/manpages/fr/lb.fr.1 +++ b/manpages/fr/lb.fr.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 21.10.2015 5.0~a11\-1 "Projet Live Systems" +.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Projet Live Systems" .SH NOM \fBlb\fP \- emballage pour les programmes live\-build diff --git a/manpages/fr/lb_binary.fr.1 b/manpages/fr/lb_binary.fr.1 index 4d5f26e..7ce4c5b 100644 --- a/manpages/fr/lb_binary.fr.1 +++ b/manpages/fr/lb_binary.fr.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 21.10.2015 5.0~a11\-1 "Projet Live Systems" +.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Projet Live Systems" .SH NOM \fBlb_binary\fP \- Complete the binary stage diff --git a/manpages/fr/lb_bootstrap.fr.1 b/manpages/fr/lb_bootstrap.fr.1 index 6bd499d..f11d11b 100644 --- a/manpages/fr/lb_bootstrap.fr.1 +++ b/manpages/fr/lb_bootstrap.fr.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 21.10.2015 5.0~a11\-1 "Projet Live Systems" +.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Projet Live Systems" .SH NOM \fBlb_bootstrap\fP \- Complete the bootstrap stage diff --git a/manpages/fr/lb_build.fr.1 b/manpages/fr/lb_build.fr.1 index f43c918..be06eb3 100644 --- a/manpages/fr/lb_build.fr.1 +++ b/manpages/fr/lb_build.fr.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 21.10.2015 5.0~a11\-1 "Projet Live Systems" +.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Projet Live Systems" .SH NOM \fBlb_build\fP \- Complete the bootstrap, chroot, binary, and source stages diff --git a/manpages/fr/lb_chroot.fr.1 b/manpages/fr/lb_chroot.fr.1 index 09ace0d..a230e75 100644 --- a/manpages/fr/lb_chroot.fr.1 +++ b/manpages/fr/lb_chroot.fr.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 21.10.2015 5.0~a11\-1 "Projet Live Systems" +.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Projet Live Systems" .SH NOM \fBlb_chroot\fP \- Complete the chroot stage diff --git a/manpages/fr/lb_clean.fr.1 b/manpages/fr/lb_clean.fr.1 index f02e51c..98c0e13 100644 --- a/manpages/fr/lb_clean.fr.1 +++ b/manpages/fr/lb_clean.fr.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 21.10.2015 5.0~a11\-1 "Projet Live Systems" +.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Projet Live Systems" .SH NOM \fBlb_clean\fP \- Clean build directory diff --git a/manpages/fr/lb_config.fr.1 b/manpages/fr/lb_config.fr.1 index 8a0dfd5..fc7536e 100644 --- a/manpages/fr/lb_config.fr.1 +++ b/manpages/fr/lb_config.fr.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 21.10.2015 5.0~a11\-1 "Projet Live Systems" +.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Projet Live Systems" .SH NOM \fBlb_config\fP \- Create config directory @@ -517,8 +517,8 @@ .IP "\fB\-\-iso\-preparer\fP \fINAME\fP" 4 sets the PREPARER field in the header of a resulting CD/DVD image. By default this is set to "live\-build \fIVERSION\fP; -http://packages.qa.debian.org/live\-build", where VERSION is expanded to the -version of live\-build that was used to build the image. +http://debian\-live.alioth.debian.org/live\-build", where VERSION is expanded +to the version of live\-build that was used to build the image. .IP "\fB\-\-iso\-publisher\fP \fINAME\fP" 4 sets the PUBLISHED field in the header of a resulting CD/DVD image. By default, this is set to 'Live Systems project; http:/live\-systems.org/; diff --git a/manpages/fr/lb_source.fr.1 b/manpages/fr/lb_source.fr.1 index 9df8001..34bd74e 100644 --- a/manpages/fr/lb_source.fr.1 +++ b/manpages/fr/lb_source.fr.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 21.10.2015 5.0~a11\-1 "Projet Live Systems" +.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Projet Live Systems" .SH NOM \fBlb_source\fP \- Complete the source stage diff --git a/manpages/fr/live-build.fr.7 b/manpages/fr/live-build.fr.7 index 8331564..077b2db 100644 --- a/manpages/fr/live-build.fr.7 +++ b/manpages/fr/live-build.fr.7 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 7 21.10.2015 5.0~a11\-1 "Projet Live Systems" +.TH LIVE\-BUILD 7 2017\-08\-29 1:20170807kali1 "Projet Live Systems" .SH NOM \fBlive\-build\fP \- la suite d'outils live systems diff --git a/manpages/ja/lb.ja.1 b/manpages/ja/lb.ja.1 index 7c83d89..a7aa65f 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 2015\-10\-21 5.0~a11\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Live システムプロジェクト" .SH 名前 \fBlb\fP \- live\-build プログラムのラッパー diff --git a/manpages/ja/lb_binary.ja.1 b/manpages/ja/lb_binary.ja.1 index f17d4d9..de507d1 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 2015\-10\-21 5.0~a11\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Live システムプロジェクト" .SH 名前 \fBlb_binary\fP \- Complete the binary stage diff --git a/manpages/ja/lb_bootstrap.ja.1 b/manpages/ja/lb_bootstrap.ja.1 index d21eedb..594e928 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 2015\-10\-21 5.0~a11\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Live システムプロジェクト" .SH 名前 \fBlb_bootstrap\fP \- Complete the bootstrap stage diff --git a/manpages/ja/lb_build.ja.1 b/manpages/ja/lb_build.ja.1 index d617ecd..a5e60b8 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 2015\-10\-21 5.0~a11\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Live システムプロジェクト" .SH 名前 \fBlb_build\fP \- Complete the bootstrap, chroot, binary, and source stages diff --git a/manpages/ja/lb_chroot.ja.1 b/manpages/ja/lb_chroot.ja.1 index 7e97bf1..cd86b53 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 2015\-10\-21 5.0~a11\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Live システムプロジェクト" .SH 名前 \fBlb_chroot\fP \- Complete the chroot stage diff --git a/manpages/ja/lb_clean.ja.1 b/manpages/ja/lb_clean.ja.1 index b19ff31..b972c52 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 2015\-10\-21 5.0~a11\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Live システムプロジェクト" .SH 名前 \fBlb_clean\fP \- Clean build directory diff --git a/manpages/ja/lb_config.ja.1 b/manpages/ja/lb_config.ja.1 index 834c3fc..b4421df 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 2015\-10\-21 5.0~a11\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Live システムプロジェクト" .SH 名前 \fBlb_config\fP \- Create config directory @@ -429,9 +429,10 @@ 出来上がる CD/DVD イメージのヘッダの APPLICATION フィールドをセットします。デフォルトは Debian モードでは「Debian Live」、ubuntu モードでは「Ubuntu Live」となっています。 .IP "\fB\-\-iso\-preparer\fP \fI名前\fP" 4 -出来上がる CD/DVD イメージのヘッダの PREPARER フィールドをセットします。デフォルトは「live\-build \fIバージョン\fP; -http://packages.qa.debian.org/live\-build」で、バージョンはそのイメージのビルドに利用した live\-build -のバージョンに展開されます。 +sets the PREPARER field in the header of a resulting CD/DVD image. By +default this is set to "live\-build \fIVERSION\fP; +http://debian\-live.alioth.debian.org/live\-build", where VERSION is expanded +to the version of live\-build that was used to build the image. .IP "\fB\-\-iso\-publisher\fP \fI名前\fP" 4 出来上がる CD/DVD イメージのヘッダの PUBLISHED フィールドをセットします。デフォルトは「Live Systems project; http:/live\-systems.org/; diff --git a/manpages/ja/lb_source.ja.1 b/manpages/ja/lb_source.ja.1 index a09cfb3..a4e3cdf 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 2015\-10\-21 5.0~a11\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2017\-08\-29 1:20170807kali1 "Live システムプロジェクト" .SH 名前 \fBlb_source\fP \- Complete the source stage diff --git a/manpages/ja/live-build.ja.7 b/manpages/ja/live-build.ja.7 index 19a6113..3730dcc 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 2015\-10\-21 5.0~a11\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 7 2017\-08\-29 1:20170807kali1 "Live システムプロジェクト" .SH 名前 \fBlive\-build\fP \- Live システムツール集 diff --git a/manpages/po/fr/lb.1.po b/manpages/po/fr/lb.1.po index cb41c59..00fca4e 100644 --- a/manpages/po/fr/lb.1.po +++ b/manpages/po/fr/lb.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build 5.0~a11-1\n" -"POT-Creation-Date: 2017-08-29 14:07+0200\n" +"POT-Creation-Date: 2017-08-29 15:05+0200\n" "PO-Revision-Date: 2015-09-20 14:53+0200\n" "Last-Translator: Olivier Humbert \n" "Language-Team: none\n" @@ -27,16 +27,16 @@ #: 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 "2015-10-21" -msgstr "29.08.2017" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: 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 "5.0~a11-1" -msgstr "5.0~a11-1" +msgid "2017-08-29" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: 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 "1:20170807kali1" +msgstr "" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 @@ -162,11 +162,6 @@ #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27 #: en/live-build.7:242 #, fuzzy -#| msgid "" -#| "More information about live-build and the Live Systems project can be " -#| "found on the homepage at EIE and in the manual at EIE." msgid "" "More information about live-build and the Live Systems project can be found " "on the homepage at EIE." diff --git a/manpages/po/fr/lb_binary.1.po b/manpages/po/fr/lb_binary.1.po index 070d39b..fa322e4 100644 --- a/manpages/po/fr/lb_binary.1.po +++ b/manpages/po/fr/lb_binary.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build 5.0~a11-1\n" -"POT-Creation-Date: 2017-08-29 14:07+0200\n" +"POT-Creation-Date: 2017-08-29 15:05+0200\n" "PO-Revision-Date: 2015-09-20 14:53+0200\n" "Last-Translator: Olivier Humbert \n" "Language-Team: none\n" @@ -27,16 +27,16 @@ #: 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 "2015-10-21" -msgstr "29.08.2017" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: 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 "5.0~a11-1" -msgstr "5.0~a11-1" +msgid "2017-08-29" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: 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 "1:20170807kali1" +msgstr "" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 @@ -127,11 +127,6 @@ #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27 #: en/live-build.7:242 #, fuzzy -#| msgid "" -#| "More information about live-build and the Live Systems project can be " -#| "found on the homepage at EIE and in the manual at EIE." msgid "" "More information about live-build and the Live Systems project can be found " "on the homepage at EIE." diff --git a/manpages/po/fr/lb_bootstrap.1.po b/manpages/po/fr/lb_bootstrap.1.po index 6b38599..0600d27 100644 --- a/manpages/po/fr/lb_bootstrap.1.po +++ b/manpages/po/fr/lb_bootstrap.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build 5.0~a11-1\n" -"POT-Creation-Date: 2017-08-29 14:07+0200\n" +"POT-Creation-Date: 2017-08-29 15:05+0200\n" "PO-Revision-Date: 2015-09-20 14:53+0200\n" "Last-Translator: Olivier Humbert \n" "Language-Team: none\n" @@ -27,16 +27,16 @@ #: 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 "2015-10-21" -msgstr "29.08.2017" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: 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 "5.0~a11-1" -msgstr "5.0~a11-1" +msgid "2017-08-29" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: 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 "1:20170807kali1" +msgstr "" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 @@ -127,11 +127,6 @@ #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27 #: en/live-build.7:242 #, fuzzy -#| msgid "" -#| "More information about live-build and the Live Systems project can be " -#| "found on the homepage at EIE and in the manual at EIE." msgid "" "More information about live-build and the Live Systems project can be found " "on the homepage at EIE." diff --git a/manpages/po/fr/lb_build.1.po b/manpages/po/fr/lb_build.1.po index 778ab20..c1142fd 100644 --- a/manpages/po/fr/lb_build.1.po +++ b/manpages/po/fr/lb_build.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build 5.0~a11-1\n" -"POT-Creation-Date: 2017-08-29 14:07+0200\n" +"POT-Creation-Date: 2017-08-29 15:05+0200\n" "PO-Revision-Date: 2015-09-20 14:53+0200\n" "Last-Translator: Olivier Humbert \n" "Language-Team: none\n" @@ -27,16 +27,16 @@ #: 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 "2015-10-21" -msgstr "29.08.2017" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: 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 "5.0~a11-1" -msgstr "5.0~a11-1" +msgid "2017-08-29" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: 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 "1:20170807kali1" +msgstr "" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 @@ -120,11 +120,6 @@ #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27 #: en/live-build.7:242 #, fuzzy -#| msgid "" -#| "More information about live-build and the Live Systems project can be " -#| "found on the homepage at EIE and in the manual at EIE." msgid "" "More information about live-build and the Live Systems project can be found " "on the homepage at EIE." diff --git a/manpages/po/fr/lb_chroot.1.po b/manpages/po/fr/lb_chroot.1.po index 3981fd0..407696c 100644 --- a/manpages/po/fr/lb_chroot.1.po +++ b/manpages/po/fr/lb_chroot.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build 5.0~a11-1\n" -"POT-Creation-Date: 2017-08-29 14:07+0200\n" +"POT-Creation-Date: 2017-08-29 15:05+0200\n" "PO-Revision-Date: 2015-09-20 14:53+0200\n" "Last-Translator: Olivier Humbert \n" "Language-Team: none\n" @@ -27,16 +27,16 @@ #: 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 "2015-10-21" -msgstr "29.08.2017" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: 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 "5.0~a11-1" -msgstr "5.0~a11-1" +msgid "2017-08-29" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: 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 "1:20170807kali1" +msgstr "" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 @@ -127,11 +127,6 @@ #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27 #: en/live-build.7:242 #, fuzzy -#| msgid "" -#| "More information about live-build and the Live Systems project can be " -#| "found on the homepage at EIE and in the manual at EIE." msgid "" "More information about live-build and the Live Systems project can be found " "on the homepage at EIE." diff --git a/manpages/po/fr/lb_clean.1.po b/manpages/po/fr/lb_clean.1.po index cfe89c6..0b187f5 100644 --- a/manpages/po/fr/lb_clean.1.po +++ b/manpages/po/fr/lb_clean.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build 5.0~a11-1\n" -"POT-Creation-Date: 2017-08-29 14:07+0200\n" +"POT-Creation-Date: 2017-08-29 15:05+0200\n" "PO-Revision-Date: 2015-09-20 14:53+0200\n" "Last-Translator: Olivier Humbert \n" "Language-Team: none\n" @@ -27,16 +27,16 @@ #: 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 "2015-10-21" -msgstr "29.08.2017" +msgid "2017-08-29" +msgstr "" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 #: 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 "5.0~a11-1" -msgstr "5.0~a11-1" +msgid "1:20170807kali1" +msgstr "" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 @@ -120,11 +120,6 @@ #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27 #: en/live-build.7:242 #, fuzzy -#| msgid "" -#| "More information about live-build and the Live Systems project can be " -#| "found on the homepage at EIE and in the manual at EIE." msgid "" "More information about live-build and the Live Systems project can be found " "on the homepage at EIE." diff --git a/manpages/po/fr/lb_config.1.po b/manpages/po/fr/lb_config.1.po index b8836ba..98d99cb 100644 --- a/manpages/po/fr/lb_config.1.po +++ b/manpages/po/fr/lb_config.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build 5.0~a11-1\n" -"POT-Creation-Date: 2017-08-29 14:07+0200\n" +"POT-Creation-Date: 2017-08-29 15:05+0200\n" "PO-Revision-Date: 2015-09-20 14:53+0200\n" "Last-Translator: Olivier Humbert \n" "Language-Team: none\n" @@ -27,16 +27,16 @@ #: 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 "2015-10-21" -msgstr "29.08.2017" +msgid "2017-08-29" +msgstr "" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 #: 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 "5.0~a11-1" -msgstr "5.0~a11-1" +msgid "1:20170807kali1" +msgstr "" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 @@ -120,11 +120,6 @@ #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27 #: en/live-build.7:242 #, fuzzy -#| msgid "" -#| "More information about live-build and the Live Systems project can be " -#| "found on the homepage at EIE and in the manual at EIE." msgid "" "More information about live-build and the Live Systems project can be found " "on the homepage at EIE." @@ -1764,9 +1759,9 @@ #: en/lb_config.1:348 msgid "" "sets the PREPARER field in the header of a resulting CD/DVD image. By " -"default this is set to \"live-build I; http://packages.qa.debian." -"org/live-build\", where VERSION is expanded to the version of live-build " -"that was used to build the image." +"default this is set to \"live-build I; http://debian-live.alioth." +"debian.org/live-build\", where VERSION is expanded to the version of live-" +"build that was used to build the image." msgstr "" #. type: IP diff --git a/manpages/po/fr/lb_source.1.po b/manpages/po/fr/lb_source.1.po index dfc1d51..56853dd 100644 --- a/manpages/po/fr/lb_source.1.po +++ b/manpages/po/fr/lb_source.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build 5.0~a11-1\n" -"POT-Creation-Date: 2017-08-29 14:07+0200\n" +"POT-Creation-Date: 2017-08-29 15:05+0200\n" "PO-Revision-Date: 2015-09-20 14:53+0200\n" "Last-Translator: Olivier Humbert \n" "Language-Team: none\n" @@ -27,16 +27,16 @@ #: 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 "2015-10-21" -msgstr "29.08.2017" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: 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 "5.0~a11-1" -msgstr "5.0~a11-1" +msgid "2017-08-29" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: 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 "1:20170807kali1" +msgstr "" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 @@ -127,11 +127,6 @@ #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27 #: en/live-build.7:242 #, fuzzy -#| msgid "" -#| "More information about live-build and the Live Systems project can be " -#| "found on the homepage at EIE and in the manual at EIE." msgid "" "More information about live-build and the Live Systems project can be found " "on the homepage at EIE." diff --git a/manpages/po/fr/live-build.7.po b/manpages/po/fr/live-build.7.po index 35c0b68..0f3a8ee 100644 --- a/manpages/po/fr/live-build.7.po +++ b/manpages/po/fr/live-build.7.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build 5.0~a11-1\n" -"POT-Creation-Date: 2017-08-29 14:07+0200\n" +"POT-Creation-Date: 2017-08-29 15:05+0200\n" "PO-Revision-Date: 2015-09-20 14:53+0200\n" "Last-Translator: Olivier Humbert \n" "Language-Team: none\n" @@ -27,16 +27,16 @@ #: 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 "2015-10-21" -msgstr "29.08.2017" +msgid "2017-08-29" +msgstr "" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 #: 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 "5.0~a11-1" -msgstr "5.0~a11-1" +msgid "1:20170807kali1" +msgstr "" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 @@ -114,11 +114,6 @@ #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27 #: en/live-build.7:242 #, fuzzy -#| msgid "" -#| "More information about live-build and the Live Systems project can be " -#| "found on the homepage at EIE and in the manual at EIE." msgid "" "More information about live-build and the Live Systems project can be found " "on the homepage at EIE." diff --git a/manpages/po/ja/lb.1.po b/manpages/po/ja/lb.1.po index b4b02e7..1e0aa65 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: 2017-08-29 14:07+0200\n" +"POT-Creation-Date: 2017-08-29 15:05+0200\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -26,17 +26,17 @@ #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 #: 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 -#, fuzzy, no-wrap -msgid "2015-10-21" -msgstr "2015-02-07" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: 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 -#, fuzzy, no-wrap -msgid "5.0~a11-1" -msgstr "5.0~a3-1" +#, no-wrap +msgid "2017-08-29" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: 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 "1:20170807kali1" +msgstr "" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 @@ -162,11 +162,6 @@ #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27 #: en/live-build.7:242 #, fuzzy -#| msgid "" -#| "More information about live-build and the Live Systems project can be " -#| "found on the homepage at EIE and in the manual at EIE." msgid "" "More information about live-build and the Live Systems project can be found " "on the homepage at EIE." diff --git a/manpages/po/ja/lb_binary.1.po b/manpages/po/ja/lb_binary.1.po index 6ce5c68..87b92f9 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: 2017-08-29 14:07+0200\n" +"POT-Creation-Date: 2017-08-29 15:05+0200\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -26,17 +26,17 @@ #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 #: 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 -#, fuzzy, no-wrap -msgid "2015-10-21" -msgstr "2015-02-07" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: 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 -#, fuzzy, no-wrap -msgid "5.0~a11-1" -msgstr "5.0~a3-1" +#, no-wrap +msgid "2017-08-29" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: 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 "1:20170807kali1" +msgstr "" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 @@ -127,11 +127,6 @@ #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27 #: en/live-build.7:242 #, fuzzy -#| msgid "" -#| "More information about live-build and the Live Systems project can be " -#| "found on the homepage at EIE and in the manual at EIE." msgid "" "More information about live-build and the Live Systems project can be found " "on the homepage at EIE." diff --git a/manpages/po/ja/lb_bootstrap.1.po b/manpages/po/ja/lb_bootstrap.1.po index 236e48c..fb3523f 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: 2017-08-29 14:07+0200\n" +"POT-Creation-Date: 2017-08-29 15:05+0200\n" "PO-Revision-Date: 2014-08-29 06:25+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -26,17 +26,17 @@ #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 #: 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 -#, fuzzy, no-wrap -msgid "2015-10-21" -msgstr "2015-02-07" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: 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 -#, fuzzy, no-wrap -msgid "5.0~a11-1" -msgstr "5.0~a3-1" +#, no-wrap +msgid "2017-08-29" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: 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 "1:20170807kali1" +msgstr "" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 @@ -127,11 +127,6 @@ #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27 #: en/live-build.7:242 #, fuzzy -#| msgid "" -#| "More information about live-build and the Live Systems project can be " -#| "found on the homepage at EIE and in the manual at EIE." msgid "" "More information about live-build and the Live Systems project can be found " "on the homepage at EIE." diff --git a/manpages/po/ja/lb_build.1.po b/manpages/po/ja/lb_build.1.po index 81793cf..e0a2fb2 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: 2017-08-29 14:07+0200\n" +"POT-Creation-Date: 2017-08-29 15:05+0200\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -26,17 +26,17 @@ #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 #: 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 -#, fuzzy, no-wrap -msgid "2015-10-21" -msgstr "2015-02-07" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: 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 -#, fuzzy, no-wrap -msgid "5.0~a11-1" -msgstr "5.0~a3-1" +#, no-wrap +msgid "2017-08-29" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: 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 "1:20170807kali1" +msgstr "" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 @@ -120,11 +120,6 @@ #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27 #: en/live-build.7:242 #, fuzzy -#| msgid "" -#| "More information about live-build and the Live Systems project can be " -#| "found on the homepage at EIE and in the manual at EIE." msgid "" "More information about live-build and the Live Systems project can be found " "on the homepage at EIE." diff --git a/manpages/po/ja/lb_chroot.1.po b/manpages/po/ja/lb_chroot.1.po index 41033fa..2ec137a 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: 2017-08-29 14:07+0200\n" +"POT-Creation-Date: 2017-08-29 15:05+0200\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -26,17 +26,17 @@ #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 #: 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 -#, fuzzy, no-wrap -msgid "2015-10-21" -msgstr "2015-02-07" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: 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 -#, fuzzy, no-wrap -msgid "5.0~a11-1" -msgstr "5.0~a3-1" +#, no-wrap +msgid "2017-08-29" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: 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 "1:20170807kali1" +msgstr "" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 @@ -127,11 +127,6 @@ #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27 #: en/live-build.7:242 #, fuzzy -#| msgid "" -#| "More information about live-build and the Live Systems project can be " -#| "found on the homepage at EIE and in the manual at EIE." msgid "" "More information about live-build and the Live Systems project can be found " "on the homepage at EIE." diff --git a/manpages/po/ja/lb_clean.1.po b/manpages/po/ja/lb_clean.1.po index dfed63b..36edd09 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: 2017-08-29 14:07+0200\n" +"POT-Creation-Date: 2017-08-29 15:05+0200\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -26,17 +26,17 @@ #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 #: 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 -#, fuzzy, no-wrap -msgid "2015-10-21" -msgstr "2015-02-07" +#, no-wrap +msgid "2017-08-29" +msgstr "" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 #: 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 -#, fuzzy, no-wrap -msgid "5.0~a11-1" -msgstr "5.0~a3-1" +#, no-wrap +msgid "1:20170807kali1" +msgstr "" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 @@ -120,11 +120,6 @@ #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27 #: en/live-build.7:242 #, fuzzy -#| msgid "" -#| "More information about live-build and the Live Systems project can be " -#| "found on the homepage at EIE and in the manual at EIE." msgid "" "More information about live-build and the Live Systems project can be found " "on the homepage at EIE." diff --git a/manpages/po/ja/lb_config.1.po b/manpages/po/ja/lb_config.1.po index 32dc8b0..aff9c8a 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: 2017-08-29 14:07+0200\n" +"POT-Creation-Date: 2017-08-29 15:05+0200\n" "PO-Revision-Date: 2015-02-07 14:57+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -26,17 +26,17 @@ #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 #: 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 -#, fuzzy, no-wrap -msgid "2015-10-21" -msgstr "2015-02-07" +#, no-wrap +msgid "2017-08-29" +msgstr "" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 #: 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 -#, fuzzy, no-wrap -msgid "5.0~a11-1" -msgstr "5.0~a3-1" +#, no-wrap +msgid "1:20170807kali1" +msgstr "" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 @@ -120,11 +120,6 @@ #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27 #: en/live-build.7:242 #, fuzzy -#| msgid "" -#| "More information about live-build and the Live Systems project can be " -#| "found on the homepage at EIE and in the manual at EIE." msgid "" "More information about live-build and the Live Systems project can be found " "on the homepage at EIE." @@ -1778,11 +1773,17 @@ #. type: Plain text #: en/lb_config.1:348 +#, fuzzy +#| msgid "" +#| "sets the PREPARER field in the header of a resulting CD/DVD image. By " +#| "default this is set to \"live-build I; http://packages.qa.debian." +#| "org/live-build\", where VERSION is expanded to the version of live-build " +#| "that was used to build the image." msgid "" "sets the PREPARER field in the header of a resulting CD/DVD image. By " -"default this is set to \"live-build I; http://packages.qa.debian." -"org/live-build\", where VERSION is expanded to the version of live-build " -"that was used to build the image." +"default this is set to \"live-build I; http://debian-live.alioth." +"debian.org/live-build\", where VERSION is expanded to the version of live-" +"build that was used to build the image." msgstr "" "出来上がる CD/DVD イメージのヘッダの PREPARER フィールドをセットします。デ" "フォルトは「live-build I<バージョン>; http://packages.qa.debian.org/live-" diff --git a/manpages/po/ja/lb_source.1.po b/manpages/po/ja/lb_source.1.po index a76e2f2..e732f09 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: 2017-08-29 14:07+0200\n" +"POT-Creation-Date: 2017-08-29 15:05+0200\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -26,17 +26,17 @@ #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 #: 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 -#, fuzzy, no-wrap -msgid "2015-10-21" -msgstr "2015-02-07" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: 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 -#, fuzzy, no-wrap -msgid "5.0~a11-1" -msgstr "5.0~a3-1" +#, no-wrap +msgid "2017-08-29" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: 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 "1:20170807kali1" +msgstr "" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 @@ -127,11 +127,6 @@ #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27 #: en/live-build.7:242 #, fuzzy -#| msgid "" -#| "More information about live-build and the Live Systems project can be " -#| "found on the homepage at EIE and in the manual at EIE." msgid "" "More information about live-build and the Live Systems project can be found " "on the homepage at EIE." diff --git a/manpages/po/ja/live-build.7.po b/manpages/po/ja/live-build.7.po index c41ba0e..7eca8f9 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: 2017-08-29 14:07+0200\n" +"POT-Creation-Date: 2017-08-29 15:05+0200\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -26,17 +26,17 @@ #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 #: 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 -#, fuzzy, no-wrap -msgid "2015-10-21" -msgstr "2015-02-07" +#, no-wrap +msgid "2017-08-29" +msgstr "" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 #: 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 -#, fuzzy, no-wrap -msgid "5.0~a11-1" -msgstr "5.0~a3-1" +#, no-wrap +msgid "1:20170807kali1" +msgstr "" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 @@ -114,11 +114,6 @@ #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27 #: en/live-build.7:242 #, fuzzy -#| msgid "" -#| "More information about live-build and the Live Systems project can be " -#| "found on the homepage at EIE and in the manual at EIE." msgid "" "More information about live-build and the Live Systems project can be found " "on the homepage at EIE." diff --git a/manpages/pot/lb.1.pot b/manpages/pot/lb.1.pot index 5b32633..88296ba 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 1:20170807kali1\n" -"POT-Creation-Date: 2017-08-29 14:07+0200\n" +"Project-Id-Version: live-build 1:20170829\n" +"POT-Creation-Date: 2017-08-29 15:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,7 +29,7 @@ #: 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 "2015-10-21" +msgid "2017-08-29" msgstr "" #. type: TH @@ -37,7 +37,7 @@ #: 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 "5.0~a11-1" +msgid "1:20170807kali1" msgstr "" #. type: TH diff --git a/manpages/pot/lb_binary.1.pot b/manpages/pot/lb_binary.1.pot index a34ffb5..42cb9e7 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 1:20170807kali1\n" -"POT-Creation-Date: 2017-08-29 14:07+0200\n" +"Project-Id-Version: live-build 1:20170829\n" +"POT-Creation-Date: 2017-08-29 15:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,15 +29,15 @@ #: 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 "2015-10-21" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: 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 "5.0~a11-1" +msgid "2017-08-29" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: 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 "1:20170807kali1" msgstr "" #. type: TH diff --git a/manpages/pot/lb_bootstrap.1.pot b/manpages/pot/lb_bootstrap.1.pot index aa7e5d1..82778ed 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 1:20170807kali1\n" -"POT-Creation-Date: 2017-08-29 14:07+0200\n" +"Project-Id-Version: live-build 1:20170829\n" +"POT-Creation-Date: 2017-08-29 15:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,15 +29,15 @@ #: 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 "2015-10-21" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: 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 "5.0~a11-1" +msgid "2017-08-29" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: 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 "1:20170807kali1" msgstr "" #. type: TH diff --git a/manpages/pot/lb_build.1.pot b/manpages/pot/lb_build.1.pot index 33cb1af..5072016 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 1:20170807kali1\n" -"POT-Creation-Date: 2017-08-29 14:07+0200\n" +"Project-Id-Version: live-build 1:20170829\n" +"POT-Creation-Date: 2017-08-29 15:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,15 +29,15 @@ #: 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 "2015-10-21" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: 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 "5.0~a11-1" +msgid "2017-08-29" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: 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 "1:20170807kali1" msgstr "" #. type: TH diff --git a/manpages/pot/lb_chroot.1.pot b/manpages/pot/lb_chroot.1.pot index 4ae7f47..5ca8da6 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 1:20170807kali1\n" -"POT-Creation-Date: 2017-08-29 14:07+0200\n" +"Project-Id-Version: live-build 1:20170829\n" +"POT-Creation-Date: 2017-08-29 15:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,15 +29,15 @@ #: 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 "2015-10-21" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: 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 "5.0~a11-1" +msgid "2017-08-29" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: 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 "1:20170807kali1" msgstr "" #. type: TH diff --git a/manpages/pot/lb_clean.1.pot b/manpages/pot/lb_clean.1.pot index 2669bf6..09abaa6 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 1:20170807kali1\n" -"POT-Creation-Date: 2017-08-29 14:07+0200\n" +"Project-Id-Version: live-build 1:20170829\n" +"POT-Creation-Date: 2017-08-29 15:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,15 +29,15 @@ #: 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 "2015-10-21" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: 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 "5.0~a11-1" +msgid "2017-08-29" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: 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 "1:20170807kali1" msgstr "" #. type: TH diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot index 2892735..c4b0ed4 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 1:20170807kali1\n" -"POT-Creation-Date: 2017-08-29 14:07+0200\n" +"Project-Id-Version: live-build 1:20170829\n" +"POT-Creation-Date: 2017-08-29 15:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,7 +29,7 @@ #: 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 "2015-10-21" +msgid "2017-08-29" msgstr "" #. type: TH @@ -37,7 +37,7 @@ #: 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 "5.0~a11-1" +msgid "1:20170807kali1" msgstr "" #. type: TH @@ -1523,9 +1523,9 @@ #: en/lb_config.1:348 msgid "" "sets the PREPARER field in the header of a resulting CD/DVD image. By " -"default this is set to \"live-build I; http://packages.qa.debian." -"org/live-build\", where VERSION is expanded to the version of live-build " -"that was used to build the image." +"default this is set to \"live-build I; http://debian-live.alioth." +"debian.org/live-build\", where VERSION is expanded to the version of live-" +"build that was used to build the image." msgstr "" #. type: IP diff --git a/manpages/pot/lb_source.1.pot b/manpages/pot/lb_source.1.pot index 78e3475..cefc33d 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 1:20170807kali1\n" -"POT-Creation-Date: 2017-08-29 14:07+0200\n" +"Project-Id-Version: live-build 1:20170829\n" +"POT-Creation-Date: 2017-08-29 15:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,15 +29,15 @@ #: 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 "2015-10-21" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: 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 "5.0~a11-1" +msgid "2017-08-29" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: 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 "1:20170807kali1" msgstr "" #. type: TH diff --git a/manpages/pot/live-build.7.pot b/manpages/pot/live-build.7.pot index 26d2c63..cf7c2f1 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 1:20170807kali1\n" -"POT-Creation-Date: 2017-08-29 14:07+0200\n" +"Project-Id-Version: live-build 1:20170829\n" +"POT-Creation-Date: 2017-08-29 15:05+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,7 +29,7 @@ #: 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 "2015-10-21" +msgid "2017-08-29" msgstr "" #. type: TH @@ -37,7 +37,7 @@ #: 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 "5.0~a11-1" +msgid "1:20170807kali1" msgstr "" #. type: TH diff --git a/scripts/build/binary_grub-efi b/scripts/build/binary_grub-efi index 6d158cd..d24532d 100755 --- a/scripts/build/binary_grub-efi +++ b/scripts/build/binary_grub-efi @@ -45,56 +45,11 @@ Check_crossarchitectures # Checking depends -case "${LB_BUILD_WITH_CHROOT}" in - true) - _CHROOT_DIR="" - - Check_package chroot /usr/lib/grub/x86_64-efi/configfile.mod grub-efi-amd64-bin - Check_package chroot /usr/lib/grub/i386-efi/configfile.mod grub-efi-ia32-bin - Check_package chroot /usr/bin/grub-mkimage grub-common - Check_package chroot /usr/bin/mcopy mtools - Check_package chroot /sbin/mkfs.msdos dosfstools - ;; - - false) - _CHROOT_DIR="chroot" - - if [ ! -e /usr/lib/grub/x86_64-efi ] - then - # grub-efi-amd64-bin - Echo_error "/usr/lib/grub/x86_64-efi - no such directory" - exit 1 - fi - - if [ ! -e /usr/lib/grub/i386-efi ] - then - # grub-efi-ia32-bin - Echo_error "/usr/lib/grub/i386-efi - no such directory" - exit 1 - fi - - if [ ! -e /usr/bin/grub-mkimage ] - then - # grub-common - Echo_error "/usr/bin/grub-mkimage - no such file." - exit 1 - fi - - if [ ! -e /usr/bin/mcopy ] - then - # mtools - Echo_error "/usr/bin/mcopy - no such file." - exit 1 - fi - - if [ ! -e /sbin/mkfs.msdos ] - then - # dosfstools - Echo_error "/sbin/mkfs.msdos - no such file." - exit 1 - fi - ;; -esac +Check_package chroot /usr/lib/grub/x86_64-efi/configfile.mod grub-efi-amd64-bin +Check_package chroot /usr/lib/grub/i386-efi/configfile.mod grub-efi-ia32-bin +Check_package chroot /usr/bin/grub-mkimage grub-common +Check_package chroot /usr/bin/mcopy mtools +Check_package chroot /sbin/mkfs.msdos dosfstools # Setting destination directory case "${LIVE_IMAGE_TYPE}" in @@ -125,6 +80,11 @@ mkdir -p chroot/${LIVE_BUILD_PATH} cp "${LIVE_BUILD_PATH}/efi-image" "chroot/${LIVE_BUILD_PATH}" cp "${LIVE_BUILD_PATH}/grub-cpmodules" "chroot/${LIVE_BUILD_PATH}" + + _CHROOT_DIR="" + ;; + false) + _CHROOT_DIR="chroot" ;; esac ##### diff --git a/scripts/build/binary_hdd b/scripts/build/binary_hdd index 400403c..c6b842e 100755 --- a/scripts/build/binary_hdd +++ b/scripts/build/binary_hdd @@ -97,6 +97,19 @@ rm -f ${LIVE_iMAGE_NAME}.img fi +case "${LB_BINARY_FILESYSTEM}" in + fat*) + # If the target does not support hardlinks, tell du to + # count them double + DU_OPTIONS="--count-links" + ;; + + *) + DU_OPTIONS="" + ;; +esac + + # Enforce fat32 if we find individual files bigger than 2GB if [ "${LB_BINARY_FILESYSTEM}" = "fat16" ] && [ -n "$(find binary -size +1999M)" ] then @@ -107,7 +120,7 @@ fi # Enforce fat32 if we have images in total bigger than 2GB -if [ "${LB_BINARY_FILESYSTEM}" = "fat16" ] && [ "$(du -s binary | awk '{ print $1 }')" -gt "1900000" ] +if [ "${LB_BINARY_FILESYSTEM}" = "fat16" ] && [ "$(du ${DU_OPTIONS} -s binary | awk '{ print $1 }')" -gt "1900000" ] then Echo_warning "FAT16 doesn't support partitions larger than 2GB, automatically enforcing FAT32" @@ -127,7 +140,7 @@ # Everything which comes here needs to be cleaned up, if [ "$LB_HDD_SIZE" = "auto" ]; then - DU_DIM="$(du -ms binary | cut -f1)" + DU_DIM="$(du ${DU_OPTIONS} -ms binary | cut -f1)" REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LB_BINARY_FILESYSTEM})" else REAL_DIM=$LB_HDD_SIZE diff --git a/scripts/build/binary_loadlin b/scripts/build/binary_loadlin index 69f740b..d74a470 100755 --- a/scripts/build/binary_loadlin +++ b/scripts/build/binary_loadlin @@ -43,19 +43,20 @@ # Creating lock file Create_lockfile .lock + case "${LB_ARCHITECTURES}" in amd64|i386) + # Checking depends + Check_package chroot /usr/lib/loadlin/loadlin.exe.gz loadlin + + # Restoring cache + Restore_cache cache/packages.binary + + # Installing depends + Install_package + case "${LB_BUILD_WITH_CHROOT}" in true) - # Checking depends - Check_package chroot /usr/lib/loadlin/loadlin.exe.gz loadlin - - # Restoring cache - Restore_cache cache/packages.binary - - # Installing depends - Install_package - _PREFIX="chroot" ;; @@ -69,15 +70,11 @@ gunzip -c "${_PREFIX}/usr/lib/loadlin/loadlin.exe.gz" > binary/tools/loadlin.exe gunzip -c "${_PREFIX}/usr/share/doc/loadlin/manual.txt.gz" > binary/tools/loadlin.txt - case "${LB_BUILD_WITH_CHROOT}" in - true) - # Saving cache - Save_cache cache/packages.binary + # Saving cache + Save_cache cache/packages.binary - # Removing depends - Remove_package - ;; - esac + # Removing depends + Remove_package cat > binary/install/install.bat << EOF \tools\loadlin.exe vmlinuz initrd=initrd.gz diff --git a/scripts/build/binary_package-lists b/scripts/build/binary_package-lists index dcbadcc..a13491e 100755 --- a/scripts/build/binary_package-lists +++ b/scripts/build/binary_package-lists @@ -55,23 +55,13 @@ then # Check depends Check_package host /usr/bin/apt-ftparchive apt-utils + Check_package chroot /usr/bin/grep-aptavail dctrl-tools - case "${LB_BUILD_WITH_CHROOT}" in - true) - # Restoring cache - Restore_cache cache/packages.chroot + # Restoring cache + Restore_cache cache/packages.chroot - # Check depends - Check_package chroot /usr/bin/grep-aptavail dctrl-tools - - # Installing depends - Install_package - ;; - - false) - Check_package host /usr/bin/grep-aptavail dctrl-tools - ;; - esac + # Installing depends + Install_package if [ -e "${LIVE_BUILD}/share/bin/Packages" ] then @@ -163,15 +153,11 @@ rm -rf chroot/binary.deb mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status - case "${LB_BUILD_WITH_CHROOT}" in - true) - # Removing depends - Remove_package + # Removing depends + Remove_package - # Saving cache - Save_cache cache/packages.chroot - ;; - esac + # Saving cache + Save_cache cache/packages.chroot # Creating stage file Create_stagefile .build/binary_package-lists diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux index 1347aa2..bb66588 100755 --- a/scripts/build/binary_syslinux +++ b/scripts/build/binary_syslinux @@ -114,42 +114,13 @@ fi # Checking depends -case "${LB_BUILD_WITH_CHROOT}" in - true) - Check_package chroot /usr/lib/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z]) ${_BOOTLOADER} - Check_package chroot /usr/lib/syslinux syslinux-common - - if ls "${_SOURCE}"/*.svg* > /dev/null 2>&1 - then - Check_package chroot /usr/bin/rsvg-convert librsvg2-bin - fi - ;; - - false) - if [ ! -e "/usr/share/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z])" ] - then - Echo_error "/usr/share/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z])" - exit 1 - fi - - if [ ! -e /usr/lib/syslinux ] - then - # syslinux-common - Echo_error "/usr/lib/syslinux - no such directory" - exit 1 - fi - - if ls "${_SOURCE}"/*.svg* > /dev/null 2>&1 - then - if [ ! -e /usr/bin/rsvg-convert ] - then - # librsvg2-bin - Echo_error "/usr/bin/rsvg-convert - no such file" - exit 1 - fi - fi - ;; -esac +Check_package chroot /usr/lib/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z]) ${_BOOTLOADER} +Check_package chroot /usr/lib/syslinux syslinux-common + +if ls "${_SOURCE}"/*.svg* > /dev/null 2>&1 +then + Check_package chroot /usr/bin/rsvg-convert librsvg2-bin +fi # Restoring cache Restore_cache cache/packages.binary diff --git a/scripts/build/binary_win32-loader b/scripts/build/binary_win32-loader index eecb6b2..7105872 100755 --- a/scripts/build/binary_win32-loader +++ b/scripts/build/binary_win32-loader @@ -55,17 +55,17 @@ case "${LB_ARCHITECTURES}" in amd64|i386) + # Checking depends + Check_package chroot /usr/share/win32/win32-loader.exe win32-loader + + # Restoring cache + Restore_cache cache/packages.binary + + # Installing depends + Install_package + if [ "${LB_BUILD_WITH_CHROOT}" = "true" ] then - # Checking depends - Check_package chroot /usr/share/win32/win32-loader.exe win32-loader - - # Restoring cache - Restore_cache cache/packages.binary - - # Installing depends - Install_package - # Copying win32-loader cp -r chroot/usr/share/win32/* binary else diff --git a/scripts/build/chroot_package-lists b/scripts/build/chroot_package-lists index d64fe49..26a2406 100755 --- a/scripts/build/chroot_package-lists +++ b/scripts/build/chroot_package-lists @@ -49,26 +49,14 @@ exit 0 fi -case "${LB_BUILD_WITH_CHROOT}" in - true) - # Checking depends - Check_package chroot /usr/bin/grep-aptavail dctrl-tools +# Checking depends +Check_package chroot /usr/bin/grep-aptavail dctrl-tools - # Restoring cache - Restore_cache cache/packages.chroot +# Restoring cache +Restore_cache cache/packages.chroot - # Installing depends - Install_package - ;; - - false) - if [ ! -e /usr/bin/grep-aptavail ]; then - # dctrl-tools - Echo_error "/usr/bin/grep-aptavail - no such file." - exit 1 - fi - ;; -esac +# Installing depends +Install_package if [ -e "${LIVE_BUILD}/share/bin/Packages" ] then @@ -102,19 +90,10 @@ rm -f chroot/bin/Packages -case "${LB_BUILD_WITH_CHROOT}" in - true) - # Removing dctrl-tools again if the user has not installed it - if ! grep -qs dctrl-tools chroot/root/packages.chroot - then - # Removing depends - Remove_package - fi +Remove_package - # Saving cache - Save_cache cache/packages.chroot - ;; -esac +# Saving cache +Save_cache cache/packages.chroot # Creating stage file Create_stagefile .build/chroot_package-lists.${_PASS}