diff options
48 files changed, 98 insertions, 122 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index a0df640a4..546224957 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -21,7 +21,7 @@ Set_defaults () # Setting system type LB_SYSTEM="${LB_SYSTEM:-live}" - # Setting mode (currently: debian, emdebian, progress-linux, ubuntu and kubuntu) + # Setting mode (currently: debian, emdebian, progress-linux, and ubuntu) if [ -x /usr/bin/lsb_release ] then _DISTRIBUTOR="$(lsb_release -is | tr [A-Z] [a-z])" @@ -54,7 +54,7 @@ Set_defaults () LB_DERIVATIVE="true" ;; - ubuntu|kubuntu) + ubuntu) LB_DISTRIBUTION="${LB_DISTRIBUTION:-precise}" LB_DERIVATIVE="false" ;; @@ -171,7 +171,7 @@ Set_defaults () case "${LB_SYSTEM}" in live) case "${LB_MODE}" in - ubuntu|kubuntu) + ubuntu) LB_INITRAMFS="${LB_INITRAMFS:-casper}" ;; @@ -190,7 +190,7 @@ Set_defaults () # Setting initsystem case "${LB_MODE}" in - ubuntu|kubuntu) + ubuntu) case "${LB_INITRAMFS}" in live-boot) LB_INITSYSTEM="${LB_INITSYSTEM:-upstart}" @@ -344,7 +344,7 @@ Set_defaults () LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://cdn.archive.progress-linux.org/progress/}" ;; - ubuntu|kubuntu) + ubuntu) case "${LB_ARCHITECTURES}" in amd64|i386) LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://archive.ubuntu.com/ubuntu/}" @@ -379,7 +379,7 @@ Set_defaults () LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-${LB_MIRROR_CHROOT}}" ;; - ubuntu|kubuntu) + ubuntu) case "${LB_ARCHITECTURES}" in amd64|i386) LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://security.ubuntu.com/ubuntu/}" @@ -401,7 +401,7 @@ Set_defaults () LB_MIRROR_CHROOT_UPDATES="${LB_MIRROR_CHROOT_UPDATES:-${LB_MIRROR_CHROOT}}" ;; - ubuntu|kubuntu) + ubuntu) case "${LB_ARCHITECTURES}" in amd64|i386) LB_MIRROR_CHROOT_UPDATES="${LB_MIRROR_CHROOT_UPDATES:-http://archive.ubuntu.com/ubuntu/}" @@ -455,7 +455,7 @@ Set_defaults () LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-${LB_MIRROR_BINARY}}" ;; - ubuntu|kubuntu) + ubuntu) case "${LB_ARCHITECTURES}" in amd64|i386) LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://archive.ubuntu.com/ubuntu/}" @@ -487,7 +487,7 @@ Set_defaults () LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-${LB_MIRROR_CHROOT}}" ;; - ubuntu|kubuntu) + ubuntu) case "${LB_ARCHITECTURES}" in amd64|i386) LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-http://security.ubuntu.com/ubuntu/}" @@ -514,7 +514,7 @@ Set_defaults () LB_MIRROR_BINARY_UPDATES="${LB_MIRROR_BINARY_UPDATES:-${LB_MIRROR_BINARY}}" ;; - ubuntu|kubuntu) + ubuntu) case "${LB_ARCHITECTURES}" in amd64|i386) LB_MIRROR_BINARY_UPDATES="${LB_MIRROR_BINARY_UPDATES:-http://archive.ubuntu.com/ubuntu/}" @@ -569,7 +569,7 @@ Set_defaults () LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-${LB_ARCHIVE_AREAS}}" ;; - ubuntu|kubuntu) + ubuntu) LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main restricted}" LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-${LB_ARCHIVE_AREAS}}" ;; @@ -615,7 +615,7 @@ Set_defaults () # Setting keyring packages case "${LB_MODE}" in - ubuntu|kubuntu) + ubuntu) LB_KEYRING_PACKAGES="${LB_KEYRING_PACKAGES:-ubuntu-keyring}" ;; @@ -628,7 +628,7 @@ Set_defaults () case "${LB_ARCHITECTURES}" in armel) case "${LB_MODE}" in - ubuntu|kubuntu) + ubuntu) LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-omap}" ;; *) @@ -647,7 +647,7 @@ Set_defaults () amd64) case "${LB_MODE}" in - ubuntu|kubuntu) + ubuntu) LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}" ;; @@ -663,7 +663,7 @@ Set_defaults () LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-686-pae}" ;; - ubuntu|kubuntu) + ubuntu) case "${LB_DISTRIBUTION}" in precise) LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic-pae}" @@ -701,7 +701,7 @@ Set_defaults () exit 1 ;; - ubuntu|kubuntu) + ubuntu) LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc-smp powerpc64-smp e500 powerpc-e500mc}" ;; @@ -713,7 +713,7 @@ Set_defaults () s390) case "${LB_MODE}" in - progress-linux|ubuntu|kubuntu) + progress-linux|ubuntu) Echo_error "Architecture ${LB_ARCHITECTURES} not supported in the ${LB_MODE} mode." exit 1 ;; @@ -745,7 +745,7 @@ Set_defaults () # Set linux packages case "${LB_MODE}" in - ubuntu|kubuntu) + ubuntu) LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES:-linux}" ;; @@ -908,7 +908,7 @@ Set_defaults () hdd*) case "${LB_MODE}" in - ubuntu|kubuntu) + ubuntu) if [ "${LB_DEBIAN_INSTALLER}" = "live" ] then _LB_BOOTAPPEND_PRESEED="file=/cdrom/install/${LB_DEBIAN_INSTALLER_PRESEEDFILE}" @@ -964,10 +964,6 @@ Set_defaults () ubuntu) LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Ubuntu Live}" ;; - - kubuntu) - LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Kubuntu Live}" - ;; esac # Set iso preparer @@ -1001,10 +997,6 @@ Set_defaults () ubuntu) LB_HDD_LABEL="${LB_HDD_LABEL:-UBUNTU}" ;; - - kubuntu) - LB_HDD_LABEL="${LB_HDD_LABEL:-KUBUNTU}" - ;; esac # Setting hdd size @@ -1027,10 +1019,6 @@ Set_defaults () ubuntu) LB_ISO_VOLUME="${LB_ISO_VOLUME:-Ubuntu ${LB_DISTRIBUTION} \$(date +%Y%m%d-%H:%M)}" ;; - - kubuntu) - LB_ISO_VOLUME="${LB_ISO_VOLUME:-Ubuntu ${LB_DISTRIBUTION} \$(date +%Y%m%d-%H:%M)}" - ;; esac # Setting memtest option @@ -1038,7 +1026,7 @@ Set_defaults () # Setting loadlin option case "${LB_MODE}" in - progress-linux|ubuntu|kubuntu) + progress-linux|ubuntu) ;; @@ -1062,7 +1050,7 @@ Set_defaults () # Setting win32-loader option case "${LB_MODE}" in - progress-linux|ubuntu|kubuntu) + progress-linux|ubuntu) ;; diff --git a/manpages/de/lb.de.1 b/manpages/de/lb.de.1 index 01c760b2b..5284c1cbd 100644 --- a/manpages/de/lb.de.1 +++ b/manpages/de/lb.de.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2012\-12\-16 4.0~a4\-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2012\-12\-17 4.0~a4\-1 "Debian Live Project" .SH NAME \fBlb\fP \- wrapper for live\-build programs diff --git a/manpages/de/lb_binary.de.1 b/manpages/de/lb_binary.de.1 index ffb221b15..91d96bf0e 100644 --- a/manpages/de/lb_binary.de.1 +++ b/manpages/de/lb_binary.de.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2012\-12\-16 4.0~a4\-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2012\-12\-17 4.0~a4\-1 "Debian Live Project" .SH NAME \fBlb binary\fP \- Complete the binary stage diff --git a/manpages/de/lb_bootstrap.de.1 b/manpages/de/lb_bootstrap.de.1 index d186fe73a..2a86319b3 100644 --- a/manpages/de/lb_bootstrap.de.1 +++ b/manpages/de/lb_bootstrap.de.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2012\-12\-16 4.0~a4\-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2012\-12\-17 4.0~a4\-1 "Debian Live Project" .SH NAME \fBlb bootstrap\fP \- Complete the bootstrap stage diff --git a/manpages/de/lb_build.de.1 b/manpages/de/lb_build.de.1 index b2d0b347e..a0beda703 100644 --- a/manpages/de/lb_build.de.1 +++ b/manpages/de/lb_build.de.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2012\-12\-16 4.0~a4\-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2012\-12\-17 4.0~a4\-1 "Debian Live Project" .SH NAME \fBlb build\fP \- Complete the bootstrap, chroot, binary, and source stages diff --git a/manpages/de/lb_chroot.de.1 b/manpages/de/lb_chroot.de.1 index ed06c6d46..a3eb10a79 100644 --- a/manpages/de/lb_chroot.de.1 +++ b/manpages/de/lb_chroot.de.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2012\-12\-16 4.0~a4\-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2012\-12\-17 4.0~a4\-1 "Debian Live Project" .SH NAME \fBlb chroot\fP \- Complete the chroot stage diff --git a/manpages/de/lb_clean.de.1 b/manpages/de/lb_clean.de.1 index f4d9ed8ea..37b6d34fa 100644 --- a/manpages/de/lb_clean.de.1 +++ b/manpages/de/lb_clean.de.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2012\-12\-16 4.0~a4\-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2012\-12\-17 4.0~a4\-1 "Debian Live Project" .SH NAME \fBlb clean\fP \- Clean build directory diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1 index 84e12b89d..22eae03ac 100644 --- a/manpages/de/lb_config.de.1 +++ b/manpages/de/lb_config.de.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2012\-12\-16 4.0~a4\-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2012\-12\-17 4.0~a4\-1 "Debian Live Project" .SH NAME \fBlb config\fP \- Create config directory @@ -178,7 +178,7 @@ .br [\fB\-\-mirror\-debian\-installer\fP \fIURL\fP] .br - [\fB\-\-mode\fP debian|emdebian|progress\-linux|ubuntu|kubuntu] + [\fB\-\-mode\fP debian|emdebian|progress\-linux|ubuntu] .br [\fB\-\-system\fP live|normal] .br diff --git a/manpages/de/lb_source.de.1 b/manpages/de/lb_source.de.1 index 7e072b868..914183c04 100644 --- a/manpages/de/lb_source.de.1 +++ b/manpages/de/lb_source.de.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2012\-12\-16 4.0~a4\-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2012\-12\-17 4.0~a4\-1 "Debian Live Project" .SH NAME \fBlb source\fP \- Complete the source stage diff --git a/manpages/de/lb_testroot.de.1 b/manpages/de/lb_testroot.de.1 index aac82b7a5..7896ce761 100644 --- a/manpages/de/lb_testroot.de.1 +++ b/manpages/de/lb_testroot.de.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2012\-12\-16 4.0~a4\-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2012\-12\-17 4.0~a4\-1 "Debian Live Project" .SH NAME \fBlb testroot\fP \- Ensure that a system is built as root diff --git a/manpages/de/live-build.de.7 b/manpages/de/live-build.de.7 index 1d1911b56..6add68e7c 100644 --- a/manpages/de/live-build.de.7 +++ b/manpages/de/live-build.de.7 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 7 2012\-12\-16 4.0~a4\-1 "Debian Live Project" +.TH LIVE\-BUILD 7 2012\-12\-17 4.0~a4\-1 "Debian Live Project" .SH NAME \fBlive\-build\fP \- the Debian Live tool suite diff --git a/manpages/en/lb.1 b/manpages/en/lb.1 index f47fffec7..3278c3a20 100644 --- a/manpages/en/lb.1 +++ b/manpages/en/lb.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2012\-12\-16 4.0~a4-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2012\-12\-17 4.0~a4-1 "Debian Live Project" .SH NAME \fBlb\fR \- wrapper for live\-build programs diff --git a/manpages/en/lb_binary.1 b/manpages/en/lb_binary.1 index 48f567884..e4836b56d 100644 --- a/manpages/en/lb_binary.1 +++ b/manpages/en/lb_binary.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2012\-12\-16 4.0~a4-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2012\-12\-17 4.0~a4-1 "Debian Live Project" .SH NAME \fBlb binary\fR \- Complete the binary stage diff --git a/manpages/en/lb_bootstrap.1 b/manpages/en/lb_bootstrap.1 index cad2a32f6..3f53c0912 100644 --- a/manpages/en/lb_bootstrap.1 +++ b/manpages/en/lb_bootstrap.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2012\-12\-16 4.0~a4-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2012\-12\-17 4.0~a4-1 "Debian Live Project" .SH NAME \fBlb bootstrap\fR \- Complete the bootstrap stage diff --git a/manpages/en/lb_build.1 b/manpages/en/lb_build.1 index d0430dc58..e19bc98f0 100644 --- a/manpages/en/lb_build.1 +++ b/manpages/en/lb_build.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2012\-12\-16 4.0~a4-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2012\-12\-17 4.0~a4-1 "Debian Live Project" .SH NAME \fBlb build\fR \- Complete the bootstrap, chroot, binary, and source stages diff --git a/manpages/en/lb_chroot.1 b/manpages/en/lb_chroot.1 index ed7b687d7..772d61ecb 100644 --- a/manpages/en/lb_chroot.1 +++ b/manpages/en/lb_chroot.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2012\-12\-16 4.0~a4-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2012\-12\-17 4.0~a4-1 "Debian Live Project" .SH NAME \fBlb chroot\fR \- Complete the chroot stage diff --git a/manpages/en/lb_clean.1 b/manpages/en/lb_clean.1 index 5be1c6491..420734f3b 100644 --- a/manpages/en/lb_clean.1 +++ b/manpages/en/lb_clean.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2012\-12\-16 4.0~a4-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2012\-12\-17 4.0~a4-1 "Debian Live Project" .SH NAME \fBlb clean\fR \- Clean build directory diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1 index 513df1720..25a047f86 100644 --- a/manpages/en/lb_config.1 +++ b/manpages/en/lb_config.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2012\-12\-16 4.0~a4-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2012\-12\-17 4.0~a4-1 "Debian Live Project" .SH NAME \fBlb config\fR \- Create config directory @@ -173,7 +173,7 @@ .br [\fB\-\-mirror\-debian\-installer\fR \fIURL\fR] .br - [\fB\-\-mode\fR debian|emdebian|progress-linux|ubuntu|kubuntu] + [\fB\-\-mode\fR debian|emdebian|progress-linux|ubuntu] .br [\fB\-\-system\fR live|normal] .br diff --git a/manpages/en/lb_source.1 b/manpages/en/lb_source.1 index 331736466..93118ea50 100644 --- a/manpages/en/lb_source.1 +++ b/manpages/en/lb_source.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2012\-12\-16 4.0~a4-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2012\-12\-17 4.0~a4-1 "Debian Live Project" .SH NAME \fBlb source\fR \- Complete the source stage diff --git a/manpages/en/lb_testroot.1 b/manpages/en/lb_testroot.1 index 9e8c48688..d03118305 100644 --- a/manpages/en/lb_testroot.1 +++ b/manpages/en/lb_testroot.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2012\-12\-16 4.0~a4-1 "Debian Live Project" +.TH LIVE\-BUILD 1 2012\-12\-17 4.0~a4-1 "Debian Live Project" .SH NAME \fBlb testroot\fR \- Ensure that a system is built as root diff --git a/manpages/en/live-build.7 b/manpages/en/live-build.7 index 86c801b8e..45ea6288e 100644 --- a/manpages/en/live-build.7 +++ b/manpages/en/live-build.7 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 7 2012\-12\-16 4.0~a4-1 "Debian Live Project" +.TH LIVE\-BUILD 7 2012\-12\-17 4.0~a4-1 "Debian Live Project" .SH NAME \fBlive\-build\fR \- the Debian Live tool suite diff --git a/manpages/po/de/lb.1.po b/manpages/po/de/lb.1.po index 62aed89b7..58235a6ab 100644 --- a/manpages/po/de/lb.1.po +++ b/manpages/po/de/lb.1.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-16 22:01+0100\n" +"POT-Creation-Date: 2012-12-17 13:48+0100\n" "PO-Revision-Date: 2012-08-02 18:55+0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -29,7 +29,7 @@ msgstr "" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-16" +msgid "2012-12-17" msgstr "" #. type: TH diff --git a/manpages/po/de/lb_binary.1.po b/manpages/po/de/lb_binary.1.po index 7192d6338..8e87f5bfe 100644 --- a/manpages/po/de/lb_binary.1.po +++ b/manpages/po/de/lb_binary.1.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-16 22:01+0100\n" +"POT-Creation-Date: 2012-12-17 13:48+0100\n" "PO-Revision-Date: 2012-08-02 18:55+0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -29,7 +29,7 @@ msgstr "" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-16" +msgid "2012-12-17" msgstr "" #. type: TH diff --git a/manpages/po/de/lb_bootstrap.1.po b/manpages/po/de/lb_bootstrap.1.po index 02d24326e..9c9cee591 100644 --- a/manpages/po/de/lb_bootstrap.1.po +++ b/manpages/po/de/lb_bootstrap.1.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-16 22:01+0100\n" +"POT-Creation-Date: 2012-12-17 13:48+0100\n" "PO-Revision-Date: 2012-08-02 18:55+0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -29,7 +29,7 @@ msgstr "" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-16" +msgid "2012-12-17" msgstr "" #. type: TH diff --git a/manpages/po/de/lb_build.1.po b/manpages/po/de/lb_build.1.po index 5514a2b5c..2649795c6 100644 --- a/manpages/po/de/lb_build.1.po +++ b/manpages/po/de/lb_build.1.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-16 22:01+0100\n" +"POT-Creation-Date: 2012-12-17 13:48+0100\n" "PO-Revision-Date: 2012-08-02 18:55+0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -29,7 +29,7 @@ msgstr "" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-16" +msgid "2012-12-17" msgstr "" #. type: TH diff --git a/manpages/po/de/lb_chroot.1.po b/manpages/po/de/lb_chroot.1.po index 703c6c7e2..0e05d7a92 100644 --- a/manpages/po/de/lb_chroot.1.po +++ b/manpages/po/de/lb_chroot.1.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-16 22:01+0100\n" +"POT-Creation-Date: 2012-12-17 13:48+0100\n" "PO-Revision-Date: 2012-08-02 18:55+0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -29,7 +29,7 @@ msgstr "" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-16" +msgid "2012-12-17" msgstr "" #. type: TH diff --git a/manpages/po/de/lb_clean.1.po b/manpages/po/de/lb_clean.1.po index 2f8b30300..c35583202 100644 --- a/manpages/po/de/lb_clean.1.po +++ b/manpages/po/de/lb_clean.1.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-16 22:01+0100\n" +"POT-Creation-Date: 2012-12-17 13:48+0100\n" "PO-Revision-Date: 2012-08-02 18:55+0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -29,7 +29,7 @@ msgstr "" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-16" +msgid "2012-12-17" msgstr "" #. type: TH diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po index bcbb047f4..3a47da82e 100644 --- a/manpages/po/de/lb_config.1.po +++ b/manpages/po/de/lb_config.1.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-16 22:01+0100\n" +"POT-Creation-Date: 2012-12-17 13:48+0100\n" "PO-Revision-Date: 2012-08-02 18:55+0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -29,7 +29,7 @@ msgstr "" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-16" +msgid "2012-12-17" msgstr "" #. type: TH @@ -593,7 +593,7 @@ msgstr "" #. type: Plain text #: en/lb_config.1:177 -msgid " [B<--mode> debian|emdebian|progress-linux|ubuntu|kubuntu]" +msgid " [B<--mode> debian|emdebian|progress-linux|ubuntu]" msgstr "" #. type: Plain text diff --git a/manpages/po/de/lb_source.1.po b/manpages/po/de/lb_source.1.po index 020679a4c..e066c4e70 100644 --- a/manpages/po/de/lb_source.1.po +++ b/manpages/po/de/lb_source.1.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-16 22:01+0100\n" +"POT-Creation-Date: 2012-12-17 13:48+0100\n" "PO-Revision-Date: 2012-08-02 18:55+0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -29,7 +29,7 @@ msgstr "" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-16" +msgid "2012-12-17" msgstr "" #. type: TH diff --git a/manpages/po/de/lb_testroot.1.po b/manpages/po/de/lb_testroot.1.po index fa24101fb..9d7f810d2 100644 --- a/manpages/po/de/lb_testroot.1.po +++ b/manpages/po/de/lb_testroot.1.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-16 22:01+0100\n" +"POT-Creation-Date: 2012-12-17 13:48+0100\n" "PO-Revision-Date: 2012-08-02 18:55+0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -29,7 +29,7 @@ msgstr "" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-16" +msgid "2012-12-17" msgstr "" #. type: TH diff --git a/manpages/po/de/live-build.7.po b/manpages/po/de/live-build.7.po index 77b6c3943..8ca8477b2 100644 --- a/manpages/po/de/live-build.7.po +++ b/manpages/po/de/live-build.7.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-16 22:01+0100\n" +"POT-Creation-Date: 2012-12-17 13:48+0100\n" "PO-Revision-Date: 2012-08-02 18:55+0300\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -29,7 +29,7 @@ msgstr "" #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-16" +msgid "2012-12-17" msgstr "" #. type: TH diff --git a/manpages/pot/lb.1.pot b/manpages/pot/lb.1.pot index b18045cda..a361972f2 100644 --- a/manpages/pot/lb.1.pot +++ b/manpages/pot/lb.1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-16 22:01+0100\n" +"POT-Creation-Date: 2012-12-17 13:48+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/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-16" +msgid "2012-12-17" msgstr "" #. type: TH diff --git a/manpages/pot/lb_binary.1.pot b/manpages/pot/lb_binary.1.pot index bd95ff9ed..edb94372e 100644 --- a/manpages/pot/lb_binary.1.pot +++ b/manpages/pot/lb_binary.1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-16 22:01+0100\n" +"POT-Creation-Date: 2012-12-17 13:48+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/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-16" +msgid "2012-12-17" msgstr "" #. type: TH diff --git a/manpages/pot/lb_bootstrap.1.pot b/manpages/pot/lb_bootstrap.1.pot index cfd573136..b29aab3cb 100644 --- a/manpages/pot/lb_bootstrap.1.pot +++ b/manpages/pot/lb_bootstrap.1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-16 22:01+0100\n" +"POT-Creation-Date: 2012-12-17 13:48+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/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-16" +msgid "2012-12-17" msgstr "" #. type: TH diff --git a/manpages/pot/lb_build.1.pot b/manpages/pot/lb_build.1.pot index d2814045b..e45f36eaa 100644 --- a/manpages/pot/lb_build.1.pot +++ b/manpages/pot/lb_build.1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-16 22:01+0100\n" +"POT-Creation-Date: 2012-12-17 13:48+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/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-16" +msgid "2012-12-17" msgstr "" #. type: TH diff --git a/manpages/pot/lb_chroot.1.pot b/manpages/pot/lb_chroot.1.pot index 99ca73865..0a1935d20 100644 --- a/manpages/pot/lb_chroot.1.pot +++ b/manpages/pot/lb_chroot.1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-16 22:01+0100\n" +"POT-Creation-Date: 2012-12-17 13:48+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/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-16" +msgid "2012-12-17" msgstr "" #. type: TH diff --git a/manpages/pot/lb_clean.1.pot b/manpages/pot/lb_clean.1.pot index 7fd81a2d1..3f91337a0 100644 --- a/manpages/pot/lb_clean.1.pot +++ b/manpages/pot/lb_clean.1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-16 22:01+0100\n" +"POT-Creation-Date: 2012-12-17 13:48+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/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-16" +msgid "2012-12-17" msgstr "" #. type: TH diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot index a4bcd28d9..8a83400e8 100644 --- a/manpages/pot/lb_config.1.pot +++ b/manpages/pot/lb_config.1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-16 22:01+0100\n" +"POT-Creation-Date: 2012-12-17 13:48+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/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-16" +msgid "2012-12-17" msgstr "" #. type: TH @@ -593,7 +593,7 @@ msgstr "" #. type: Plain text #: en/lb_config.1:177 -msgid " [B<--mode> debian|emdebian|progress-linux|ubuntu|kubuntu]" +msgid " [B<--mode> debian|emdebian|progress-linux|ubuntu]" msgstr "" #. type: Plain text diff --git a/manpages/pot/lb_source.1.pot b/manpages/pot/lb_source.1.pot index 12edd89d5..3ea529fb8 100644 --- a/manpages/pot/lb_source.1.pot +++ b/manpages/pot/lb_source.1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-16 22:01+0100\n" +"POT-Creation-Date: 2012-12-17 13:48+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/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-16" +msgid "2012-12-17" msgstr "" #. type: TH diff --git a/manpages/pot/lb_testroot.1.pot b/manpages/pot/lb_testroot.1.pot index 316ef3085..c5bea6a31 100644 --- a/manpages/pot/lb_testroot.1.pot +++ b/manpages/pot/lb_testroot.1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-16 22:01+0100\n" +"POT-Creation-Date: 2012-12-17 13:48+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/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-16" +msgid "2012-12-17" msgstr "" #. type: TH diff --git a/manpages/pot/live-build.7.pot b/manpages/pot/live-build.7.pot index 17f2d0592..226a0ec48 100644 --- a/manpages/pot/live-build.7.pot +++ b/manpages/pot/live-build.7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2012-12-16 22:01+0100\n" +"POT-Creation-Date: 2012-12-17 13:48+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/lb_testroot.1:1 en/live-build.7:1 #, no-wrap -msgid "2012-12-16" +msgid "2012-12-17" msgstr "" #. type: TH diff --git a/scripts/build/binary_debian-installer b/scripts/build/binary_debian-installer index f5c9e12c1..b7665d781 100755 --- a/scripts/build/binary_debian-installer +++ b/scripts/build/binary_debian-installer @@ -342,7 +342,7 @@ then DI_REQ_PACKAGES="lilo grub grub-pc" case "${LB_MODE}" in - ubuntu|kubuntu) + ubuntu) DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic" ;; @@ -356,7 +356,7 @@ then DI_REQ_PACKAGES="elilo lilo grub grub-pc" case "${LB_MODE}" in - ubuntu|kubuntu) + ubuntu) case "${LB_DISTRIBUTION}" in precise) DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic-pae" @@ -377,7 +377,7 @@ then sparc) DI_REQ_PACKAGES="silo" case "${LB_MODE}" in - ubuntu|kubuntu) + ubuntu) DI_PACKAGES="${DI_REQ_PACKAGES} linux-sparc64" ;; @@ -390,7 +390,7 @@ then powerpc) DI_REQ_PACKAGES="yaboot" case "${LB_MODE}" in - ubuntu|kubuntu) + ubuntu) DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc-smp linux-image-powerpc64-smp linux-image-powerpc-e500 linux-image-powerpc-e500mc" ;; diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk index c71338a90..8b7a43c3f 100755 --- a/scripts/build/binary_disk +++ b/scripts/build/binary_disk @@ -66,12 +66,6 @@ case "${LB_MODE}" in TRACE="" ;; - kubuntu) - TITLE="Kubuntu" - STRING="Build ${ARCHITECTURE}" - TRACE="" - ;; - progress-linux) TITLE="Progress Linux" STRING="${VERSION} (${DISTRIBUTION}) - ${ARCHITECTURE}" diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs index 48c652878..1743ff169 100755 --- a/scripts/build/binary_rootfs +++ b/scripts/build/binary_rootfs @@ -147,7 +147,7 @@ case "${LB_CHROOT_FILESYSTEM}" in mv chroot/filesystem.${LB_CHROOT_FILESYSTEM} binary/${INITFS} case "${LB_MODE}" in - ubuntu|kubuntu) + ubuntu) du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size ;; esac @@ -357,7 +357,7 @@ case "${LB_CHROOT_FILESYSTEM}" in esac fi - if [ "${LB_MODE}" != "ubuntu" ] && [ "${LB_MODE}" != "kubuntu" ] + if [ "${LB_MODE}" != "ubuntu" ] then MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz" fi @@ -377,7 +377,7 @@ case "${LB_CHROOT_FILESYSTEM}" in rm -f chroot/chroot/excludes case "${LB_MODE}" in - ubuntu|kubuntu) + ubuntu) du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size ;; esac @@ -442,7 +442,7 @@ case "${LB_CHROOT_FILESYSTEM}" in mksquashfs chroot binary/${INITFS}/filesystem.squashfs ${MKSQUASHFS_OPTIONS} case "${LB_MODE}" in - ubuntu|kubuntu) + ubuntu) du -B 1 -s chroot | cut -f1 > binary/${INITFS}/filesystem.size ;; esac diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives index da8417ef0..99433cf4c 100755 --- a/scripts/build/chroot_archives +++ b/scripts/build/chroot_archives @@ -131,7 +131,7 @@ EOF fi ;; - ubuntu|kubuntu) + ubuntu) echo "deb ${LB_PARENT_MIRROR_CHROOT_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] @@ -196,7 +196,7 @@ EOF do # ubuntu workaround to allow using live.debian.net case "${LB_MODE}" in - ubuntu|kubuntu) + ubuntu) if [ "${REPOSITORY}" = "live.debian.net" ] then _DISTRIBUTION="sid" @@ -701,7 +701,7 @@ EOF fi ;; - ubuntu|kubuntu) + ubuntu) echo "deb ${LB_PARENT_MIRROR_BINARY_SECURITY} ${LB_PARENT_DISTRIBUTION}-security ${LB_PARENT_ARCHIVE_AREAS}" >> chroot/etc/apt/${_PARENT_FILE} if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] diff --git a/scripts/build/config b/scripts/build/config index 33429bb8d..4edb7cd86 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -100,7 +100,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--mirror-binary-updates URL]\n\ \t [--mirror-binary-backports URL]\n\ \t [--mirror-debian-installer URL]\n\ -\t [--mode debian|emdebian|ubuntu|kubuntu]\n\ +\t [--mode debian|emdebian|ubuntu]\n\ \t [--system live|normal]\n\ \t [--net-root-filesystem nfs|cfs]\n\ \t [--net-root-mountoptions OPTIONS]\n\ diff --git a/scripts/build/source_disk b/scripts/build/source_disk index 380fdd599..caca200c2 100755 --- a/scripts/build/source_disk +++ b/scripts/build/source_disk @@ -66,12 +66,6 @@ case "${LB_MODE}" in TRACE="" ;; - kubuntu) - TITLE="Kubuntu" - STRING="Build ${ARCHITECTURE}" - TRACE="" - ;; - progress-linux) TITLE="Progress Linux" STRING="${VERSION} (${DISTRIBUTION}) - ${ARCHITECTURE}" diff --git a/share/hooks/0150-remove-gnome-icon-cache.chroot b/share/hooks/0150-remove-gnome-icon-cache.chroot index f562fd939..ab35a1d68 100755 --- a/share/hooks/0150-remove-gnome-icon-cache.chroot +++ b/share/hooks/0150-remove-gnome-icon-cache.chroot @@ -4,6 +4,6 @@ set -e # Remove GNOME icon cache. # -# This saves space some space (e.g. on Kubuntu). +# This saves space some space. rm -f /usr/share/icons/*/icon-theme.cache |