Including firmware debs into d-i netboot initrds.

mdadm creates a /etc/mdadm/mdadm.conf configuration file
on package installation which contains array information
from the build system.

VERSION

@@ -1 +1 @@
-3.0~a68-1
+4.0~a8-1

bin/lb

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it

bin/live-build

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by

debian/changelog

@@ -1,3 +1,381 @@
+live-build (4.0~a8-1) experimental; urgency=low
+
+  [ Daniel Baumann ]
+  * Updating manpage year handling for 2013.
+  * Using cat instead of echo to workaround incompatible and conflicting
+    uses in escaping of \t in dash and bash, and less importantly to
+    workaround a false-positive in checkbashisms.
+  * Updating footer link to 'legal information' in cgi html template.
+  * Cleaning up binary_loadlin.
+  * Updating for twitter-bootstrap usage on live.debia.net in the cgi html
+    templates.
+  * Updating footer in cgi html template.
+  * Correcting spelling typo in html footer of the cgi, thanks to Jean-
+    Christophe Saint-Marc <jchristophe.stmarc@free.fr>.
+  * Removing reference to removed --package-lists option in lb_config
+    manpage (Closes: #698260).
+
+  [ Richard Nelson ]
+  * Correcting typo on functions/default.sh, thanks to jhcha54008
+    <jhcha54008@free.fr> (Closes: #698397).
+
+  [ Daniel Baumann ]
+  * Updating samhain workaround in chroot_dpkg to work if live-build is
+    being used with sudo or fakeroot (Closes: #698423).
+  * Correcting apt-key cleanup of local dummy signing keys when using
+    local packages, thanks to jhcha54008 <jhcha54008@free.fr>.
+  * Making xorriso option handling a bit more readable.
+  * Applying slightly modified patch from Raphaël Hertzog
+    <hertzog@debian.org> to fix automatic firmware inclusion when using
+    debian-installer with live-installer and having firmware packages
+    installed in the live system already.
+  * Adding config/control in example gitignore file.
+  * Adding 3.0~b6-1 changelog entries.
+  * Correcting variable default assignment for new configuration tree
+    layout.
+  * Avoiding to unconditionally adding whitespace separator to
+    config/control for existing configs.
+
+ -- Daniel Baumann <daniel@debian.org>  Sun, 20 Jan 2013 11:28:27 +0100
+
+live-build (4.0~a7-1) experimental; urgency=low
+
+  * Omitting binary manifest creation when chroot filesystem is set to
+    none.
+  * Omitting memtest in binary if chroot filesystem is set to none.
+  * Simplifying exit check in chroot_linux-image.
+  * Splitting off chroot firmware handling into an own script.
+  * Removing redundant check for linux-images in binary_linux-image.
+  * Correcting glitch with plain chroot filesystems in binary_chroot.
+  * Switching order of kernel flavours in defaults, the last added one in
+    the list becomes the default symlink target in the rootfs by apt.
+  * Dropping support for now unused includes feature in package lists.
+  * Using .cfg suffix for consistency with debian-installer on preseed
+    files in config/preseed.
+  * Adding sample gitignore file in examples.
+  * Setting debian-installer to false in all modes by default.
+  * Updating year in all copyright notices.
+  * Updating removal of backup files in stripped example hook to also work
+    with spaces in filenames.
+  * Don't fail when adding symlinks for firmware in binary/firmware for
+    debian-installer and the symlink already exists (Closes: #696688).
+  * Defaulting to obsolete md5 for checksums instead of sha256 on debian,
+    as debians cdrom-check in d-i only supports md5.
+  * Defaulting to obsolete filenames for checksums on debian, as debians
+    cdrom-check in d-i only supports legacy filenames (Closes: #697082).
+  * Correcting spelling typo in help text within the binary checksums
+    file.
+  * Also ignoring legacy checksum filenames when creating checksum files.
+  * Creating autorun.inf in binary_win32-loader.
+  * Dropping stable and unstable dist symlinks for d-i in dists for
+    wheezy.
+  * Creating install.bat for loadlin.
+  * Only including gtk d-i in win32-loader config if available on the
+    target image.
+  * Updating win32-loader.ini for wheezy.
+  * Correcting legacy filename for checksum files.
+  * Removing all checksum files in lb clean.
+  * Adding support for sha512 checksums.
+  * Dropping pre-wheezy handling for win32-loader files.
+  * Adding 3.0~b5-1 changelog entries.
+
+ -- Daniel Baumann <daniel@debian.org>  Wed, 02 Jan 2013 11:50:55 +0100
+
+live-build (4.0~a6-1) experimental; urgency=low
+
+  [ Daniel Baumann ]
+  * Moving removal of actual backup files for apt sources into correct
+    hook.
+  * Renumbering hooks.
+  * Disabling accidentally enabled removal of apt sources hook by default.
+  * Moving configuration version off as the first option into new config
+    tree format.
+  * Moving off binary image type into new config tree format.
+  * Moving off binary image architecture into new config tree format.
+  * Also reading in existing values from new config tree format.
+  * Separate between configured values and runtime values in new
+    configuration handling.
+  * Correcting architecture defaults.
+  * Using image name from configuration to name binary output files.
+  * Adding explicit warning for people that do not understand what stable
+    is.
+  * Using image name from configuration to name source output files.
+  * Setting default name to live-image for the time being.
+
+  [ Ben Armstrong ]
+  * Improving warning wording to reflect unfinished state of code better.
+
+  [ Daniel Baumann ]
+  * Including architecture in binary output filenames.
+  * Moving off binary image archive areas into new config tree format.
+  * Updating comment for image name config handling.
+  * Moving off binary image parent archive areas into new config tree
+    format.
+  * Only writing out Parent-Archive-Areas field into configuration when
+    building a derivative.
+
+  [ Richard Nelson ]
+  * Unify _DEBUG variable values to be true or false for l-b-cgi.
+
+  [ Daniel Baumann ]
+  * Removing pre-wheezy grub package from binary_debian-installer.
+  * Adding 3.0~b4-1 changelog entries.
+
+ -- Daniel Baumann <daniel@debian.org>  Sun, 23 Dec 2012 10:54:24 +0100
+
+live-build (4.0~a5-1) experimental; urgency=low
+
+  * Removing old code in chroot_hacks for tasks which are not used
+    anymore.
+  * Moving kexec-tools default preseeding into its own hook script.
+  * Removing loop-aes-utils related hack for squeeze.
+  * Moving removal of backup and temporary files to their own hook script.
+  * Adding default hook to truncate log files.
+  * Also removing man chache in remove-temporary-files hook.
+  * Adding default hook to use newest nvidia version.
+  * Using consistent naming for default hooks.
+  * Adding default hook to use mesa glx renderer.
+  * Merging remove-linux-image-backups into remove-backup-files hook.
+  * Renumbering hooks.
+  * Correcting config tree version check for older versions.
+  * Correcting config tree version check for the current version.
+  * Removing some dead default handling code for global includes which do
+    not exist anymore.
+  * Removing kubuntu mode, it's not different anymore to standard ubuntu
+    mode.
+  * Adding 3.0~b3-1 changelog entries.
+
+ -- Daniel Baumann <daniel@debian.org>  Mon, 17 Dec 2012 20:32:41 +0100
+
+live-build (4.0~a4-1) experimental; urgency=low
+
+  [ Daniel Baumann ]
+  * Updating wheezy release number.
+  * Removing not really useful symlinks example hook.
+  * Adding default hook to remove mdadm configuration.
+  * Correcting spelling typo in bug script.
+  * Adding support for live-images configs and arbitrary configuration
+    directories in lb_config --config option.
+  * Avoid re-populating an already populated configuration tree when using
+    lb config --config.
+  * Updating removal of adjtime in a split out hook for wheezy.
+
+  [ Richard Nelson ]
+  * Update l-b-cgi frontend to support new git config structure.
+
+  [ Daniel Baumann ]
+  * Switching from genisoimage to xorriso.
+  * Adding 3.0~b2-1 changelog entries.
+
+ -- Daniel Baumann <daniel@debian.org>  Sun, 16 Dec 2012 22:01:58 +0100
+
+live-build (4.0~a3-1) experimental; urgency=low
+
+  [ Raphaël Hertzog ]
+  * Adding initial menu entries for debian-installer.
+
+  [ Daniel Baumann ]
+  * Removing local/bin by default in lb_clean too.
+  * Skipping creation of soon to be replaced config/templates directory.
+  * Adding 3.0~b1-1 changelog entries.
+
+ -- Daniel Baumann <daniel@debian.org>  Mon, 10 Dec 2012 20:40:05 +0100
+
+live-build (4.0~a2-1) experimental; urgency=low
+
+  * Removing some leftovers from stripped and minimal package lists.
+  * Updating powerpc kernel list on ubuntu.
+  * Adding dropped empty-line separator in defaults.
+  * Adding dropped empty-line separator in binary_debian-installer.
+  * Updating version config tree version check (Closes: #695091).
+  * Updating wording about regenerating config trees.
+  * Harmonizing apt configuration handling in chroot_archives.
+  * Adding support for local apt conf.d snippets in archive definitions
+    (Closes: #685791).
+  * Ensuring that functions are either sources locally or globally, but
+    not both.
+  * Adding proper header to build.sh include.
+  * Dropping ubuntu guards on firmware selection code, we're not enabling
+    firmware inclusion in ubuntu mode anyway.
+  * Adding 3.0~a69-1 changelog entries.
+
+ -- Daniel Baumann <daniel@debian.org>  Thu, 06 Dec 2012 21:17:32 +0100
+
+live-build (4.0~a1-1) experimental; urgency=low
+
+  * Dropping support for squeeze and squeeze-based distributions.
+
+ -- Daniel Baumann <daniel@debian.org>  Fri, 30 Nov 2012 15:22:32 +0100
+
+live-build (3.0~b6-1) unstable; urgency=low
+
+  [ Daniel Baumann ]
+  * Updating manpage year handling for 2013.
+  * Updating wheezy beta-release number.
+  * Using cat instead of echo to workaround incompatible and conflicting
+    uses in escaping of \t in dash and bash, and less importantly to
+    workaround a false-positive in checkbashisms.
+  * Updating footer link to 'legal information' in cgi html template.
+  * Cleaning up binary_loadlin.
+  * Updating for twitter-bootstrap usage on live.debia.net in the cgi html
+    templates.
+  * Updating footer in cgi html template.
+  * Correcting spelling typo in html footer of the cgi, thanks to Jean-
+    Christophe Saint-Marc <jchristophe.stmarc@free.fr>.
+  * Removing reference to removed --package-lists option in lb_config
+    manpage (Closes: #698260).
+
+  [ Richard Nelson ]
+  * Correcting typo on functions/default.sh, thanks to jhcha54008
+    <jhcha54008@free.fr> (Closes: #698397).
+
+  [ Daniel Baumann ]
+  * Updating samhain workaround in chroot_dpkg to work if live-build is
+    being used with sudo or fakeroot (Closes: #698423).
+  * Correcting apt-key cleanup of local dummy signing keys when using
+    local packages, thanks to jhcha54008 <jhcha54008@free.fr>.
+  * Falling back to use genisoimage when building squeeze iso-hybrid
+    images.
+  * Applying slightly modified patch from Raphaël Hertzog
+    <hertzog@debian.org> to fix automatic firmware inclusion when using
+    debian-installer with live-installer and having firmware packages
+    installed in the live system already.
+
+ -- Daniel Baumann <daniel@debian.org>  Sun, 20 Jan 2013 10:17:42 +0100
+
+live-build (3.0~b5-1) unstable; urgency=low
+
+  * Omitting binary manifest creation when chroot filesystem is set to
+    none.
+  * Omitting memtest in binary if chroot filesystem is set to none.
+  * Removing redundant check for linux-images in binary_linux-image.
+  * Correcting glitch with plain chroot filesystems in binary_chroot.
+  * Switching order of kernel flavours in defaults, the last added one in
+    the list becomes the default symlink target in the rootfs by apt.
+  * Using .cfg suffix for consistency with debian-installer on preseed
+    files in config/preseed.
+  * Adding sample gitignore file in examples.
+  * Setting debian-installer to false in all modes by default.
+  * Updating year in all copyright notices.
+  * Updating removal of backup files in stripped example hook to also work
+    with spaces in filenames.
+  * Don't fail when adding symlinks for firmware in binary/firmware for
+    debian-installer and the symlink already exists (Closes: #696688).
+  * Defaulting to obsolete md5 for checksums instead of sha256 on debian,
+    as debians cdrom-check in d-i only supports md5.
+  * Defaulting to obsolete filenames for checksums on debian, as debians
+    cdrom-check in d-i only supports legacy filenames (Closes: #697082).
+  * Correcting spelling typo in help text within the binary checksums
+    file.
+  * Also ignoring legacy checksum filenames when creating checksum files.
+  * Creating autorun.inf in binary_win32-loader.
+  * Dropping stable and unstable dist symlinks for d-i in dists for
+    wheezy.
+  * Creating install.bat for loadlin.
+  * Only including gtk d-i in win32-loader config if available on the
+    target image.
+  * Updating win32-loader.ini for wheezy.
+  * Correcting legacy filename for checksum files.
+  * Removing all checksum files in lb clean.
+  * Adding support for sha512 checksums.
+  * Dropping pre-squeeze handling for win32-loader files.
+
+ -- Daniel Baumann <daniel@debian.org>  Wed, 02 Jan 2013 11:45:30 +0100
+
+live-build (3.0~b4-1) unstable; urgency=low
+
+  [ Daniel Baumann ]
+  * Moving removal of actual backup files for apt sources into correct
+    hook.
+  * Renumbering hooks.
+  * Disabling accidentally enabled removal of apt sources hook by default.
+
+  [ Richard Nelson ]
+  * Unify _DEBUG variable values to be true or false for l-b-cgi.
+
+  [ Daniel Baumann ]
+  * Removing grub package from binary_debian-installer for wheezy.
+
+ -- Daniel Baumann <daniel@debian.org>  Sun, 23 Dec 2012 10:50:38 +0100
+
+live-build (3.0~b3-1) unstable; urgency=low
+
+  * Removing old code in chroot_hacks for tasks which are not used
+    anymore.
+  * Moving kexec-tools default preseeding into its own hook script.
+  * Marking loop-aes-utils related hack as squeeze only.
+  * Moving removal of backup and temporary files to their own hook script.
+  * Adding default hook to truncate log files.
+  * Also removing man chache in remove-temporary-files hook.
+  * Adding default hook to use newest nvidia version.
+  * Using consistent naming for default hooks.
+  * Adding default hook to use mesa glx renderer.
+  * Merging remove-linux-image-backups into remove-backup-files hook.
+  * Renumbering hooks.
+  * Correcting config tree version check for older versions.
+  * Correcting config tree version check for the current version.
+  * Removing some dead default handling code for global includes which do
+    not exist anymore.
+  * Removing kubuntu mode, it's not different anymore to standard ubuntu
+    mode.
+
+ -- Daniel Baumann <daniel@debian.org>  Mon, 17 Dec 2012 20:29:56 +0100
+
+live-build (3.0~b2-1) unstable; urgency=low
+
+  [ Daniel Baumann ]
+  * Updating wheezy release number.
+  * Removing not really useful symlinks example hook.
+  * Adding default hook to remove mdadm configuration.
+  * Correcting spelling typo in bug script.
+  * Adding support for live-images configs and arbitrary configuration
+    directories in lb_config --config option.
+  * Avoid re-populating an already populated configuration tree when using
+    lb config --config.
+  * Updating removal of adjtime in a split out hook for wheezy.
+
+  [ Richard Nelson ]
+  * Update l-b-cgi frontend to support new git config structure.
+
+  [ Daniel Baumann ]
+  * Switching from genisoimage to xorriso.
+
+ -- Daniel Baumann <daniel@debian.org>  Sun, 16 Dec 2012 21:57:11 +0100
+
+live-build (3.0~b1-1) unstable; urgency=low
+
+  [ Raphaël Hertzog ]
+  * Adding initial menu entries for debian-installer.
+
+  [ Daniel Baumann ]
+  * Removing local/bin by default in lb_clean too.
+  * Skipping creation of soon to be replaced config/templates directory.
+
+ -- Daniel Baumann <daniel@debian.org>  Mon, 10 Dec 2012 20:38:58 +0100
+
+live-build (3.0~a69-1) unstable; urgency=low
+
+  * Also avoiding to use xz compression for squashfs for kubuntu.
+  * Removing some leftovers from stripped and minimal package lists.
+  * Updating powerpc kernel list on ubuntu.
+  * Adding dropped empty-line separator in defaults.
+  * Adding dropped empty-line separator in binary_debian-installer.
+  * Updating wording about regenerating config trees.
+  * Correcting test for no config tree version number to match all other
+    cases, not just lower-than-1.
+  * Harmonizing apt configuration handling in chroot_archives.
+  * Adding support for local apt conf.d snippets in archive definitions
+    (Closes: #685791).
+  * Ensuring that functions are either sources locally or globally, but
+    not both.
+  * Adding proper header to build.sh include.
+  * Dropping ubuntu guards on firmware selection code, we're not enabling
+    firmware inclusion in ubuntu mode anyway.
+  * Adding back legacy filtering for firmware packages on squeeze when
+    contrib or non-free is not enabled.
+
+ -- Daniel Baumann <daniel@debian.org>  Thu, 06 Dec 2012 21:09:00 +0100
+
 live-build (3.0~a68-1) unstable; urgency=low
 
   [ Ben Armstrong ]
@@ -4206,7 +4584,7 @@ live-helper (1.0~a38-1) unstable; urgency=medium
   * Don't fail if resolv.conf is a symlink, thanks to David Madore
     <david.madore@ens.fr> (Closes: #457595).
   * Fixing changelog.
-  * Consistently using the pipe as seperator in sed commands now.
+  * Consistently using the pipe as separator in sed commands now.
   * Checking for /sys/class rather than /sys/kernel, avoids problem when
     running under OpenVZ which doesn't have sys/kernel, thanks to
     Takeshi Yaegashi <yaegashi@debian.org>.

debian/control

@@ -16,7 +16,7 @@ Recommends:
  live-boot-doc, live-config-doc, live-manual-html | live-manual, cpio,
  gnu-fdisk
 Suggests:
- dosfstools, genisoimage, git, loadlin, memtest86+ | memtest86, mtools, parted,
+ dosfstools, xorriso, git, loadlin, memtest86+ | memtest86, mtools, parted,
  squashfs-tools | mtd-tools, sudo | fakeroot, syslinux | grub,
  uuid-runtime, win32-loader
 Description: Live System Build Scripts

debian/copyright

@@ -4,7 +4,7 @@ Upstream-Contact: Debian Live Project <debian-live@lists.debian.org>
 Source: http://live.debian.net/archive/packages/live-build/
 
 Files: *
-Copyright: 2006-2012 Daniel Baumann <daniel@debian.org>
+Copyright: 2006-2013 Daniel Baumann <daniel@debian.org>
 License: GPL-3+
 
 Files: contrib/grub-splash/lenny
@@ -12,7 +12,7 @@ Copyright: n/a
 License: other
 
 Files: share/bootloaders/*/splash.svg.in
-Copyright: 2006-2012 Daniel Baumann <daniel@debian.org>
+Copyright: 2006-2013 Daniel Baumann <daniel@debian.org>
 License: other
 
 License: GPL-3+

debian/live-build.bug-presubj

@@ -1,9 +1,9 @@
 Before submitting a bug report against live-build, please make sure
-that you have read your guidlines for Debian Live bug reports:
+that you have read your guidelines for Debian Live bug reports:
 
   http://live.debian.net/manual/
 
-By providing the required information as outlined in the guidlines makes
+By providing the required information as outlined in the guidelines makes
 sure that we can optimally reproduce and fix bugs, not doing so wastes a
 lot of time for both the maintainers and the submitters.
 

debian/live-build.bug-script

@@ -6,7 +6,7 @@ DEFAULT_SETTINGS="/etc/live/build.conf"
 dpkg -l debootstrap cdebootstrap
 
 # Checking suggests
-dpkg -l dosfstools genisoimage loadlin memtest86+ memtest86 mtools parted squashfs-tools mtd-tools sudo fakeroot syslinux grub uuid-runtime win32-loader
+dpkg -l dosfstools xorriso loadlin memtest86+ memtest86 mtools parted squashfs-tools mtd-tools sudo fakeroot syslinux grub uuid-runtime win32-loader
 
 if [ -e "${DEFAULT_SETTINGS}" ]; then
 	echo "Contents of ${DEFAULT_SETTINGS}:"

debian/rules

@@ -15,7 +15,7 @@ override_dh_auto_install:
 	mv debian/live-build/usr/share/live/build/cgi debian/live-build-cgi/usr/share/live/build
 
 override_dh_builddeb:
-	dh_builddeb -- -Zxz -z9
+	dh_builddeb -- -Zxz
 
 override_dh_installchangelogs:
 	dh_installchangelogs docs/ChangeLog

debian/source/options

@@ -1,2 +1 @@
 compression = xz
-compression-level = 9

examples/gitignore

@@ -0,0 +1,31 @@
+binary/
+binary*.iso
+binary*.img
+binary*.tar*
+binary*.contents
+binary*.packages
+binary*.zsync
+
+.build/
+build.log
+
+cache/
+
+chroot/
+chroot.packages.*
+
+config/binary
+config/bootstrap
+config/chroot
+config/common
+config/source
+
+config/control
+
+source/
+source*.iso
+source*.img
+source*.tar*
+source*.contents
+source*.packages
+source*.zsync

examples/hooks/minimal.chroot

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it

examples/hooks/stripped.chroot

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -31,7 +31,7 @@ done
 apt-get autoremove --yes || true
 
 # Removing unused files
-find . -name *~ | xargs rm -f
+find . -name *~ -print0 | xargs -0 rm -f
 
 rm -rf /usr/include/*
 #rm -rf /usr/share/groff/*

examples/hooks/symlinks.chroot

@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# This is a hook for live-build(7) to install localepurge.
-# To enable it, copy or symlink this hook into your config/chroot_local-hooks
-# directory.
-#
-
-_PURGE=""
-
-if [ ! -x "$(which symlinks 2>/dev/null)" ]
-then
-	_PURGE="true"
-
-	apt-get install symlinks
-fi
-
-symlinks -c -r -s /
-
-if [ "${_PURGE}" = "true" ]
-then
-	apt-get remove --purge symlinks
-fi

frontends/cgi/live-build-cgi

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -22,8 +22,8 @@ fi
 
 _HOSTNAME="$(hostname -f)"
 
-# Turn on debug if enabled
+# Turn on debug if true
-if [ "${_DEBUG}" = "enabled" ]
+if [ "${_DEBUG}" = "true" ]
 then
 	set -x
 fi
@@ -64,16 +64,15 @@ else
 	_LB_CGIPACKAGES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])cgipackages=[-0-9a-zA-Z. _+]+' | cut -f 2 -d '=' | head -n1)
 
 	# CGI Config for git
-	_LB_CONFIG=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])config=[-a-z.]+' | cut -f 2 -d '=' | head -n1)
+	_LB_CONFIG=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])config=[-a-z]+' | cut -f 2 -d '=' | head -n1)
-	_LB_CONFIG="git://live.debian.net/git/${_LB_CONFIG}"
 
 	# Standard options
-	LB_BINARY_IMAGES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])binary_images=[-a-z]+' | cut -f 2 -d '=' | head -n1)
+	LIVE_IMAGE_TYPE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])binary_images=[-a-z]+' | cut -f 2 -d '=' | head -n1)
 	LB_DISTRIBUTION=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])distribution=[a-z]+' | cut -f 2 -d '=' | head -n1)
 
 	# Advanced bootstrap options
-	LB_ARCHITECTURES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])architectures=[0-9a-z]+' | cut -f 2 -d '=' | head -n1)
+	LIVE_IMAGE_ARCHITECTURE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])architectures=[0-9a-z]+' | cut -f 2 -d '=' | head -n1)
-	LB_ARCHIVE_AREAS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])archive_areas=[a-z]+' | cut -f 2 -d '=' | head -n1)
+	LIVE_IMAGE_ARCHIVE_AREAS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])archive_areas=[a-z]+' | cut -f 2 -d '=' | head -n1)
 
 	# Advanced chroot options
 	LB_CHROOT_FILESYSTEM=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])chroot_filesystem=[0-9a-z]+' | cut -f 2 -d '=' | head -n1)
@@ -124,12 +123,12 @@ else
 	sed -e "s/BUILD/${_BUILD}/g" \
 	    -e "s/EMAIL/${_EMAIL}/" \
 	    -e "s/QUEUENUM/${_QUEUENUM}/" \
-	    -e "s/LB_BINARY_IMAGES/${LB_BINARY_IMAGES}/" \
+	    -e "s/LIVE_IMAGE_TYPE/${LIVE_IMAGE_TYPE}/" \
 	    -e "s/LB_DISTRIBUTION/${LB_DISTRIBUTION}/" \
 	    -e "s#_LB_CONFIG#${_LB_CONFIG}#" \
 	    -e "s/_LB_CGIPACKAGES/${_LB_CGIPACKAGES}/" \
-	    -e "s/LB_ARCHITECTURES/${LB_ARCHITECTURES}/" \
+	    -e "s/LIVE_IMAGE_ARCHITECTURE/${LIVE_IMAGE_ARCHITECTURE}/" \
-	    -e "s/LB_ARCHIVE_AREAS/${LB_ARCHIVE_AREAS}/" \
+	    -e "s/LIVE_IMAGE_ARCHIVE_AREAS/${LIVE_IMAGE_ARCHIVE_AREAS}/" \
 	    -e "s/LB_CHROOT_FILESYSTEM/${LB_CHROOT_FILESYSTEM}/" \
 	    -e "s/LB_LINUX_FLAVOURS/${LB_LINUX_FLAVOURS}/" \
 	    -e "s/LB_SECURITY/${LB_SECURITY}/" \
@@ -170,12 +169,12 @@ _LB_CGIPACKAGES="${_LB_CGIPACKAGES}"
 _LB_CONFIG="${_LB_CONFIG}"
 
 # Standard options
-LB_BINARY_IMAGES="${LB_BINARY_IMAGES}"
+LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE}"
 LB_DISTRIBUTION="${LB_DISTRIBUTION}"
 
 # Advanced bootstrap options
-LB_ARCHITECTURES="${LB_ARCHITECTURES}"
+LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE}"
-LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS}"
+LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS}"
 
 # Advanced chroot options
 LB_CHROOT_FILESYSTEM="${LB_CHROOT_FILESYSTEM}"
@@ -203,7 +202,7 @@ LB_SOURCE="${LB_SOURCE}"
 EOF
 
 	echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: add web build (${_BUILD}) from ${REMOTE_ADDR}." >> /var/log/live
-	echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: options ${_BUILD} |email ${_EMAIL}|binary_images ${LB_BINARY_IMAGES}|distribution ${LB_DISTRIBUTION}|config ${_LB_CONFIG}|cgipackages ${_LB_CGIPACKAGES}|architectures ${LB_ARCHITECTURES}|archive_areas ${LB_ARCHIVE_AREAS}|chroot_filesystem ${LB_CHROOT_FILESYSTEM}|linux_flavours ${LB_LINUX_FLAVOURS}|security ${LB_SECURITY}|apt_indices ${LB_APT_INDICES}|bootappend_install ${LB_BOOTAPPEND_INSTALL}|bootappend_live ${LB_BOOTAPPEND_LIVE}|bootloader ${LB_BOOTLOADER}|debian_installer ${LB_DEBIAN_INSTALLER}|iso_application ${LB_ISO_APPLICATION}|iso_preparer ${LB_ISO_PREPARER}|iso_publisher ${LB_ISO_PUBLISHER}|iso_volume ${LB_ISO_VOLUME}|memtest ${LB_MEMTEST}|net_path ${LB_NET_ROOT_PATH}|net_server ${LB_NET_ROOT_SERVER}|source_images ${LB_SOURCE_IMAGES}|sources ${LB_SOURCE}" >> /var/log/live
+	echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: options ${_BUILD} |email ${_EMAIL}|binary_images ${LIVE_IMAGE_TYPE}|distribution ${LB_DISTRIBUTION}|config ${_LB_CONFIG}|cgipackages ${_LB_CGIPACKAGES}|architectures ${LIVE_IMAGE_ARCHITECTURE}|archive_areas ${LIVE_IMAGE_ARCHIVE_AREAS}|chroot_filesystem ${LB_CHROOT_FILESYSTEM}|linux_flavours ${LB_LINUX_FLAVOURS}|security ${LB_SECURITY}|apt_indices ${LB_APT_INDICES}|bootappend_install ${LB_BOOTAPPEND_INSTALL}|bootappend_live ${LB_BOOTAPPEND_LIVE}|bootloader ${LB_BOOTLOADER}|debian_installer ${LB_DEBIAN_INSTALLER}|iso_application ${LB_ISO_APPLICATION}|iso_preparer ${LB_ISO_PREPARER}|iso_publisher ${LB_ISO_PUBLISHER}|iso_volume ${LB_ISO_VOLUME}|memtest ${LB_MEMTEST}|net_path ${LB_NET_ROOT_PATH}|net_server ${LB_NET_ROOT_SERVER}|source_images ${LB_SOURCE_IMAGES}|sources ${LB_SOURCE}" >> /var/log/live
 fi
 
 sed -e "s/VERSION/${VERSION}/" "${_TEMPLATES}"/footer.html

frontends/cgi/live-build-cgi.cron

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -20,15 +20,15 @@ else
 fi
 
 # Exit if disabled
-if [ "${_WEBBUILD}" != "enabled" ]
+if [ "${_WEBBUILD}" != "true" ]
 then
 	exit 0
 fi
 
 _HOSTNAME="$(hostname -f)"
 
-# Turn on debug if enabled
+# Turn on debug if true
-if [ "${_DEBUG}" = "enabled" ]
+if [ "${_DEBUG}" = "true" ]
 then
 	set -x
 fi
@@ -64,46 +64,49 @@ then
 		. "${_FILE}"
 
 		# Clone the git config to target build directory
-		git clone ${_LB_CONFIG} "${_TEMPDIR}"/"${_BUILD}" >> /var/log/live
+		git clone ${_LB_GIT} "${_TEMPDIR}"/"${_BUILD}" >> /var/log/live
 		_ERRORGIT="${?}"
 
+		# Now set a variable for the correct build path
+		_BUILD_PATH="${_TEMPDIR}/${_BUILD}/images/${_LB_CONFIG}"
+
 		# Drop out some build data for information if something goes wrong.
 		echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build-cgi: begin web build (${_BUILD})." >> /var/log/live
 
 		# Creating directory for the config/package-lists
-		mkdir -p "${_TEMPDIR}"/"${_BUILD}"/config/package-lists
+		mkdir -p "${_BUILD_PATH}"/config/package-lists
 
 		# Add cgipackages.list.chroot
 		if [ -n "${_LB_CGIPACKAGES}" ]
 		then
-			echo "${_LB_CGIPACKAGES}" > "${_TEMPDIR}"/"${_BUILD}"/config/package-lists/cgipackages.list.chroot
+			echo "${_LB_CGIPACKAGES}" > "${_BUILD_PATH}"/config/package-lists/cgipackages.list.chroot
 		fi
 
 		_DATE_START="`date -R`"
-		echo "Begin: ${_DATE_START}" > "${_TEMPDIR}"/"${_BUILD}"/log
+		echo "Begin: ${_DATE_START}" > "${_BUILD_PATH}"/log
 
 		# Generating config here
 		if [ "${_ERRORGIT}" -eq "0" ]
 		then
-			cd "${_TEMPDIR}"/"${_BUILD}"
+			cd "${_BUILD_PATH}"
 			# Do config with git and stack on config file params to build
-			lb config --distribution "${LB_DISTRIBUTION}" --architectures "${LB_ARCHITECTURES}" --archive-areas "${LB_ARCHIVE_AREAS}" --chroot-filesystem "${LB_CHROOT_FILESYSTEM}" --linux-flavours "${LB_LINUX_FLAVOURS}" --security "${LB_SECURITY}" --apt-indices "${LB_APT_INDICES}" --bootappend-install "${LB_BOOTAPPEND_INSTALL}" --bootappend-live "${LB_BOOTAPPEND_LIVE}" --bootloader "${LB_BOOTLOADER}" --debian-installer "${LB_DEBIAN_INSTALLER}" --iso-application "${LB_ISO_APPLICATION}" --iso-preparer "${LB_ISO_PREPARER}" --iso-publisher "${LB_ISO_PUBLISHER}" --iso-volume "${LB_ISO_VOLUME}" --memtest "${LB_MEMTEST}" --net-root-path "${LB_NET_ROOT_PATH}" --net-root-server "${LB_NET_ROOT_SERVER}" --source-images "${LB_SOURCE_IMAGES}" --source "${LB_SOURCE}"
+			lb config --distribution "${LB_DISTRIBUTION}" --architectures "${LIVE_IMAGE_ARCHITECTURE}" --archive-areas "${LIVE_IMAGE_ARCHIVE_AREAS}" --chroot-filesystem "${LB_CHROOT_FILESYSTEM}" --linux-flavours "${LB_LINUX_FLAVOURS}" --security "${LB_SECURITY}" --apt-indices "${LB_APT_INDICES}" --bootappend-install "${LB_BOOTAPPEND_INSTALL}" --bootappend-live "${LB_BOOTAPPEND_LIVE}" --bootloader "${LB_BOOTLOADER}" --debian-installer "${LB_DEBIAN_INSTALLER}" --iso-application "${LB_ISO_APPLICATION}" --iso-preparer "${LB_ISO_PREPARER}" --iso-publisher "${LB_ISO_PUBLISHER}" --iso-volume "${LB_ISO_VOLUME}" --memtest "${LB_MEMTEST}" --net-root-path "${LB_NET_ROOT_PATH}" --net-root-server "${LB_NET_ROOT_SERVER}" --source-images "${LB_SOURCE_IMAGES}" --source "${LB_SOURCE}"
 			_ERRORCONFIG="${?}"
 		else
-			echo "Config stage skipped. The git clone produced an error: ${_ERRORGIT}" > "${_TEMPDIR}"/"${_BUILD}"/log
+			echo "Config stage skipped. The git clone produced an error: ${_ERRORGIT}" > "${_BUILD_PATH}"/log
 		fi
 
 		# Run build if config went ok
 		if [ "${_ERRORCONFIG}" -eq "0" ]
 		then
-			lb build >> "${_TEMPDIR}"/"${_BUILD}"/log 2>&1
+			lb build >> "${_BUILD_PATH}"/log 2>&1
 			_ERRORBUILD="${?}"
 		else
-			echo "Build stage skipped. Config produced an error: ${_ERRORCONFIG}" > "${_TEMPDIR}"/"${_BUILD}"/log
+			echo "Build stage skipped. Config produced an error: ${_ERRORCONFIG}" > "${_BUILD_PATH}"/log
 		fi
 
 		_DATE_END="`date -R`"
-		echo "End: ${_DATE_END}" >> "${_TEMPDIR}"/"${_BUILD}"/log
+		echo "End: ${_DATE_END}" >> "${_BUILD_PATH}"/log
 
 		# Creating image directory
 		mkdir -p "${_DESTDIR}"/"${_BUILD}"
@@ -112,10 +115,10 @@ then
 		if [ "${_ERRORGIT}" -eq "0" ] && [ "${_ERRORCONFIG}" -eq "0" ] && [ "${_ERRORBUILD}" -eq "0" ]
 		then
 			_STATUS="maybe-successful"
-			echo "${REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${LB_ARCHITECTURES}/${LB_DISTRIBUTION}/${_LB_CGIPACKAGES}\" 200 - \"-\" \"\"">>/var/log/live-cgi.builds
+			echo "${REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${LIVE_IMAGE_ARCHITECTURE}/${LB_DISTRIBUTION}/${_LB_CGIPACKAGES}\" 200 - \"-\" \"\"">>/var/log/live-cgi.builds
 		else
 			_STATUS="maybe-failed"
-			echo "${REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${LB_ARCHITECTURES}/${LB_DISTRIBUTION}/${_LB_CGIPACKAGES}\" 404 - \"-\" \"\"">>/var/log/live-cgi.builds
+			echo "${REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${LIVE_IMAGE_ARCHITECTURE}/${LB_DISTRIBUTION}/${_LB_CGIPACKAGES}\" 404 - \"-\" \"\"">>/var/log/live-cgi.builds
 		fi
 
 		sed -e "s/BUILD/${_BUILD}/g" \
@@ -139,23 +142,23 @@ EOF
 
 		# Moving binary image
 		#if ls "${_TEMPDIR}"/"${_BUILD}"/binary*.* > /dev/null 2>&1
-		if Find_files ${_TEMPDIR}/${_BUILD}/binary*.*
+		if Find_files ${_BUILD_PATH}/binary*.*
 		then
-			mv "${_TEMPDIR}"/"${_BUILD}"/binary*.* "${_DESTDIR}"/"${_BUILD}"
+			mv "${_BUILD_PATH}"/binary*.* "${_DESTDIR}"/"${_BUILD}"
 		fi
 
 		# Moving source image
 		#if ls "${_TEMPDIR}"/"${_BUILD}"/source.* > /dev/null 2>&1
-		if Find_files ${_TEMPDIR}/${_BUILD}/source.*
+		if Find_files ${_BUILD_PATH}/source.*
 		then
-			mv "${_TEMPDIR}"/"${_BUILD}"/source.* "${_DESTDIR}"/"${_BUILD}"
+			mv "${_BUILD_PATH}"/source.* "${_DESTDIR}"/"${_BUILD}"
 		fi
 
 		# Moving build
 		mv "${_TEMPDIR}"/"${_BUILD}".build "${_DESTDIR}"/"${_BUILD}"/build
 
 		# Moving log
-		mv "${_TEMPDIR}"/"${_BUILD}"/log "${_DESTDIR}"/"${_BUILD}"
+		mv "${_BUILD_PATH}"/log "${_DESTDIR}"/"${_BUILD}"
 
 		# Generating md5sum
 		cd "${_DESTDIR}"/"${_BUILD}"
@@ -167,21 +170,21 @@ EOF
 
 		# Unmounting devpts-live
 		#if ls "${_TEMPDIR}"/"${_BUILD}"/chroot/dev/pts/* > /dev/null 2>&1
-		if Find_files ${_TEMPDIR}/${_BUILD}/chroot/dev/pts/*
+		if Find_files ${_BUILD_PATH}/chroot/dev/pts/*
 		then
-			umount "${_TEMPDIR}"/${_BUILD}/chroot/dev/pts
+			umount "${_BUILD_PATH}"/chroot/dev/pts
 		fi
 
 		# Unmounting proc
-		if [ -f "${_TEMPDIR}"/"${_BUILD}"/chroot/proc/version ]
+		if [ -f "${_BUILD_PATH}"/chroot/proc/version ]
 		then
-			umount "${_TEMPDIR}"/"${_BUILD}"/chroot/proc
+			umount "${_BUILD_PATH}"/chroot/proc
 		fi
 
 		# Unmounting sysfs
-		if [ -d "${_TEMPDIR}"/"${_BUILD}"/chroot/sys/kernel ]
+		if [ -d "${_BUILD_PATH}"/chroot/sys/kernel ]
 		then
-			umount "${_TEMPDIR}"/${_BUILD}/chroot/sys
+			umount "${_BUILD_PATH}"/chroot/sys
 		fi
 
 		# Removing build directory

frontends/cgi/live-build-cgi.default

@@ -1,13 +1,15 @@
 # Defaults for /etc/cron.daily/live-build-cgi
 
-_WEBBUILD="disabled"
+_WEBBUILD="false"
 
 _MODE="debian"
 
-_DEBUG="disabled"
+_DEBUG="false"
 
 _DESTDIR="/srv/debian-live/build/www"
 _TEMPLATES="/usr/share/live/build/templates/cgi/${_MODE}"
 _TEMPDIR="/srv/debian-live/build/tmp"
 
 _SERVER="http://live.debian.net/build"
+
+_LB_GIT="git://live-systems.org/git/live-images.git"

functions/aliases.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it

functions/architectures.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -15,7 +15,7 @@ Check_architectures ()
 
 	for ARCHITECTURE in ${ARCHITECTURES}
 	do
-		if [ "$(echo ${LB_ARCHITECTURES} | grep ${ARCHITECTURE})" ]
+		if [ "$(echo ${LIVE_IMAGE_ARCHITECTURE} | grep ${ARCHITECTURE})" ]
 		then
 			VALID="true"
 			break
@@ -70,7 +70,7 @@ Check_crossarchitectures ()
 			;;
 	esac
 
-	if [ "${LB_ARCHITECTURES}" = "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" ]
+	if [ "${LIVE_IMAGE_ARCHITECTURE}" = "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" ]
 	then
 
 		if [ ! -e "${LB_BOOTSTRAP_QEMU_STATIC}" ]
@@ -93,10 +93,10 @@ Check_crossarchitectures ()
 
 Check_multiarchitectures ()
 {
-	if [ "$(echo ${LB_ARCHITECTURES} | wc -w)" -gt "1" ]
+	if [ "$(echo ${LIVE_IMAGE_ARCHITECTURE} | wc -w)" -gt "1" ]
 	then
 		# First, only support multiarch on iso
-		case "${LB_BINARY_IMAGES}" in
+		case "${LIVE_IMAGE_TYPE}" in
 			iso*)
 				# Assemble multi-arch
 				case "${LB_CURRENT_ARCHITECTURE}" in

functions/arguments.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it

functions/breakpoints.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it

functions/cache.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it

functions/chroot.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it

functions/color.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it

functions/common.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -12,4 +12,7 @@ PROGRAM="live-build"
 VERSION="$(if [ -e ${LIVE_BUILD}/VERSION ]; then cat ${LIVE_BUILD}/VERSION; else cat /usr/share/live/build/VERSION; fi)"
 CONFIG_VERSION="$(echo ${VERSION} | awk -F- '{ print $1 }')"
 
+# FIXME
+LIVE_BUILD_VERSION="${CONFIG_VERSION}"
+
 PATH="${PWD}/local/bin:${PATH}"

functions/conffile.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -16,7 +16,7 @@ Get_conffiles ()
 	else
 		for FILE in ${@}
 		do
-			FILES="${FILES} ${FILE} ${FILE}.${LB_ARCHITECTURES} ${FILE}.${DISTRIBUTION}"
+			FILES="${FILES} ${FILE} ${FILE}.${LIVE_IMAGE_ARCHITECTURE} ${FILE}.${DISTRIBUTION}"
 			FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lb_||')"
 			FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lb_||').${ARCHITECTURE}"
 			FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lb_||').${DISTRIBUTION}"

functions/configuration.sh

@@ -0,0 +1,38 @@
+#!/bin/sh
+
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+##
+## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
+
+
+Get_configuration ()
+{
+	_CONFIGURATION_FILE="${1}"
+	_FIELD_NAME="${2}"
+
+	if [ -e "${_CONFIGURATION_FILE}" ]
+	then
+		_FIELD_BODY="$(grep ^${_FIELD_NAME}: ${_CONFIGURATION_FILE} | awk '{ $1=""; print $0 }' | sed -e 's|^ ||')"
+	fi
+
+	echo ${_FIELD_BODY}
+}
+
+Set_configuration ()
+{
+	_CONFIGURATION_FILE="${1}"
+	_FIELD_NAME="${2}"
+	_FIELD_BODY="${3}"
+
+	if grep -qs "^${_FIELD_NAME}:" "${_CONFIGURATION_FILE}"
+	then
+		# Update configuration
+		sed -i -e "s|^${_FIELD_NAME}:.*$|${_FIELD_NAME}: ${_FIELD_BODY}|" "${_CONFIGURATION_FILE}"
+	else
+		# Append configuration
+		echo "${_FIELD_NAME}: ${_FIELD_BODY}" >> "${_CONFIGURATION_FILE}"
+	fi
+}

functions/cursor.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it

functions/defaults.sh

@@ -1,15 +1,90 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
 ## under certain conditions; see COPYING for details.
 
 
+New_configuration ()
+{
+	## Runtime
+
+	# Image: Architecture
+	if [ -x "/usr/bin/dpkg" ]
+	then
+		CURRENT_IMAGE_ARCHITECTURE="$(dpkg --print-architecture)"
+	else
+		case "$(uname -m)" in
+			x86_64)
+				CURRENT_IMAGE_ARCHITECTURE="amd64"
+				;;
+
+			i?86)
+				CURRENT_IMAGE_ARCHITECTURE="i386"
+				;;
+
+			*)
+				Echo_warning "Unable to determine current architecture, using ${CURRENT_IMAGE_ARCHITECTURE}"
+				;;
+		esac
+	fi
+
+
+	## Configuration
+
+	# Configuration-Version
+	LIVE_CONFIGURATION_VERSION="${LIVE_CONFIGURATION_VERSION:-$(Get_configuration config/control Configuration-Version)}"
+	LIVE_CONFIGURATION_VERSION="${LIVE_CONFIGURATION_VERSION:-${LIVE_BUILD_VERSION}}"
+	export LIVE_CONFIGURATION_VERSION
+
+	# Image: Name
+	LIVE_IMAGE_NAME="${LIVE_IMAGE_NAME:-$(Get_configuration config/control Name)}"
+	LIVE_IMAGE_NAME="${LIVE_IMAGE_NAME:-live-image}"
+	export LIVE_IMAGE_NAME
+
+	# Image: Architecture (FIXME: Support and default to 'any')
+	LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE:-$(Get_configuration config/control Architecture)}"
+	LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE:-${CURRENT_IMAGE_ARCHITECTURE}}"
+	export LIVE_IMAGE_ARCHITECTURE
+
+	# Image: Archive Areas
+	LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-$(Get_configuration config/control Archive-Areas)}"
+
+	case "${LB_MODE}" in
+		progress-linux)
+			LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-main contrib non-free}"
+			;;
+
+		ubuntu)
+			LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-main restricted}"
+			;;
+
+		*)
+			LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-main}"
+			;;
+	esac
+
+	export LIVE_IMAGE_ARCHIVE_AREAS
+
+	# Image: Archive Areas
+	LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-$(Get_configuration config/control Parent-Archive-Areas)}"
+	LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-${LIVE_IMAGE_ARCHIVE_AREAS}}"
+	export LIVE_IMAGE_PARENT_ARCHIVE_AREAS
+
+	# Image: Type
+	LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-$(Get_configuration config/control Type)}"
+	LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-iso-hybrid}"
+	export LIVE_IMAGE_TYPE
+}
+
 Set_defaults ()
 {
+	# FIXME
+	New_configuration
+
 	## config/common
 
 	if [ -e local/live-build ]
@@ -21,7 +96,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 +129,7 @@ Set_defaults ()
 			LB_DERIVATIVE="true"
 			;;
 
-		ubuntu|kubuntu)
+		ubuntu)
 			LB_DISTRIBUTION="${LB_DISTRIBUTION:-precise}"
 			LB_DERIVATIVE="false"
 			;;
@@ -68,11 +143,6 @@ Set_defaults ()
 	case "${LB_MODE}" in
 		progress-linux)
 			case "${LB_DISTRIBUTION}" in
-				artax|artax-backports)
-					LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-squeeze}"
-					LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION}}"
-					;;
-
 				baureo|baureo-backports)
 					LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-wheezy}"
 					LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION}}"
@@ -176,7 +246,7 @@ Set_defaults ()
 	case "${LB_SYSTEM}" in
 		live)
 			case "${LB_MODE}" in
-				ubuntu|kubuntu)
+				ubuntu)
 					LB_INITRAMFS="${LB_INITRAMFS:-casper}"
 					;;
 
@@ -195,7 +265,7 @@ Set_defaults ()
 
 	# Setting initsystem
 	case "${LB_MODE}" in
-		ubuntu|kubuntu)
+		ubuntu)
 			case "${LB_INITRAMFS}" in
 				live-boot)
 					LB_INITSYSTEM="${LB_INITSYSTEM:-upstart}"
@@ -204,15 +274,7 @@ Set_defaults ()
 			;;
 
 		progress-linux)
-			case "${LB_DISTRIBUTION}" in
+			LB_INITSYSTEM="${LB_INITSYSTEM:-systemd}"
-				artax|artax-backports)
-					LB_INITSYSTEM="${LB_INITSYSTEM:-sysvinit}"
-					;;
-
-				*)
-					LB_INITSYSTEM="${LB_INITSYSTEM:-systemd}"
-					;;
-			esac
 			;;
 
 		*)
@@ -273,23 +335,16 @@ Set_defaults ()
 		fi
 	fi
 
-	if [ "${LB_ARCHITECTURE}" = "i386" ] && [ "$(uname -m)" = "x86_64" ]
+	if [ "${LIVE_IMAGE_ARCHITECTURE}" = "i386" ] && [ "${CURRENT_IMAGE_ARCHITECTURE}" = "amd64" ]
 	then
+		# Use linux32 when building amd64 images on i386
 		_LINUX32="linux32"
 	else
 		_LINUX32=""
 	fi
 
 	# Setting tasksel
-	case "${LB_PARENT_DISTRIBUTION}" in
+	LB_TASKSEL="${LB_TASKSEL:-apt}"
-		squeeze)
-			LB_TASKSEL="${LB_TASKSEL:-tasksel}"
-			;;
-
-		*)
-			LB_TASKSEL="${LB_TASKSEL:-apt}"
-			;;
-	esac
 
 	# Setting root directory
 	case "${LB_MODE}" in
@@ -302,16 +357,8 @@ Set_defaults ()
 			;;
 	esac
 
-	# Setting includes
-	if [ -n "${LIVE_BUID}" ]
-	then
-		LB_INCLUDES="${LB_INCLUDES:-${LIVE_BUILD}/includes}"
-	else
-		LB_INCLUDES="${LB_INCLUDES:-/usr/share/live/build/includes}"
-	fi
-
 	# Setting templates
-	if [ -n "${LIVE_BUID}" ]
+	if [ -n "${LIVE_BUILD}" ]
 	then
 		LB_TEMPLATES="${LB_TEMPLATES:-${LIVE_BUILD}/templates}"
 	else
@@ -328,34 +375,6 @@ Set_defaults ()
 
 	## config/bootstrap
 
-	# Setting architecture value
-	if [ -z "${LB_ARCHITECTURES}" ]
-	then
-		if [ -x "/usr/bin/dpkg" ]
-		then
-			LB_ARCHITECTURES="$(dpkg --print-architecture)"
-		else
-			case "$(uname -m)" in
-				sparc|powerpc)
-					LB_ARCHITECTURES="$(uname -m)"
-					;;
-				x86_64)
-					LB_ARCHITECTURES="amd64"
-					;;
-				*)
-					if [ -e /lib64 ]
-					then
-						LB_ARCHITECTURES="amd64"
-					else
-						LB_ARCHITECTURES="i386"
-					fi
-
-					Echo_warning "Can't determine architecture, assuming ${LB_ARCHITECTURES}"
-					;;
-			esac
-		fi
-	fi
-
 	# Setting mirror to fetch packages from
 	case "${LB_MODE}" in
 		debian)
@@ -373,8 +392,8 @@ Set_defaults ()
 			LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://cdn.archive.progress-linux.org/progress/}"
 			;;
 
-		ubuntu|kubuntu)
+		ubuntu)
-			case "${LB_ARCHITECTURES}" in
+			case "${LIVE_IMAGE_ARCHITECTURE}" in
 				amd64|i386)
 					LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://archive.ubuntu.com/ubuntu/}"
 					;;
@@ -408,8 +427,8 @@ Set_defaults ()
 			LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-${LB_MIRROR_CHROOT}}"
 			;;
 
-		ubuntu|kubuntu)
+		ubuntu)
-			case "${LB_ARCHITECTURES}" in
+			case "${LIVE_IMAGE_ARCHITECTURE}" in
 				amd64|i386)
 					LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://security.ubuntu.com/ubuntu/}"
 					;;
@@ -430,8 +449,8 @@ Set_defaults ()
 			LB_MIRROR_CHROOT_UPDATES="${LB_MIRROR_CHROOT_UPDATES:-${LB_MIRROR_CHROOT}}"
 			;;
 
-		ubuntu|kubuntu)
+		ubuntu)
-			case "${LB_ARCHITECTURES}" in
+			case "${LIVE_IMAGE_ARCHITECTURE}" in
 				amd64|i386)
 					LB_MIRROR_CHROOT_UPDATES="${LB_MIRROR_CHROOT_UPDATES:-http://archive.ubuntu.com/ubuntu/}"
 					;;
@@ -484,8 +503,8 @@ Set_defaults ()
 			LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-${LB_MIRROR_BINARY}}"
 			;;
 
-		ubuntu|kubuntu)
+		ubuntu)
-			case "${LB_ARCHITECTURES}" in
+			case "${LIVE_IMAGE_ARCHITECTURE}" in
 				amd64|i386)
 					LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://archive.ubuntu.com/ubuntu/}"
 				;;
@@ -516,8 +535,8 @@ Set_defaults ()
 			LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-${LB_MIRROR_CHROOT}}"
 			;;
 
-		ubuntu|kubuntu)
+		ubuntu)
-			case "${LB_ARCHITECTURES}" in
+			case "${LIVE_IMAGE_ARCHITECTURE}" in
 				amd64|i386)
 					LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-http://security.ubuntu.com/ubuntu/}"
 					;;
@@ -543,8 +562,8 @@ Set_defaults ()
 			LB_MIRROR_BINARY_UPDATES="${LB_MIRROR_BINARY_UPDATES:-${LB_MIRROR_BINARY}}"
 			;;
 
-		ubuntu|kubuntu)
+		ubuntu)
-			case "${LB_ARCHITECTURES}" in
+			case "${LIVE_IMAGE_ARCHITECTURE}" in
 				amd64|i386)
 					LB_MIRROR_BINARY_UPDATES="${LB_MIRROR_BINARY_UPDATES:-http://archive.ubuntu.com/ubuntu/}"
 					;;
@@ -591,24 +610,6 @@ Set_defaults ()
 			;;
 	esac
 
-	# Setting archive areas value
-	case "${LB_MODE}" in
-		progress-linux)
-			LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main contrib non-free}"
-			LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-${LB_ARCHIVE_AREAS}}"
-			;;
-
-		ubuntu|kubuntu)
-			LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main restricted}"
-			LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-${LB_ARCHIVE_AREAS}}"
-			;;
-
-		*)
-			LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main}"
-			LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-${LB_ARCHIVE_AREAS}}"
-			;;
-	esac
-
 	## config/chroot
 
 	# Setting chroot filesystem
@@ -621,37 +622,30 @@ Set_defaults ()
 	LB_UNION_FILESYSTEM="${LB_UNION_FILESYSTEM:-aufs}"
 
 	# Setting distribution hooks
-	case "${LB_MODE}" in
+	LB_CHROOT_HOOKS="${LB_CHROOT_HOOKS:-disable-kexec-tools \
-		*)
+		remove-adjtime-configuration \
-			LB_CHROOT_HOOKS="${LB_CHROOT_HOOKS:-update-apt-file-cache \
+		remove-backup-files \
-				update-apt-xapian-index \
+		remove-dbus-machine-id \
-				update-mlocate-database \
+		remove-gnome-icon-cache \
-				remove-dbus-machine-id \
+		remove-log-files \
-				remove-openssh-server-host-keys \
+		remove-mdadm-configuration \
-				remove-python-py \
+		remove-openssh-server-host-keys \
-				remove-udev-persistent-rules \
+		remove-python-py \
-				remove-linux-image-backups}"
+		remove-temporary-files \
-			;;
+		remove-udev-persistent-rules \
-
+		update-apt-file-cache \
-		kubuntu)
+		update-apt-xapian-index \
-			LB_CHROOT_HOOKS="${LB_CHROOT_HOOKS:-update-apt-file-cache \
+		update-glx-alternative \
-				update-apt-xapian-index \
+		update-mlocate-database \
-				update-mlocate-database \
+		update-nvidia-alternative}"
-				remove-dbus-machine-id \
+		#remove-apt-sources-lists
-				remove-gnome-icon-cache \
-				remove-openssh-server-host-keys \
-				remove-python-py \
-				remove-udev-persistent-rules \
-				remove-linux-image-backups}"
-			;;
-	esac
 
 	# Setting interactive shell/X11/Xnest
 	LB_INTERACTIVE="${LB_INTERACTIVE:-false}"
 
 	# Setting keyring packages
 	case "${LB_MODE}" in
-		ubuntu|kubuntu)
+		ubuntu)
 			LB_KEYRING_PACKAGES="${LB_KEYRING_PACKAGES:-ubuntu-keyring}"
 			;;
 
@@ -661,10 +655,10 @@ Set_defaults ()
 	esac
 
 	# Setting linux flavour string
-	case "${LB_ARCHITECTURES}" in
+	case "${LIVE_IMAGE_ARCHITECTURE}" in
 		armel)
 			case "${LB_MODE}" in
-                                ubuntu|kubuntu)
+                                ubuntu)
 					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-omap}"
 					;;
 				*)
@@ -683,7 +677,7 @@ Set_defaults ()
 
 		amd64)
 			case "${LB_MODE}" in
-				ubuntu|kubuntu)
+				ubuntu)
 					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
 					;;
 
@@ -696,22 +690,15 @@ Set_defaults ()
 		i386)
 			case "${LB_MODE}" in
 				progress-linux)
-					case "${LB_DISTRIBUTION}" in
+					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-686-pae}"
-						artax)
-							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-686}"
-							;;
-
-						*)
-							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-686-pae}"
-							;;
-					esac
 					;;
 
-				ubuntu|kubuntu)
+				ubuntu)
 					case "${LB_DISTRIBUTION}" in
 						precise)
 							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic-pae}"
 							;;
+
 						*)
 							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
 							;;
@@ -719,23 +706,7 @@ Set_defaults ()
 					;;
 
 				*)
-					case "${LIST}" in
+					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-686-pae 486}"
-						stripped|minimal)
-							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486}"
-							;;
-
-						*)
-							case "${LB_PARENT_DISTRIBUTION}" in
-								squeeze)
-									LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686}"
-									;;
-
-								*)
-									LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686-pae}"
-									;;
-							esac
-							;;
-					esac
 					;;
 			esac
 			;;
@@ -743,7 +714,7 @@ Set_defaults ()
 		ia64)
 			case "${LB_MODE}" in
 				progress-linux)
-					Echo_error "Architecture ${LB_ARCHITECTURES} not supported in the ${LB_MODE} mode."
+					Echo_error "Architecture ${LIVE_IMAGE_ARCHITECTURE} not supported in the ${LB_MODE} mode."
 					exit 1
 					;;
 
@@ -756,40 +727,24 @@ Set_defaults ()
 		powerpc)
 			case "${LB_MODE}" in
 				progress-linux)
-					Echo_error "Architecture ${LB_ARCHITECTURES} not supported in the ${LB_MODE} mode."
+					Echo_error "Architecture ${LIVE_IMAGE_ARCHITECTURE} not supported in the ${LB_MODE} mode."
 					exit 1
 					;;
 
-				ubuntu|kubuntu)
+				ubuntu)
-					case "${LIST}" in
+					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc-smp powerpc64-smp e500 powerpc-e500mc}"
-						stripped|minimal)
-							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc-smp}"
-							;;
-
-						*)
-							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc-smp powerpc64-smp}"
-							;;
-					esac
 					;;
 
 				*)
-					case "${LIST}" in
+					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc64 powerpc}"
-						stripped|minimal)
-							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc}"
-							;;
-
-						*)
-							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc powerpc64}"
-							;;
-					esac
 					;;
 			esac
 			;;
 
 		s390)
 			case "${LB_MODE}" in
-				progress-linux|ubuntu|kubuntu)
+				progress-linux|ubuntu)
-					Echo_error "Architecture ${LB_ARCHITECTURES} not supported in the ${LB_MODE} mode."
+					Echo_error "Architecture ${LIVE_IMAGE_ARCHITECTURE} not supported in the ${LB_MODE} mode."
 					exit 1
 					;;
 
@@ -802,7 +757,7 @@ Set_defaults ()
 		sparc)
 			case "${LB_MODE}" in
 				progress-linux)
-					Echo_error "Architecture ${LB_ARCHITECTURES} not supported in the ${LB_MODE} mode."
+					Echo_error "Architecture ${LIVE_IMAGE_ARCHITECTURE} not supported in the ${LB_MODE} mode."
 					exit 1
 					;;
 
@@ -813,27 +768,19 @@ Set_defaults ()
 			;;
 
 		*)
-			Echo_error "Architecture(s) ${LB_ARCHITECTURES} not yet supported (FIXME)"
+			Echo_error "Architecture(s) ${LIVE_IMAGE_ARCHITECTURE} not yet supported (FIXME)"
 			exit 1
 			;;
 	esac
 
 	# Set linux packages
 	case "${LB_MODE}" in
-		ubuntu|kubuntu)
+		ubuntu)
 			LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES:-linux}"
 			;;
 
 		*)
-			case "${LB_PARENT_DISTRIBUTION}" in
+			LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES:-linux-image}"
-				squeeze)
-					LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES:-linux-image-2.6}"
-					;;
-
-				*)
-					LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES:-linux-image}"
-					;;
-			esac
 			;;
 	esac
 
@@ -862,7 +809,7 @@ Set_defaults ()
 	## config/binary
 
 	# Setting image filesystem
-	case "${LB_ARCHITECTURES}" in
+	case "${LIVE_IMAGE_ARCHITECTURE}" in
 		sparc)
 			LB_BINARY_FILESYSTEM="${LB_BINARY_FILESYSTEM:-ext4}"
 			;;
@@ -873,13 +820,13 @@ Set_defaults ()
 	esac
 
 	# Setting image type
-	case "${LB_ARCHITECTURES}" in
+	case "${LIVE_IMAGE_ARCHITECTURE}" in
 		amd64|i386)
-			LB_BINARY_IMAGES="${LB_BINARY_IMAGES:-iso-hybrid}"
+			LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-iso-hybrid}"
 			;;
 
 		*)
-			LB_BINARY_IMAGES="${LB_BINARY_IMAGES:-iso}"
+			LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-iso}"
 			;;
 	esac
 
@@ -897,7 +844,7 @@ Set_defaults ()
 	# Setting bootloader
 	if [ -z "${LB_BOOTLOADER}" ]
 	then
-		case "${LB_ARCHITECTURES}" in
+		case "${LIVE_IMAGE_ARCHITECTURE}" in
 			amd64|i386)
 				LB_BOOTLOADER="syslinux"
 				;;
@@ -913,7 +860,15 @@ Set_defaults ()
 	fi
 
 	# Setting checksums
-	LB_CHECKSUMS="${LB_CHECKSUMS:-sha256}"
+	case "${LB_MODE}" in
+		progress-linux)
+			LB_CHECKSUMS="${LB_CHECKSUMS:-sha256}"
+			;;
+
+		*)
+			LB_CHECKSUMS="${LB_CHECKSUMS:-md5}"
+			;;
+	esac
 
 	# Setting compression
 	LB_COMPRESSION="${LB_COMPRESSION:-none}"
@@ -927,15 +882,7 @@ Set_defaults ()
 	LB_BUILD_WITH_TMPFS="${LB_BUILD_WITH_TMPFS:-false}"
 
 	# Setting debian-installer option
-	case "${LB_MODE}" in
+	LB_DEBIAN_INSTALLER="${LB_DEBIAN_INSTALLER:-false}"
-		progress-linux)
-			LB_DEBIAN_INSTALLER="${LB_DEBIAN_INSTALLER:-live}"
-			;;
-
-		*)
-			LB_DEBIAN_INSTALLER="${LB_DEBIAN_INSTALLER:-false}"
-			;;
-	esac
 
 	LB_DEBIAN_INSTALLER_DISTRIBUTION="${LB_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_DISTRIBUTION}}"
 
@@ -984,14 +931,14 @@ Set_defaults ()
 
 	if [ -n "${LB_DEBIAN_INSTALLER_PRESEEDFILE}" ]
 	then
-		case "${LB_BINARY_IMAGES}" in
+		case "${LIVE_IMAGE_TYPE}" in
 			iso*)
 				_LB_BOOTAPPEND_PRESEED="file=/cdrom/install/${LB_DEBIAN_INSTALLER_PRESEEDFILE}"
 				;;
 
 			hdd*)
 				case "${LB_MODE}" in
-					ubuntu|kubuntu)
+					ubuntu)
 						if [ "${LB_DEBIAN_INSTALLER}" = "live" ]
 						then
 							_LB_BOOTAPPEND_PRESEED="file=/cdrom/install/${LB_DEBIAN_INSTALLER_PRESEEDFILE}"
@@ -1047,10 +994,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
@@ -1084,10 +1027,6 @@ Set_defaults ()
 		ubuntu)
 			LB_HDD_LABEL="${LB_HDD_LABEL:-UBUNTU}"
 			;;
-
-		kubuntu)
-			LB_HDD_LABEL="${LB_HDD_LABEL:-KUBUNTU}"
-			;;
 	esac
 
 	# Setting hdd size
@@ -1110,10 +1049,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
@@ -1121,12 +1056,12 @@ Set_defaults ()
 
 	# Setting loadlin option
 	case "${LB_MODE}" in
-		progress-linux|ubuntu|kubuntu)
+		progress-linux|ubuntu)
 
 			;;
 
 		*)
-			case "${LB_ARCHITECTURES}" in
+			case "${LIVE_IMAGE_ARCHITECTURE}" in
 				amd64|i386)
 					if [ "${LB_DEBIAN_INSTALLER}" != "false" ]
 					then
@@ -1145,12 +1080,12 @@ Set_defaults ()
 
 	# Setting win32-loader option
 	case "${LB_MODE}" in
-		progress-linux|ubuntu|kubuntu)
+		progress-linux|ubuntu)
 
 			;;
 
 		*)
-			case "${LB_ARCHITECTURES}" in
+			case "${LIVE_IMAGE_ARCHITECTURE}" in
 				amd64|i386)
 					if [ "${LB_DEBIAN_INSTALLER}" != "false" ]
 					then
@@ -1235,30 +1170,41 @@ Set_defaults ()
 
 Check_defaults ()
 {
-	if [ "${LB_CONFIG_VERSION}" ]
+	if [ -n "${LIVE_BUILD_VERSION}" ]
 	then
 		# We're only checking when we're actually running the checks
 		# that's why the check for emptyness of the version;
-		# however, as live-build always declares LB_CONFIG_VERSION
+		# however, as live-build always declares LIVE_BUILD_VERSION
 		# internally, this is safe assumption (no cases where it's unset,
 		# except when bootstrapping the functions/defaults etc.).
-		CURRENT_CONFIG_VERSION="$(echo ${LB_CONFIG_VERSION} | awk -F. '{ print $1 }')"
 
-		if [ ${CURRENT_CONFIG_VERSION} -ge 4 ]
+		CURRENT_CONFIGURATION_VERSION="$(echo ${LIVE_CONFIGURATION_VERSION} | awk -F. ' { print $1 }')"
-		then
-			Echo_error "This config tree is too new for this version of live-build (${VERSION})."
-			Echo_error "Aborting build, please get a new version of live-build."
 
-			exit 1
+		if [ -n "${CURRENT_CONFIGURATION_VERSION}" ]
-		elif [ ${CURRENT_CONFIG_VERSION} -eq 2 ]
 		then
-			Echo_error "This config tree is too old for this version of live-build (${VERSION})."
+			CORRECT_VERSION="$(echo ${LIVE_BUILD_VERSION} | awk -F. '{ print $1 }')"
-			Echo_error "Aborting build, please repopulate the config tree."
+			TOO_NEW_VERSION="$((${CORRECT_VERSION} + 1))"
-			exit 1
+			TOO_OLD_VERSION="$((${CORRECT_VERSION} - 1))"
-		elif [ ${CURRENT_CONFIG_VERSION} -lt 1 ]
+
-		then
+			if [ ${CURRENT_CONFIGURATION_VERSION} -ne ${CORRECT_VERSION} ]
-			Echo_warning "This config tree does not specify a format version or has an unknown version number."
+			then
-			Echo_warning "Continuing build, but it could lead to errors or different results. Please repopulate the config tree."
+				if [ ${CURRENT_CONFIGURATION_VERSION} -ge ${TOO_NEW_VERSION} ]
+				then
+					Echo_error "This config tree is too new for live-build (${VERSION})."
+					Echo_error "Aborting build, please update live-build."
+
+					exit 1
+				elif [ ${CURRENT_CONFIGURATION_VERSION} -le ${TOO_OLD_VERSION} ]
+				then
+					Echo_error "This config tree is too old for live-build (${VERSION})."
+					Echo_error "Aborting build, please update the configuration."
+
+					exit 1
+				else
+					Echo_warning "This configuration does not specify a version or has a unknown version."
+					Echo_warning "Continuing build, please correct the configuration."
+				fi
+			fi
 		fi
 	fi
 
@@ -1283,7 +1229,7 @@ Check_defaults ()
 		esac
 	fi
 
-	case "${LB_BINARY_IMAGES}" in
+	case "${LIVE_IMAGE_TYPE}" in
 		hdd*)
 			# grub or yaboot + hdd
 			case "${LB_BOOTLOADER}" in

functions/echo.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it

functions/exit.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it

functions/help.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it

functions/lockfile.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it

functions/losetup.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it

functions/man.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it

functions/packagelists.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -107,22 +107,6 @@ Expand_packagelist ()
 					_LB_ENABLED=1
 					;;
 
-				\#*)
-					if [ ${_LB_ENABLED} -ne 1 ]
-					then
-						continue
-					fi
-
-					# Find includes
-					_LB_INCLUDES="$(echo "${_LB_LINE}" | sed -n \
-						-e 's|^#<include> \([^ ]*\)|\1|gp' \
-						-e 's|^#include <\([^ ]*\)>|\1|gp')"
-
-					# Add to queue
-					_LB_EXPAND_QUEUE="$(echo ${_LB_EXPAND_QUEUE} ${_LB_INCLUDES} |
-						sed -e 's|[ ]*$||' -e 's|^[ ]*||')"
-					;;
-
 				*)
 					if [ ${_LB_ENABLED} -eq 1 ]
 					then

functions/packages.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it

functions/releases.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -9,13 +9,11 @@
 
 
 # Debian releases
-RELEASE_squeeze="6.0.6"
+RELEASE_wheezy="7.0~b4"
-RELEASE_wheezy="7.0~a2"
 RELEASE_jessie="8"
 RELEASE_sid="unstable"
 
 # Progress Linux releases
-RELEASE_artax="1.0"
 RELEASE_baureo="2.0"
 RELEASE_charon="unstable"
 

functions/stagefile.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it

functions/templates.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it

functions/usage.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it

functions/wrapper.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it

manpages/bin/update-version.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -35,7 +35,9 @@ do
 	then
 		for _FILE in po/${_LANGUAGE}/*.po
 		do
-			sed -i -e "s|^msgstr .*.2012\"$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" "${_FILE}"
+			sed -i  -e "s|^msgstr .*.2013-.*$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" \
+				-e "s|^msgstr .*.2013\"$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" \
+			"${_FILE}"
 		done
 	fi
 done
@@ -45,6 +47,8 @@ if ls po/pt_BR/*.po > /dev/null 2>&1
 then
 	for _FILE in po/pt_BR/*.po
 	do
-		sed -i -e "s|^msgstr .*-2012\"$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" "${_FILE}"
+		sed -i  -e "s|^msgstr .*.2013-.*$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" \
+			-e "s|^msgstr .*-2013\"$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" \
+		"${_FILE}"
 	done
 fi

manpages/de/lb.de.1

@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BUILD 1 2012\-11\-30 3.0~a68\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 20.01.2013 4.0~a8\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb\fP \- wrapper for live\-build programs

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\-11\-30 3.0~a68\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 20.01.2013 4.0~a8\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb binary\fP \- Complete the binary stage

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\-11\-30 3.0~a68\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 20.01.2013 4.0~a8\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb bootstrap\fP \- Complete the bootstrap stage

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\-11\-30 3.0~a68\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 20.01.2013 4.0~a8\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb build\fP \- Complete the bootstrap, chroot, binary, and source stages

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\-11\-30 3.0~a68\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 20.01.2013 4.0~a8\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb chroot\fP \- Complete the chroot stage

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\-11\-30 3.0~a68\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 20.01.2013 4.0~a8\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb clean\fP \- Clean build directory

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\-11\-30 3.0~a68\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 20.01.2013 4.0~a8\-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
@@ -199,8 +199,6 @@
   [\fB\-\-net\-cow\-server\fP \fIIP\fP|\fIHOSTNAME\fP]
 .br
   [\fB\-\-net\-tarball\fP true|false]
-.br
-  [\-p|\fB\-\-package\-lists\fP \fILIST\fP|\fI"LISTS"\fP]
 .br
   [\fB\-\-quiet\fP]
 .br
@@ -252,7 +250,7 @@ directory where \fBlb config\fP was executed.
 .\" FIXME
 Note: Currently \fBlb config\fP tries to be smart and sets defaults for some
 options depending on the setting of other options (e.g. which linux packages
-to be used depending on if a squeeze system gets build or not). This means
+to be used depending on if a wheezy system gets build or not). This means
 that when generating a new configuration, you should call \fBlb config\fP only
 once with all options specified. Calling it several times with only a subset
 of the options each can result in non working configurations. This is also
@@ -386,7 +384,7 @@ build the binary image or not by using and including the host systems
 tools. This is a very dangerous option, using the tools of the host system
 can lead to tainted and even non\-bootable images if the host systems version
 of the required tools (mainly these are the bootloaders such as syslinux,
-grub and yaboot, and the auxilliary tools such as dosfstools, genisoimage,
+grub and yaboot, and the auxilliary tools such as dosfstools, xorriso,
 squashfs\-tools and others) do not \fBexactely\fP match what is present at
 build\-time in the target distribution. Never do disable this option unless
 you are \fBexactely\fP sure what you are doing and have \fBcompletely\fP\fI
@@ -671,12 +669,6 @@ by default empty.
 defines if a compressed tarball should be created. Disabling this options
 leads to no tarball at all, the plain binary directory is considered the
 output in this case. Default is true.
-.IP "\-p|\fB\-\-package\-lists\fP \fILIST\fP|\(dq\fILISTS\fP\(dq" 4
-defines which lists available in /usr/share/live/build/package\-lists should
-be used. By default, this is set to standard. Note that in case you have
-local package lists, you don't need to list them here. Putting them into
-config/package\-lists is enough (the filename needs to have the .list suffix
-though).
 .IP \fB\-\-quiet\fP 4
 reduces the verbosity of messages output by \fBlb build\fP.
 .IP "\fB\-\-archives\fP \fIARCHIVE\fP|\(dq\fIARCHIVES\fP\(dq" 4
@@ -732,7 +724,7 @@ created. Default is 512MB.
 defines the syslinux theme to use. The theme suffix is the name of a
 directory in /usr/share/syslinux/themes/ provided by a package named
 syslinux\-theme\- plus the suffix. In debian mode, this defaults to
-debian\-squeeze.
+debian\-wheezy.
 .IP "\fB\-\-tasksel\fP apt|aptitude|tasksel" 4
 selects which program is used to install tasks. By default, this is set to
 tasksel.

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\-11\-30 3.0~a68\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 20.01.2013 4.0~a8\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb source\fP \- Complete the source stage

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\-11\-30 3.0~a68\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 20.01.2013 4.0~a8\-1 "Debian Live Project"
 
 .SH NAME
 \fBlb testroot\fP \- Ensure that a system is built as root

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\-11\-30 3.0~a68\-1 "Debian Live Project"
+.TH LIVE\-BUILD 7 20.01.2013 4.0~a8\-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-build\fP \- the Debian Live tool suite

manpages/en/lb.1

@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-11\-30 3.0~a68-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2013\-01\-20 4.0~a8-1 "Debian Live Project"
 
 .SH NAME
 \fBlb\fR \- wrapper for live\-build programs

manpages/en/lb_binary.1

@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-11\-30 3.0~a68-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2013\-01\-20 4.0~a8-1 "Debian Live Project"
 
 .SH NAME
 \fBlb binary\fR \- Complete the binary stage

manpages/en/lb_bootstrap.1

@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-11\-30 3.0~a68-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2013\-01\-20 4.0~a8-1 "Debian Live Project"
 
 .SH NAME
 \fBlb bootstrap\fR \- Complete the bootstrap stage

manpages/en/lb_build.1

@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-11\-30 3.0~a68-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2013\-01\-20 4.0~a8-1 "Debian Live Project"
 
 .SH NAME
 \fBlb build\fR \- Complete the bootstrap, chroot, binary, and source stages

manpages/en/lb_chroot.1

@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-11\-30 3.0~a68-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2013\-01\-20 4.0~a8-1 "Debian Live Project"
 
 .SH NAME
 \fBlb chroot\fR \- Complete the chroot stage

manpages/en/lb_clean.1

@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-11\-30 3.0~a68-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2013\-01\-20 4.0~a8-1 "Debian Live Project"
 
 .SH NAME
 \fBlb clean\fR \- Clean build directory

manpages/en/lb_config.1

@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-11\-30 3.0~a68-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2013\-01\-20 4.0~a8-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
@@ -194,8 +194,6 @@
 	[\fB\-\-net\-cow\-server\fR \fIIP\fR|\fIHOSTNAME\fR]
 .br
 	[\fB\-\-net\-tarball\fR true|false]
-.br
-	[\-p|\fB\-\-package\-lists\fR \fILIST\fR|\fI"LISTS"\fR]
 .br
 	[\fB\-\-quiet\fR]
 .br
@@ -240,7 +238,7 @@
 .\" FIXME
 \fBlb config\fR populates the configuration directory for live\-build. By default, this directory is named 'config' and is created in the current directory where \fBlb config\fR was executed.
 .PP
-Note: Currently \fBlb config\fR tries to be smart and sets defaults for some options depending on the setting of other options (e.g. which linux packages to be used depending on if a squeeze system gets build or not). This means that when generating a new configuration, you should call \fBlb config\fR only once with all options specified. Calling it several times with only a subset of the options each can result in non working configurations. This is also caused by the fact that \fBlb config\fR called with one option only changes that option, and leaves everything else as is unless its not defined. However, \fBlb config\fR does warn about know impossible or likely impossible combinations that would lead to non working live systems. If unsure, remove config/{binary,bootstrap,chroot,common,source} and call \fBlb config\fR again.
+Note: Currently \fBlb config\fR tries to be smart and sets defaults for some options depending on the setting of other options (e.g. which linux packages to be used depending on if a wheezy system gets build or not). This means that when generating a new configuration, you should call \fBlb config\fR only once with all options specified. Calling it several times with only a subset of the options each can result in non working configurations. This is also caused by the fact that \fBlb config\fR called with one option only changes that option, and leaves everything else as is unless its not defined. However, \fBlb config\fR does warn about know impossible or likely impossible combinations that would lead to non working live systems. If unsure, remove config/{binary,bootstrap,chroot,common,source} and call \fBlb config\fR again.
 .\" FIXME
 
 .SH OPTIONS
@@ -296,7 +294,7 @@ defines the compression program to be used to compress tarballs. Defaults to gzi
 .IP "\fB\-\-config\fR \fIGIT_URL\fR::\fIGIT_ID\fR" 4
 allows to bootstrap a config tree from a git repositories, optionally appended by a Git Id (branch, commit, tag, etc.).
 .IP "\fB\-\-build\-with\-chroot\fR true|false" 4
-defines whetever live\-build should use the tools from within the chroot to build the binary image or not by using and including the host systems tools. This is a very dangerous option, using the tools of the host system can lead to tainted and even non-bootable images if the host systems version of the required tools (mainly these are the bootloaders such as syslinux, grub and yaboot, and the auxilliary tools such as dosfstools, genisoimage, squashfs-tools and others) do not \fBexactely\fR match what is present at build-time in the target distribution. Never do disable this option unless you are \fBexactely\fR sure what you are doing and have \fBcompletely\fI understood its consequences.
+defines whetever live\-build should use the tools from within the chroot to build the binary image or not by using and including the host systems tools. This is a very dangerous option, using the tools of the host system can lead to tainted and even non-bootable images if the host systems version of the required tools (mainly these are the bootloaders such as syslinux, grub and yaboot, and the auxilliary tools such as dosfstools, xorriso, squashfs-tools and others) do not \fBexactely\fR match what is present at build-time in the target distribution. Never do disable this option unless you are \fBexactely\fR sure what you are doing and have \fBcompletely\fI understood its consequences.
 .IP "\fB\-\-chroot\-filesystem\fR ext2|ext3|ext4|squashfs|jffs2|none" 4
 defines which filesystem type should be used for the root filesystem image. If you use none, then no filesystem image is created and the root filesystem content is copied on the binary image filesystem as flat files. Depending on what binary filesystem you have choosen, it may not be possible to build with such a plain root filesystem, e.g. fat16/fat32 will not work as linux does not support to run directly on them.
 .IP "\fB\-\-clean\fR" 4
@@ -434,8 +432,6 @@ Example:
 sets the IP or hostname that will be configured in the bootloader configuration for the copy\-on\-write filesystem of your netboot image and is by default empty.
 .IP "\fB\-\-net\-tarball\fR true|false" 4
 defines if a compressed tarball should be created. Disabling this options leads to no tarball at all, the plain binary directory is considered the output in this case. Default is true.
-.IP "\-p|\fB\-\-package\-lists\fR \fILIST\fR|""\fILISTS\fR""" 4
-defines which lists available in /usr/share/live/build/package-lists should be used. By default, this is set to standard. Note that in case you have local package lists, you don't need to list them here. Putting them into config/package-lists is enough (the filename needs to have the .list suffix though).
 .IP "\fB\-\-quiet\fR" 4
 reduces the verbosity of messages output by \fBlb build\fR.
 .IP "\fB\-\-archives\fR \fIARCHIVE\fR|""\fIARCHIVES\fR""" 4
@@ -463,7 +459,7 @@ defines the path to a swap file to create in the binary image. Default is not to
 .IP "\fB\-\-swap\-file\-size\fR \fIMB\fR" 4
 defines what size in megabytes the swap file should be, if one is to be created. Default is 512MB.
 .IP "\fB\-\-syslinux\-theme\fR \fITHEME_SUFFIX\fR" 4
-defines the syslinux theme to use. The theme suffix is the name of a directory in /usr/share/syslinux/themes/ provided by a package named syslinux\-theme\- plus the suffix. In debian mode, this defaults to debian\-squeeze.
+defines the syslinux theme to use. The theme suffix is the name of a directory in /usr/share/syslinux/themes/ provided by a package named syslinux\-theme\- plus the suffix. In debian mode, this defaults to debian\-wheezy.
 .IP "\fB\-\-tasksel\fR apt|aptitude|tasksel" 4
 selects which program is used to install tasks. By default, this is set to tasksel.
 .IP "\fB\-\-templates\fR \fIPATH\fR" 4

manpages/en/lb_source.1

@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-11\-30 3.0~a68-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2013\-01\-20 4.0~a8-1 "Debian Live Project"
 
 .SH NAME
 \fBlb source\fR \- Complete the source stage

manpages/en/lb_testroot.1

@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-11\-30 3.0~a68-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2013\-01\-20 4.0~a8-1 "Debian Live Project"
 
 .SH NAME
 \fBlb testroot\fR \- Ensure that a system is built as root

manpages/en/live-build.7

@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 7 2012\-11\-30 3.0~a68-1 "Debian Live Project"
+.TH LIVE\-BUILD 7 2013\-01\-20 4.0~a8-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-build\fR \- the Debian Live tool suite

manpages/po/de/lb.1.po

@@ -1,18 +1,17 @@
-# German translations for live-build package
+# German translations for live-build
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 # This file is distributed under the same license as the live-build package.
-# Automatically generated, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-build VERSION\n"
+"Project-Id-Version: live-build 4.0~a7-1\n"
-"POT-Creation-Date: 2012-11-30 15:09+0100\n"
+"POT-Creation-Date: 2013-01-20 11:28+0100\n"
-"PO-Revision-Date: 2012-08-02 18:55+0300\n"
+"PO-Revision-Date: 2010-05-24 09:59+0300\n"
-"Last-Translator: Automatically generated\n"
+"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -29,15 +28,15 @@ 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-11-30"
+msgid "2013-01-20"
-msgstr ""
+msgstr "20.01.2013"
 
 #. 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/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "3.0~a68-1"
+msgid "4.0~a8-1"
 msgstr ""
 
 #. type: TH
@@ -81,7 +80,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:237 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:235 en/lb_source.1:9
 #: en/lb_testroot.1:9 en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -96,7 +95,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:246 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:244 en/lb_source.1:14
 #: en/lb_testroot.1:18 en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -112,7 +111,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:490 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:486 en/lb_source.1:17
 #: en/lb_testroot.1:21 en/live-build.7:219
 #, no-wrap
 msgid "FILES"
@@ -127,7 +126,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:497 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:493 en/lb_source.1:20
 #: en/lb_testroot.1:24 en/live-build.7:223
 #, no-wrap
 msgid "SEE ALSO"
@@ -135,21 +134,21 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:499 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:495 en/lb_source.1:22
 #: en/lb_testroot.1:26
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:505 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:501 en/lb_source.1:24
 #: en/lb_testroot.1:28 en/live-build.7:229
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:506 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:502 en/lb_source.1:25
 #: en/lb_testroot.1:29 en/live-build.7:230
 #, no-wrap
 msgid "HOMEPAGE"
@@ -157,7 +156,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:508 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:504 en/lb_source.1:27
 #: en/lb_testroot.1:31 en/live-build.7:232
 msgid ""
 "More information about live-build and the Debian Live project can be found "
@@ -167,7 +166,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:509 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:505 en/lb_source.1:28
 #: en/lb_testroot.1:32 en/live-build.7:233
 #, no-wrap
 msgid "BUGS"
@@ -175,7 +174,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:511 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:507 en/lb_source.1:30
 #: en/lb_testroot.1:34 en/live-build.7:235
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -186,7 +185,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:512 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:508 en/lb_source.1:31
 #: en/lb_testroot.1:35 en/live-build.7:236
 #, no-wrap
 msgid "AUTHOR"
@@ -194,7 +193,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:513 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:509 en/lb_source.1:32
 #: en/lb_testroot.1:36 en/live-build.7:237
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "

manpages/po/de/lb_binary.1.po

@@ -1,18 +1,17 @@
-# German translations for live-build package
+# German translations for live-build
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 # This file is distributed under the same license as the live-build package.
-# Automatically generated, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-build VERSION\n"
+"Project-Id-Version: live-build 4.0~a7-1\n"
-"POT-Creation-Date: 2012-11-30 15:09+0100\n"
+"POT-Creation-Date: 2013-01-20 11:28+0100\n"
-"PO-Revision-Date: 2012-08-02 18:55+0300\n"
+"PO-Revision-Date: 2010-05-24 09:59+0300\n"
-"Last-Translator: Automatically generated\n"
+"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -29,15 +28,15 @@ 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-11-30"
+msgid "2013-01-20"
-msgstr ""
+msgstr "20.01.2013"
 
 #. 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/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "3.0~a68-1"
+msgid "4.0~a8-1"
 msgstr ""
 
 #. type: TH
@@ -66,7 +65,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:237 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:235 en/lb_source.1:9
 #: en/lb_testroot.1:9 en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -74,7 +73,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:246 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:244 en/lb_source.1:14
 #: en/lb_testroot.1:18 en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -82,7 +81,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:490 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:486 en/lb_source.1:17
 #: en/lb_testroot.1:21 en/live-build.7:219
 #, no-wrap
 msgid "FILES"
@@ -97,7 +96,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:497 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:493 en/lb_source.1:20
 #: en/lb_testroot.1:24 en/live-build.7:223
 #, no-wrap
 msgid "SEE ALSO"
@@ -105,21 +104,21 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:499 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:495 en/lb_source.1:22
 #: en/lb_testroot.1:26
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:505 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:501 en/lb_source.1:24
 #: en/lb_testroot.1:28 en/live-build.7:229
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:506 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:502 en/lb_source.1:25
 #: en/lb_testroot.1:29 en/live-build.7:230
 #, no-wrap
 msgid "HOMEPAGE"
@@ -127,7 +126,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:508 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:504 en/lb_source.1:27
 #: en/lb_testroot.1:31 en/live-build.7:232
 msgid ""
 "More information about live-build and the Debian Live project can be found "
@@ -137,7 +136,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:509 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:505 en/lb_source.1:28
 #: en/lb_testroot.1:32 en/live-build.7:233
 #, no-wrap
 msgid "BUGS"
@@ -145,7 +144,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:511 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:507 en/lb_source.1:30
 #: en/lb_testroot.1:34 en/live-build.7:235
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -156,7 +155,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:512 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:508 en/lb_source.1:31
 #: en/lb_testroot.1:35 en/live-build.7:236
 #, no-wrap
 msgid "AUTHOR"
@@ -164,7 +163,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:513 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:509 en/lb_source.1:32
 #: en/lb_testroot.1:36 en/live-build.7:237
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "

manpages/po/de/lb_bootstrap.1.po

@@ -1,18 +1,17 @@
-# German translations for live-build package
+# German translations for live-build
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 # This file is distributed under the same license as the live-build package.
-# Automatically generated, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-build VERSION\n"
+"Project-Id-Version: live-build 4.0~a7-1\n"
-"POT-Creation-Date: 2012-11-30 15:09+0100\n"
+"POT-Creation-Date: 2013-01-20 11:28+0100\n"
-"PO-Revision-Date: 2012-08-02 18:55+0300\n"
+"PO-Revision-Date: 2010-05-24 09:59+0300\n"
-"Last-Translator: Automatically generated\n"
+"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -29,15 +28,15 @@ 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-11-30"
+msgid "2013-01-20"
-msgstr ""
+msgstr "20.01.2013"
 
 #. 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/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "3.0~a68-1"
+msgid "4.0~a8-1"
 msgstr ""
 
 #. type: TH
@@ -66,7 +65,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:237 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:235 en/lb_source.1:9
 #: en/lb_testroot.1:9 en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -74,7 +73,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:246 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:244 en/lb_source.1:14
 #: en/lb_testroot.1:18 en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -82,7 +81,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:490 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:486 en/lb_source.1:17
 #: en/lb_testroot.1:21 en/live-build.7:219
 #, no-wrap
 msgid "FILES"
@@ -97,7 +96,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:497 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:493 en/lb_source.1:20
 #: en/lb_testroot.1:24 en/live-build.7:223
 #, no-wrap
 msgid "SEE ALSO"
@@ -105,21 +104,21 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:499 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:495 en/lb_source.1:22
 #: en/lb_testroot.1:26
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:505 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:501 en/lb_source.1:24
 #: en/lb_testroot.1:28 en/live-build.7:229
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:506 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:502 en/lb_source.1:25
 #: en/lb_testroot.1:29 en/live-build.7:230
 #, no-wrap
 msgid "HOMEPAGE"
@@ -127,7 +126,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:508 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:504 en/lb_source.1:27
 #: en/lb_testroot.1:31 en/live-build.7:232
 msgid ""
 "More information about live-build and the Debian Live project can be found "
@@ -137,7 +136,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:509 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:505 en/lb_source.1:28
 #: en/lb_testroot.1:32 en/live-build.7:233
 #, no-wrap
 msgid "BUGS"
@@ -145,7 +144,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:511 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:507 en/lb_source.1:30
 #: en/lb_testroot.1:34 en/live-build.7:235
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -156,7 +155,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:512 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:508 en/lb_source.1:31
 #: en/lb_testroot.1:35 en/live-build.7:236
 #, no-wrap
 msgid "AUTHOR"
@@ -164,7 +163,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:513 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:509 en/lb_source.1:32
 #: en/lb_testroot.1:36 en/live-build.7:237
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "

manpages/po/de/lb_build.1.po

@@ -1,18 +1,17 @@
-# German translations for live-build package
+# German translations for live-build
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 # This file is distributed under the same license as the live-build package.
-# Automatically generated, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-build VERSION\n"
+"Project-Id-Version: live-build 4.0~a7-1\n"
-"POT-Creation-Date: 2012-11-30 15:09+0100\n"
+"POT-Creation-Date: 2013-01-20 11:28+0100\n"
-"PO-Revision-Date: 2012-08-02 18:55+0300\n"
+"PO-Revision-Date: 2010-05-24 09:59+0300\n"
-"Last-Translator: Automatically generated\n"
+"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -29,15 +28,15 @@ 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-11-30"
+msgid "2013-01-20"
-msgstr ""
+msgstr "20.01.2013"
 
 #. 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/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "3.0~a68-1"
+msgid "4.0~a8-1"
 msgstr ""
 
 #. type: TH
@@ -66,7 +65,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:237 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:235 en/lb_source.1:9
 #: en/lb_testroot.1:9 en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -74,7 +73,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:246 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:244 en/lb_source.1:14
 #: en/lb_testroot.1:18 en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -82,7 +81,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:490 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:486 en/lb_source.1:17
 #: en/lb_testroot.1:21 en/live-build.7:219
 #, no-wrap
 msgid "FILES"
@@ -90,7 +89,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:497 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:493 en/lb_source.1:20
 #: en/lb_testroot.1:24 en/live-build.7:223
 #, no-wrap
 msgid "SEE ALSO"
@@ -98,21 +97,21 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:499 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:495 en/lb_source.1:22
 #: en/lb_testroot.1:26
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:505 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:501 en/lb_source.1:24
 #: en/lb_testroot.1:28 en/live-build.7:229
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:506 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:502 en/lb_source.1:25
 #: en/lb_testroot.1:29 en/live-build.7:230
 #, no-wrap
 msgid "HOMEPAGE"
@@ -120,7 +119,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:508 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:504 en/lb_source.1:27
 #: en/lb_testroot.1:31 en/live-build.7:232
 msgid ""
 "More information about live-build and the Debian Live project can be found "
@@ -130,7 +129,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:509 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:505 en/lb_source.1:28
 #: en/lb_testroot.1:32 en/live-build.7:233
 #, no-wrap
 msgid "BUGS"
@@ -138,7 +137,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:511 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:507 en/lb_source.1:30
 #: en/lb_testroot.1:34 en/live-build.7:235
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -149,7 +148,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:512 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:508 en/lb_source.1:31
 #: en/lb_testroot.1:35 en/live-build.7:236
 #, no-wrap
 msgid "AUTHOR"
@@ -157,7 +156,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:513 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:509 en/lb_source.1:32
 #: en/lb_testroot.1:36 en/live-build.7:237
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "

manpages/po/de/lb_chroot.1.po

@@ -1,18 +1,17 @@
-# German translations for live-build package
+# German translations for live-build
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 # This file is distributed under the same license as the live-build package.
-# Automatically generated, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-build VERSION\n"
+"Project-Id-Version: live-build 4.0~a7-1\n"
-"POT-Creation-Date: 2012-11-30 15:09+0100\n"
+"POT-Creation-Date: 2013-01-20 11:28+0100\n"
-"PO-Revision-Date: 2012-08-02 18:55+0300\n"
+"PO-Revision-Date: 2010-05-24 09:59+0300\n"
-"Last-Translator: Automatically generated\n"
+"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -29,15 +28,15 @@ 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-11-30"
+msgid "2013-01-20"
-msgstr ""
+msgstr "20.01.2013"
 
 #. 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/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "3.0~a68-1"
+msgid "4.0~a8-1"
 msgstr ""
 
 #. type: TH
@@ -66,7 +65,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:237 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:235 en/lb_source.1:9
 #: en/lb_testroot.1:9 en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -74,7 +73,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:246 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:244 en/lb_source.1:14
 #: en/lb_testroot.1:18 en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -82,7 +81,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:490 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:486 en/lb_source.1:17
 #: en/lb_testroot.1:21 en/live-build.7:219
 #, no-wrap
 msgid "FILES"
@@ -97,7 +96,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:497 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:493 en/lb_source.1:20
 #: en/lb_testroot.1:24 en/live-build.7:223
 #, no-wrap
 msgid "SEE ALSO"
@@ -105,21 +104,21 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:499 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:495 en/lb_source.1:22
 #: en/lb_testroot.1:26
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:505 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:501 en/lb_source.1:24
 #: en/lb_testroot.1:28 en/live-build.7:229
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:506 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:502 en/lb_source.1:25
 #: en/lb_testroot.1:29 en/live-build.7:230
 #, no-wrap
 msgid "HOMEPAGE"
@@ -127,7 +126,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:508 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:504 en/lb_source.1:27
 #: en/lb_testroot.1:31 en/live-build.7:232
 msgid ""
 "More information about live-build and the Debian Live project can be found "
@@ -137,7 +136,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:509 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:505 en/lb_source.1:28
 #: en/lb_testroot.1:32 en/live-build.7:233
 #, no-wrap
 msgid "BUGS"
@@ -145,7 +144,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:511 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:507 en/lb_source.1:30
 #: en/lb_testroot.1:34 en/live-build.7:235
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -156,7 +155,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:512 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:508 en/lb_source.1:31
 #: en/lb_testroot.1:35 en/live-build.7:236
 #, no-wrap
 msgid "AUTHOR"
@@ -164,7 +163,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:513 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:509 en/lb_source.1:32
 #: en/lb_testroot.1:36 en/live-build.7:237
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "

manpages/po/de/lb_clean.1.po

@@ -1,18 +1,17 @@
-# German translations for live-build package
+# German translations for live-build
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 # This file is distributed under the same license as the live-build package.
-# Automatically generated, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-build VERSION\n"
+"Project-Id-Version: live-build 4.0~a7-1\n"
-"POT-Creation-Date: 2012-11-30 15:09+0100\n"
+"POT-Creation-Date: 2013-01-20 11:28+0100\n"
-"PO-Revision-Date: 2012-08-02 18:55+0300\n"
+"PO-Revision-Date: 2010-05-24 09:59+0300\n"
-"Last-Translator: Automatically generated\n"
+"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -29,15 +28,15 @@ 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-11-30"
+msgid "2013-01-20"
-msgstr ""
+msgstr "20.01.2013"
 
 #. 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/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "3.0~a68-1"
+msgid "4.0~a8-1"
 msgstr ""
 
 #. type: TH
@@ -66,7 +65,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:237 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:235 en/lb_source.1:9
 #: en/lb_testroot.1:9 en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -74,7 +73,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:246 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:244 en/lb_source.1:14
 #: en/lb_testroot.1:18 en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -82,7 +81,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:490 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:486 en/lb_source.1:17
 #: en/lb_testroot.1:21 en/live-build.7:219
 #, no-wrap
 msgid "FILES"
@@ -90,7 +89,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:497 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:493 en/lb_source.1:20
 #: en/lb_testroot.1:24 en/live-build.7:223
 #, no-wrap
 msgid "SEE ALSO"
@@ -98,21 +97,21 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:499 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:495 en/lb_source.1:22
 #: en/lb_testroot.1:26
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:505 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:501 en/lb_source.1:24
 #: en/lb_testroot.1:28 en/live-build.7:229
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:506 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:502 en/lb_source.1:25
 #: en/lb_testroot.1:29 en/live-build.7:230
 #, no-wrap
 msgid "HOMEPAGE"
@@ -120,7 +119,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:508 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:504 en/lb_source.1:27
 #: en/lb_testroot.1:31 en/live-build.7:232
 msgid ""
 "More information about live-build and the Debian Live project can be found "
@@ -130,7 +129,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:509 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:505 en/lb_source.1:28
 #: en/lb_testroot.1:32 en/live-build.7:233
 #, no-wrap
 msgid "BUGS"
@@ -138,7 +137,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:511 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:507 en/lb_source.1:30
 #: en/lb_testroot.1:34 en/live-build.7:235
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -149,7 +148,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:512 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:508 en/lb_source.1:31
 #: en/lb_testroot.1:35 en/live-build.7:236
 #, no-wrap
 msgid "AUTHOR"
@@ -157,7 +156,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:513 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:509 en/lb_source.1:32
 #: en/lb_testroot.1:36 en/live-build.7:237
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "

manpages/po/de/lb_source.1.po

@@ -1,18 +1,17 @@
-# German translations for live-build package
+# German translations for live-build
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 # This file is distributed under the same license as the live-build package.
-# Automatically generated, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-build VERSION\n"
+"Project-Id-Version: live-build 4.0~a7-1\n"
-"POT-Creation-Date: 2012-11-30 15:09+0100\n"
+"POT-Creation-Date: 2013-01-20 11:28+0100\n"
-"PO-Revision-Date: 2012-08-02 18:55+0300\n"
+"PO-Revision-Date: 2010-05-24 09:59+0300\n"
-"Last-Translator: Automatically generated\n"
+"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -29,15 +28,15 @@ 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-11-30"
+msgid "2013-01-20"
-msgstr ""
+msgstr "20.01.2013"
 
 #. 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/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "3.0~a68-1"
+msgid "4.0~a8-1"
 msgstr ""
 
 #. type: TH
@@ -66,7 +65,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:237 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:235 en/lb_source.1:9
 #: en/lb_testroot.1:9 en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -74,7 +73,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:246 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:244 en/lb_source.1:14
 #: en/lb_testroot.1:18 en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -82,7 +81,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:490 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:486 en/lb_source.1:17
 #: en/lb_testroot.1:21 en/live-build.7:219
 #, no-wrap
 msgid "FILES"
@@ -97,7 +96,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:497 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:493 en/lb_source.1:20
 #: en/lb_testroot.1:24 en/live-build.7:223
 #, no-wrap
 msgid "SEE ALSO"
@@ -105,21 +104,21 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:499 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:495 en/lb_source.1:22
 #: en/lb_testroot.1:26
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:505 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:501 en/lb_source.1:24
 #: en/lb_testroot.1:28 en/live-build.7:229
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:506 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:502 en/lb_source.1:25
 #: en/lb_testroot.1:29 en/live-build.7:230
 #, no-wrap
 msgid "HOMEPAGE"
@@ -127,7 +126,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:508 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:504 en/lb_source.1:27
 #: en/lb_testroot.1:31 en/live-build.7:232
 msgid ""
 "More information about live-build and the Debian Live project can be found "
@@ -137,7 +136,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:509 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:505 en/lb_source.1:28
 #: en/lb_testroot.1:32 en/live-build.7:233
 #, no-wrap
 msgid "BUGS"
@@ -145,7 +144,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:511 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:507 en/lb_source.1:30
 #: en/lb_testroot.1:34 en/live-build.7:235
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -156,7 +155,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:512 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:508 en/lb_source.1:31
 #: en/lb_testroot.1:35 en/live-build.7:236
 #, no-wrap
 msgid "AUTHOR"
@@ -164,7 +163,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:513 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:509 en/lb_source.1:32
 #: en/lb_testroot.1:36 en/live-build.7:237
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "

manpages/po/de/lb_testroot.1.po

@@ -1,18 +1,17 @@
-# German translations for live-build package
+# German translations for live-build
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 # This file is distributed under the same license as the live-build package.
-# Automatically generated, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-build VERSION\n"
+"Project-Id-Version: live-build 4.0~a7-1\n"
-"POT-Creation-Date: 2012-11-30 15:09+0100\n"
+"POT-Creation-Date: 2013-01-20 11:28+0100\n"
-"PO-Revision-Date: 2012-08-02 18:55+0300\n"
+"PO-Revision-Date: 2010-05-24 09:59+0300\n"
-"Last-Translator: Automatically generated\n"
+"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -29,15 +28,15 @@ 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-11-30"
+msgid "2013-01-20"
-msgstr ""
+msgstr "20.01.2013"
 
 #. 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/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "3.0~a68-1"
+msgid "4.0~a8-1"
 msgstr ""
 
 #. type: TH
@@ -66,7 +65,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:237 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:235 en/lb_source.1:9
 #: en/lb_testroot.1:9 en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -74,7 +73,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:246 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:244 en/lb_source.1:14
 #: en/lb_testroot.1:18 en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -82,7 +81,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:490 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:486 en/lb_source.1:17
 #: en/lb_testroot.1:21 en/live-build.7:219
 #, no-wrap
 msgid "FILES"
@@ -97,7 +96,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:497 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:493 en/lb_source.1:20
 #: en/lb_testroot.1:24 en/live-build.7:223
 #, no-wrap
 msgid "SEE ALSO"
@@ -105,21 +104,21 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:499 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:495 en/lb_source.1:22
 #: en/lb_testroot.1:26
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:505 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:501 en/lb_source.1:24
 #: en/lb_testroot.1:28 en/live-build.7:229
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:506 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:502 en/lb_source.1:25
 #: en/lb_testroot.1:29 en/live-build.7:230
 #, no-wrap
 msgid "HOMEPAGE"
@@ -127,7 +126,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:508 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:504 en/lb_source.1:27
 #: en/lb_testroot.1:31 en/live-build.7:232
 msgid ""
 "More information about live-build and the Debian Live project can be found "
@@ -137,7 +136,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:509 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:505 en/lb_source.1:28
 #: en/lb_testroot.1:32 en/live-build.7:233
 #, no-wrap
 msgid "BUGS"
@@ -145,7 +144,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:511 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:507 en/lb_source.1:30
 #: en/lb_testroot.1:34 en/live-build.7:235
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -156,7 +155,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:512 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:508 en/lb_source.1:31
 #: en/lb_testroot.1:35 en/live-build.7:236
 #, no-wrap
 msgid "AUTHOR"
@@ -164,7 +163,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:513 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:509 en/lb_source.1:32
 #: en/lb_testroot.1:36 en/live-build.7:237
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "

manpages/po/de/live-build.7.po

@@ -1,18 +1,17 @@
-# German translations for live-build package
+# German translations for live-build
-# Copyright (C) 2012 Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 # This file is distributed under the same license as the live-build package.
-# Automatically generated, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-build VERSION\n"
+"Project-Id-Version: live-build 4.0~a7-1\n"
-"POT-Creation-Date: 2012-11-30 15:09+0100\n"
+"POT-Creation-Date: 2013-01-20 11:28+0100\n"
-"PO-Revision-Date: 2012-08-02 18:55+0300\n"
+"PO-Revision-Date: 2010-05-24 09:59+0300\n"
-"Last-Translator: Automatically generated\n"
+"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
@@ -29,15 +28,15 @@ 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-11-30"
+msgid "2013-01-20"
-msgstr ""
+msgstr "20.01.2013"
 
 #. 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/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "3.0~a68-1"
+msgid "4.0~a8-1"
 msgstr ""
 
 #. type: TH
@@ -66,7 +65,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:237 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:235 en/lb_source.1:9
 #: en/lb_testroot.1:9 en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -74,7 +73,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:246 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:244 en/lb_source.1:14
 #: en/lb_testroot.1:18 en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -82,7 +81,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:490 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:486 en/lb_source.1:17
 #: en/lb_testroot.1:21 en/live-build.7:219
 #, no-wrap
 msgid "FILES"
@@ -90,7 +89,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:497 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:493 en/lb_source.1:20
 #: en/lb_testroot.1:24 en/live-build.7:223
 #, no-wrap
 msgid "SEE ALSO"
@@ -98,14 +97,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:505 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:501 en/lb_source.1:24
 #: en/lb_testroot.1:28 en/live-build.7:229
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:506 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:502 en/lb_source.1:25
 #: en/lb_testroot.1:29 en/live-build.7:230
 #, no-wrap
 msgid "HOMEPAGE"
@@ -113,7 +112,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:508 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:504 en/lb_source.1:27
 #: en/lb_testroot.1:31 en/live-build.7:232
 msgid ""
 "More information about live-build and the Debian Live project can be found "
@@ -123,7 +122,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:509 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:505 en/lb_source.1:28
 #: en/lb_testroot.1:32 en/live-build.7:233
 #, no-wrap
 msgid "BUGS"
@@ -131,7 +130,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:511 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:507 en/lb_source.1:30
 #: en/lb_testroot.1:34 en/live-build.7:235
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -142,7 +141,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:512 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:508 en/lb_source.1:31
 #: en/lb_testroot.1:35 en/live-build.7:236
 #, no-wrap
 msgid "AUTHOR"
@@ -150,7 +149,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:513 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:509 en/lb_source.1:32
 #: en/lb_testroot.1:36 en/live-build.7:237
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
@@ -158,36 +157,36 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:318 en/live-build.7:36
+#: en/lb_config.1:316 en/live-build.7:36
 #, no-wrap
 msgid "B<--debug>"
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:330 en/live-build.7:38
+#: en/lb_config.1:328 en/live-build.7:38
 #, no-wrap
 msgid "B<--force>"
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:439 en/live-build.7:40
+#: en/lb_config.1:435 en/live-build.7:40
 #, no-wrap
 msgid "B<--quiet>"
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:479 en/live-build.7:42
+#: en/lb_config.1:475 en/live-build.7:42
 #, no-wrap
 msgid "B<--verbose>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:501 en/live-build.7:225
+#: en/lb_config.1:497 en/live-build.7:225
 msgid "I<live-boot>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:503 en/live-build.7:227
+#: en/lb_config.1:499 en/live-build.7:227
 msgid "I<live-config>(7)"
 msgstr ""
 

manpages/pot/lb.1.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-11-30 15:09+0100\n"
+"POT-Creation-Date: 2013-01-20 11:28+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-11-30"
+msgid "2013-01-20"
 msgstr ""
 
 #. type: TH
@@ -37,7 +37,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "3.0~a68-1"
+msgid "4.0~a8-1"
 msgstr ""
 
 #. type: TH
@@ -81,7 +81,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:237 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:235 en/lb_source.1:9
 #: en/lb_testroot.1:9 en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -96,7 +96,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:246 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:244 en/lb_source.1:14
 #: en/lb_testroot.1:18 en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -112,7 +112,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:490 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:486 en/lb_source.1:17
 #: en/lb_testroot.1:21 en/live-build.7:219
 #, no-wrap
 msgid "FILES"
@@ -127,7 +127,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:497 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:493 en/lb_source.1:20
 #: en/lb_testroot.1:24 en/live-build.7:223
 #, no-wrap
 msgid "SEE ALSO"
@@ -135,21 +135,21 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:499 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:495 en/lb_source.1:22
 #: en/lb_testroot.1:26
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:505 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:501 en/lb_source.1:24
 #: en/lb_testroot.1:28 en/live-build.7:229
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:506 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:502 en/lb_source.1:25
 #: en/lb_testroot.1:29 en/live-build.7:230
 #, no-wrap
 msgid "HOMEPAGE"
@@ -157,7 +157,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:508 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:504 en/lb_source.1:27
 #: en/lb_testroot.1:31 en/live-build.7:232
 msgid ""
 "More information about live-build and the Debian Live project can be found "
@@ -167,7 +167,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:509 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:505 en/lb_source.1:28
 #: en/lb_testroot.1:32 en/live-build.7:233
 #, no-wrap
 msgid "BUGS"
@@ -175,7 +175,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:511 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:507 en/lb_source.1:30
 #: en/lb_testroot.1:34 en/live-build.7:235
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -186,7 +186,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:512 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:508 en/lb_source.1:31
 #: en/lb_testroot.1:35 en/live-build.7:236
 #, no-wrap
 msgid "AUTHOR"
@@ -194,7 +194,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:513 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:509 en/lb_source.1:32
 #: en/lb_testroot.1:36 en/live-build.7:237
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "

manpages/pot/lb_binary.1.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-11-30 15:09+0100\n"
+"POT-Creation-Date: 2013-01-20 11:28+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-11-30"
+msgid "2013-01-20"
 msgstr ""
 
 #. type: TH
@@ -37,7 +37,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "3.0~a68-1"
+msgid "4.0~a8-1"
 msgstr ""
 
 #. type: TH
@@ -66,7 +66,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:237 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:235 en/lb_source.1:9
 #: en/lb_testroot.1:9 en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:246 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:244 en/lb_source.1:14
 #: en/lb_testroot.1:18 en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -82,7 +82,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:490 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:486 en/lb_source.1:17
 #: en/lb_testroot.1:21 en/live-build.7:219
 #, no-wrap
 msgid "FILES"
@@ -97,7 +97,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:497 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:493 en/lb_source.1:20
 #: en/lb_testroot.1:24 en/live-build.7:223
 #, no-wrap
 msgid "SEE ALSO"
@@ -105,21 +105,21 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:499 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:495 en/lb_source.1:22
 #: en/lb_testroot.1:26
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:505 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:501 en/lb_source.1:24
 #: en/lb_testroot.1:28 en/live-build.7:229
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:506 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:502 en/lb_source.1:25
 #: en/lb_testroot.1:29 en/live-build.7:230
 #, no-wrap
 msgid "HOMEPAGE"
@@ -127,7 +127,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:508 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:504 en/lb_source.1:27
 #: en/lb_testroot.1:31 en/live-build.7:232
 msgid ""
 "More information about live-build and the Debian Live project can be found "
@@ -137,7 +137,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:509 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:505 en/lb_source.1:28
 #: en/lb_testroot.1:32 en/live-build.7:233
 #, no-wrap
 msgid "BUGS"
@@ -145,7 +145,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:511 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:507 en/lb_source.1:30
 #: en/lb_testroot.1:34 en/live-build.7:235
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -156,7 +156,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:512 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:508 en/lb_source.1:31
 #: en/lb_testroot.1:35 en/live-build.7:236
 #, no-wrap
 msgid "AUTHOR"
@@ -164,7 +164,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:513 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:509 en/lb_source.1:32
 #: en/lb_testroot.1:36 en/live-build.7:237
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "

manpages/pot/lb_bootstrap.1.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-11-30 15:09+0100\n"
+"POT-Creation-Date: 2013-01-20 11:28+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-11-30"
+msgid "2013-01-20"
 msgstr ""
 
 #. type: TH
@@ -37,7 +37,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "3.0~a68-1"
+msgid "4.0~a8-1"
 msgstr ""
 
 #. type: TH
@@ -66,7 +66,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:237 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:235 en/lb_source.1:9
 #: en/lb_testroot.1:9 en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:246 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:244 en/lb_source.1:14
 #: en/lb_testroot.1:18 en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -82,7 +82,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:490 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:486 en/lb_source.1:17
 #: en/lb_testroot.1:21 en/live-build.7:219
 #, no-wrap
 msgid "FILES"
@@ -97,7 +97,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:497 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:493 en/lb_source.1:20
 #: en/lb_testroot.1:24 en/live-build.7:223
 #, no-wrap
 msgid "SEE ALSO"
@@ -105,21 +105,21 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:499 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:495 en/lb_source.1:22
 #: en/lb_testroot.1:26
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:505 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:501 en/lb_source.1:24
 #: en/lb_testroot.1:28 en/live-build.7:229
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:506 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:502 en/lb_source.1:25
 #: en/lb_testroot.1:29 en/live-build.7:230
 #, no-wrap
 msgid "HOMEPAGE"
@@ -127,7 +127,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:508 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:504 en/lb_source.1:27
 #: en/lb_testroot.1:31 en/live-build.7:232
 msgid ""
 "More information about live-build and the Debian Live project can be found "
@@ -137,7 +137,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:509 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:505 en/lb_source.1:28
 #: en/lb_testroot.1:32 en/live-build.7:233
 #, no-wrap
 msgid "BUGS"
@@ -145,7 +145,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:511 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:507 en/lb_source.1:30
 #: en/lb_testroot.1:34 en/live-build.7:235
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -156,7 +156,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:512 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:508 en/lb_source.1:31
 #: en/lb_testroot.1:35 en/live-build.7:236
 #, no-wrap
 msgid "AUTHOR"
@@ -164,7 +164,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:513 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:509 en/lb_source.1:32
 #: en/lb_testroot.1:36 en/live-build.7:237
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "

manpages/pot/lb_build.1.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-11-30 15:09+0100\n"
+"POT-Creation-Date: 2013-01-20 11:28+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-11-30"
+msgid "2013-01-20"
 msgstr ""
 
 #. type: TH
@@ -37,7 +37,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "3.0~a68-1"
+msgid "4.0~a8-1"
 msgstr ""
 
 #. type: TH
@@ -66,7 +66,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:237 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:235 en/lb_source.1:9
 #: en/lb_testroot.1:9 en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:246 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:244 en/lb_source.1:14
 #: en/lb_testroot.1:18 en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -82,7 +82,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:490 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:486 en/lb_source.1:17
 #: en/lb_testroot.1:21 en/live-build.7:219
 #, no-wrap
 msgid "FILES"
@@ -90,7 +90,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:497 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:493 en/lb_source.1:20
 #: en/lb_testroot.1:24 en/live-build.7:223
 #, no-wrap
 msgid "SEE ALSO"
@@ -98,21 +98,21 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:499 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:495 en/lb_source.1:22
 #: en/lb_testroot.1:26
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:505 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:501 en/lb_source.1:24
 #: en/lb_testroot.1:28 en/live-build.7:229
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:506 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:502 en/lb_source.1:25
 #: en/lb_testroot.1:29 en/live-build.7:230
 #, no-wrap
 msgid "HOMEPAGE"
@@ -120,7 +120,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:508 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:504 en/lb_source.1:27
 #: en/lb_testroot.1:31 en/live-build.7:232
 msgid ""
 "More information about live-build and the Debian Live project can be found "
@@ -130,7 +130,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:509 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:505 en/lb_source.1:28
 #: en/lb_testroot.1:32 en/live-build.7:233
 #, no-wrap
 msgid "BUGS"
@@ -138,7 +138,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:511 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:507 en/lb_source.1:30
 #: en/lb_testroot.1:34 en/live-build.7:235
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -149,7 +149,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:512 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:508 en/lb_source.1:31
 #: en/lb_testroot.1:35 en/live-build.7:236
 #, no-wrap
 msgid "AUTHOR"
@@ -157,7 +157,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:513 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:509 en/lb_source.1:32
 #: en/lb_testroot.1:36 en/live-build.7:237
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "

manpages/pot/lb_chroot.1.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-11-30 15:09+0100\n"
+"POT-Creation-Date: 2013-01-20 11:28+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-11-30"
+msgid "2013-01-20"
 msgstr ""
 
 #. type: TH
@@ -37,7 +37,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "3.0~a68-1"
+msgid "4.0~a8-1"
 msgstr ""
 
 #. type: TH
@@ -66,7 +66,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:237 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:235 en/lb_source.1:9
 #: en/lb_testroot.1:9 en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:246 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:244 en/lb_source.1:14
 #: en/lb_testroot.1:18 en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -82,7 +82,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:490 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:486 en/lb_source.1:17
 #: en/lb_testroot.1:21 en/live-build.7:219
 #, no-wrap
 msgid "FILES"
@@ -97,7 +97,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:497 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:493 en/lb_source.1:20
 #: en/lb_testroot.1:24 en/live-build.7:223
 #, no-wrap
 msgid "SEE ALSO"
@@ -105,21 +105,21 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:499 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:495 en/lb_source.1:22
 #: en/lb_testroot.1:26
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:505 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:501 en/lb_source.1:24
 #: en/lb_testroot.1:28 en/live-build.7:229
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:506 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:502 en/lb_source.1:25
 #: en/lb_testroot.1:29 en/live-build.7:230
 #, no-wrap
 msgid "HOMEPAGE"
@@ -127,7 +127,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:508 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:504 en/lb_source.1:27
 #: en/lb_testroot.1:31 en/live-build.7:232
 msgid ""
 "More information about live-build and the Debian Live project can be found "
@@ -137,7 +137,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:509 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:505 en/lb_source.1:28
 #: en/lb_testroot.1:32 en/live-build.7:233
 #, no-wrap
 msgid "BUGS"
@@ -145,7 +145,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:511 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:507 en/lb_source.1:30
 #: en/lb_testroot.1:34 en/live-build.7:235
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -156,7 +156,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:512 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:508 en/lb_source.1:31
 #: en/lb_testroot.1:35 en/live-build.7:236
 #, no-wrap
 msgid "AUTHOR"
@@ -164,7 +164,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:513 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:509 en/lb_source.1:32
 #: en/lb_testroot.1:36 en/live-build.7:237
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "

manpages/pot/lb_clean.1.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-11-30 15:09+0100\n"
+"POT-Creation-Date: 2013-01-20 11:28+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-11-30"
+msgid "2013-01-20"
 msgstr ""
 
 #. type: TH
@@ -37,7 +37,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "3.0~a68-1"
+msgid "4.0~a8-1"
 msgstr ""
 
 #. type: TH
@@ -66,7 +66,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:237 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:235 en/lb_source.1:9
 #: en/lb_testroot.1:9 en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:246 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:244 en/lb_source.1:14
 #: en/lb_testroot.1:18 en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -82,7 +82,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:490 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:486 en/lb_source.1:17
 #: en/lb_testroot.1:21 en/live-build.7:219
 #, no-wrap
 msgid "FILES"
@@ -90,7 +90,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:497 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:493 en/lb_source.1:20
 #: en/lb_testroot.1:24 en/live-build.7:223
 #, no-wrap
 msgid "SEE ALSO"
@@ -98,21 +98,21 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:499 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:495 en/lb_source.1:22
 #: en/lb_testroot.1:26
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:505 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:501 en/lb_source.1:24
 #: en/lb_testroot.1:28 en/live-build.7:229
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:506 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:502 en/lb_source.1:25
 #: en/lb_testroot.1:29 en/live-build.7:230
 #, no-wrap
 msgid "HOMEPAGE"
@@ -120,7 +120,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:508 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:504 en/lb_source.1:27
 #: en/lb_testroot.1:31 en/live-build.7:232
 msgid ""
 "More information about live-build and the Debian Live project can be found "
@@ -130,7 +130,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:509 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:505 en/lb_source.1:28
 #: en/lb_testroot.1:32 en/live-build.7:233
 #, no-wrap
 msgid "BUGS"
@@ -138,7 +138,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:511 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:507 en/lb_source.1:30
 #: en/lb_testroot.1:34 en/live-build.7:235
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -149,7 +149,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:512 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:508 en/lb_source.1:31
 #: en/lb_testroot.1:35 en/live-build.7:236
 #, no-wrap
 msgid "AUTHOR"
@@ -157,7 +157,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:513 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:509 en/lb_source.1:32
 #: en/lb_testroot.1:36 en/live-build.7:237
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "

manpages/pot/lb_source.1.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-11-30 15:09+0100\n"
+"POT-Creation-Date: 2013-01-20 11:28+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-11-30"
+msgid "2013-01-20"
 msgstr ""
 
 #. type: TH
@@ -37,7 +37,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "3.0~a68-1"
+msgid "4.0~a8-1"
 msgstr ""
 
 #. type: TH
@@ -66,7 +66,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:237 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:235 en/lb_source.1:9
 #: en/lb_testroot.1:9 en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:246 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:244 en/lb_source.1:14
 #: en/lb_testroot.1:18 en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -82,7 +82,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:490 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:486 en/lb_source.1:17
 #: en/lb_testroot.1:21 en/live-build.7:219
 #, no-wrap
 msgid "FILES"
@@ -97,7 +97,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:497 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:493 en/lb_source.1:20
 #: en/lb_testroot.1:24 en/live-build.7:223
 #, no-wrap
 msgid "SEE ALSO"
@@ -105,21 +105,21 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:499 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:495 en/lb_source.1:22
 #: en/lb_testroot.1:26
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:505 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:501 en/lb_source.1:24
 #: en/lb_testroot.1:28 en/live-build.7:229
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:506 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:502 en/lb_source.1:25
 #: en/lb_testroot.1:29 en/live-build.7:230
 #, no-wrap
 msgid "HOMEPAGE"
@@ -127,7 +127,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:508 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:504 en/lb_source.1:27
 #: en/lb_testroot.1:31 en/live-build.7:232
 msgid ""
 "More information about live-build and the Debian Live project can be found "
@@ -137,7 +137,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:509 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:505 en/lb_source.1:28
 #: en/lb_testroot.1:32 en/live-build.7:233
 #, no-wrap
 msgid "BUGS"
@@ -145,7 +145,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:511 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:507 en/lb_source.1:30
 #: en/lb_testroot.1:34 en/live-build.7:235
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -156,7 +156,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:512 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:508 en/lb_source.1:31
 #: en/lb_testroot.1:35 en/live-build.7:236
 #, no-wrap
 msgid "AUTHOR"
@@ -164,7 +164,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:513 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:509 en/lb_source.1:32
 #: en/lb_testroot.1:36 en/live-build.7:237
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "

manpages/pot/lb_testroot.1.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-11-30 15:09+0100\n"
+"POT-Creation-Date: 2013-01-20 11:28+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-11-30"
+msgid "2013-01-20"
 msgstr ""
 
 #. type: TH
@@ -37,7 +37,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "3.0~a68-1"
+msgid "4.0~a8-1"
 msgstr ""
 
 #. type: TH
@@ -66,7 +66,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:237 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:235 en/lb_source.1:9
 #: en/lb_testroot.1:9 en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:246 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:244 en/lb_source.1:14
 #: en/lb_testroot.1:18 en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -82,7 +82,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:490 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:486 en/lb_source.1:17
 #: en/lb_testroot.1:21 en/live-build.7:219
 #, no-wrap
 msgid "FILES"
@@ -97,7 +97,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:497 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:493 en/lb_source.1:20
 #: en/lb_testroot.1:24 en/live-build.7:223
 #, no-wrap
 msgid "SEE ALSO"
@@ -105,21 +105,21 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
-#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:499 en/lb_source.1:22
+#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:495 en/lb_source.1:22
 #: en/lb_testroot.1:26
 msgid "I<live-build>(7)"
 msgstr ""
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:505 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:501 en/lb_source.1:24
 #: en/lb_testroot.1:28 en/live-build.7:229
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:506 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:502 en/lb_source.1:25
 #: en/lb_testroot.1:29 en/live-build.7:230
 #, no-wrap
 msgid "HOMEPAGE"
@@ -127,7 +127,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:508 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:504 en/lb_source.1:27
 #: en/lb_testroot.1:31 en/live-build.7:232
 msgid ""
 "More information about live-build and the Debian Live project can be found "
@@ -137,7 +137,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:509 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:505 en/lb_source.1:28
 #: en/lb_testroot.1:32 en/live-build.7:233
 #, no-wrap
 msgid "BUGS"
@@ -145,7 +145,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:511 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:507 en/lb_source.1:30
 #: en/lb_testroot.1:34 en/live-build.7:235
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -156,7 +156,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:512 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:508 en/lb_source.1:31
 #: en/lb_testroot.1:35 en/live-build.7:236
 #, no-wrap
 msgid "AUTHOR"
@@ -164,7 +164,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:513 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:509 en/lb_source.1:32
 #: en/lb_testroot.1:36 en/live-build.7:237
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "

manpages/pot/live-build.7.pot

@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-11-30 15:09+0100\n"
+"POT-Creation-Date: 2013-01-20 11:28+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-11-30"
+msgid "2013-01-20"
 msgstr ""
 
 #. type: TH
@@ -37,7 +37,7 @@ msgstr ""
 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
 #: en/lb_testroot.1:1 en/live-build.7:1
 #, no-wrap
-msgid "3.0~a68-1"
+msgid "4.0~a8-1"
 msgstr ""
 
 #. type: TH
@@ -66,7 +66,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
-#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:237 en/lb_source.1:9
+#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:235 en/lb_source.1:9
 #: en/lb_testroot.1:9 en/live-build.7:11
 #, no-wrap
 msgid "DESCRIPTION"
@@ -74,7 +74,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
-#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:246 en/lb_source.1:14
+#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:244 en/lb_source.1:14
 #: en/lb_testroot.1:18 en/live-build.7:20
 #, no-wrap
 msgid "OPTIONS"
@@ -82,7 +82,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
-#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:490 en/lb_source.1:17
+#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:486 en/lb_source.1:17
 #: en/lb_testroot.1:21 en/live-build.7:219
 #, no-wrap
 msgid "FILES"
@@ -90,7 +90,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
-#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:497 en/lb_source.1:20
+#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:493 en/lb_source.1:20
 #: en/lb_testroot.1:24 en/live-build.7:223
 #, no-wrap
 msgid "SEE ALSO"
@@ -98,14 +98,14 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
-#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:505 en/lb_source.1:24
+#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:501 en/lb_source.1:24
 #: en/lb_testroot.1:28 en/live-build.7:229
 msgid "This program is a part of live-build."
 msgstr ""
 
 #. type: SH
 #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
-#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:506 en/lb_source.1:25
+#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:502 en/lb_source.1:25
 #: en/lb_testroot.1:29 en/live-build.7:230
 #, no-wrap
 msgid "HOMEPAGE"
@@ -113,7 +113,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
-#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:508 en/lb_source.1:27
+#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:504 en/lb_source.1:27
 #: en/lb_testroot.1:31 en/live-build.7:232
 msgid ""
 "More information about live-build and the Debian Live project can be found "
@@ -123,7 +123,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
-#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:509 en/lb_source.1:28
+#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:505 en/lb_source.1:28
 #: en/lb_testroot.1:32 en/live-build.7:233
 #, no-wrap
 msgid "BUGS"
@@ -131,7 +131,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
-#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:511 en/lb_source.1:30
+#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:507 en/lb_source.1:30
 #: en/lb_testroot.1:34 en/live-build.7:235
 msgid ""
 "Bugs can be reported by submitting a bugreport for the live-build package in "
@@ -142,7 +142,7 @@ msgstr ""
 
 #. type: SH
 #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
-#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:512 en/lb_source.1:31
+#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:508 en/lb_source.1:31
 #: en/lb_testroot.1:35 en/live-build.7:236
 #, no-wrap
 msgid "AUTHOR"
@@ -150,7 +150,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
-#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:513 en/lb_source.1:32
+#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:509 en/lb_source.1:32
 #: en/lb_testroot.1:36 en/live-build.7:237
 msgid ""
 "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
@@ -158,36 +158,36 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:318 en/live-build.7:36
+#: en/lb_config.1:316 en/live-build.7:36
 #, no-wrap
 msgid "B<--debug>"
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:330 en/live-build.7:38
+#: en/lb_config.1:328 en/live-build.7:38
 #, no-wrap
 msgid "B<--force>"
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:439 en/live-build.7:40
+#: en/lb_config.1:435 en/live-build.7:40
 #, no-wrap
 msgid "B<--quiet>"
 msgstr ""
 
 #. type: IP
-#: en/lb_config.1:479 en/live-build.7:42
+#: en/lb_config.1:475 en/live-build.7:42
 #, no-wrap
 msgid "B<--verbose>"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:501 en/live-build.7:225
+#: en/lb_config.1:497 en/live-build.7:225
 msgid "I<live-boot>(7)"
 msgstr ""
 
 #. type: Plain text
-#: en/lb_config.1:503 en/live-build.7:227
+#: en/lb_config.1:499 en/live-build.7:227
 msgid "I<live-config>(7)"
 msgstr ""
 

scripts/build.sh

@@ -1,16 +1,45 @@
 #!/bin/sh
 
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
+##
+## This program is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program. If not, see <http://www.gnu.org/licenses/>.
+##
+## The complete text of the GNU General Public License
+## can be found in /usr/share/common-licenses/GPL-3 file.
+
+
+set -e
+
 if [ -e local/live-build ]
 then
 	LIVE_BUILD="${LIVE_BUILD:-${PWD}/local/live-build}"
 	export LIVE_BUILD
 fi
 
-# Source global functions
+for _DIRECTORY in "${LIVE_BUILD}/functions" /usr/share/live/build/functions
-for FUNCTION in "${LIVE_BUILD}"/functions/*.sh /usr/share/live/build/functions/*.sh
 do
-	if [ -e "${FUNCTION}" ]
+	if [ -e "${_DIRECTORY}" ]
 	then
-		. "${FUNCTION}"
+		for _FILE in "${_DIRECTORY}"/*.sh
+		do
+			if [ -e "${_FILE}" ]
+			then
+				. "${_FILE}"
+			fi
+		done
+
+		break
 	fi
 done

scripts/build/binary

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it

scripts/build/binary_checksums

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -43,7 +43,15 @@ Create_lockfile .lock
 
 for CHECKSUM in ${LB_CHECKSUMS}
 do
-	CHECKSUMS="$(echo ${CHECKSUM} | tr [a-z] [A-Z])SUMS"
+	case "${LB_MODE}" in
+		progress-linux)
+			CHECKSUMS="$(echo ${CHECKSUM} | tr [a-z] [A-Z])SUMS"
+			;;
+
+		*)
+			CHECKSUMS="${CHECKSUM}sum.txt"
+			;;
+	esac
 
 	Echo_message "Begin creating binary ${CHECKSUMS}..."
 
@@ -60,10 +68,11 @@ do
 		\! -path './boot/boot.bin' \
 		\! -path './boot/grub/stage2_eltorito' \
 		\! -path './*SUMS' \
+		\! -path './*sum.txt' \
 	-print0 | sort -z | xargs -0 ${CHECKSUM}sum > ../${CHECKSUMS}
 
 cat > ${CHECKSUMS} << EOF
-## This file contains the list of ${CHECKSUM} checksums of all fileson this
+## This file contains the list of ${CHECKSUM} checksums of all files on this
 ## medium.
 ##
 ## You can verify them automatically with the 'verify-checksums' boot parameter,
@@ -80,7 +89,7 @@ done
 
 # File list
 cd binary
-find . | sed -e 's|^.||g' | grep "^/" | sort > ../binary.contents
+find . | sed -e 's|^.||g' | grep "^/" | sort > ../${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.contents
 cd "${OLDPWD}"
 
 # Creating stage file

scripts/build/binary_chroot

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -85,7 +85,7 @@ ${LB_ROOT_COMMAND} rm -rf chroot/chroot
 ${LB_ROOT_COMMAND} rm -rf chroot.tmp
 
 # Copying new chroot
-if [ -d cache/bootstrap ] && [ "${LB_CHROOT_FILESYSTEM}" != "none" ]
+if [ -d cache/bootstrap ] && [ "${LB_CHROOT_FILESYSTEM}" != "none" ] && [ "${LB_CHROOT_FILESYSTEM}" != "plain" ]
 then
 	${LB_ROOT_COMMAND} mv chroot chroot.tmp
 	${LB_ROOT_COMMAND} cp -a cache/bootstrap chroot

scripts/build/binary_debian-installer

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -74,9 +74,9 @@ Restore_cache cache/packages.binary
 Install_package
 
 # Setting destination directory
-case "${LB_BINARY_IMAGES}" in
+case "${LIVE_IMAGE_TYPE}" in
 	netboot)
-		DESTDIR="tftpboot/debian-install/${LB_ARCHITECTURES}"
+		DESTDIR="tftpboot/debian-install/${LIVE_IMAGE_ARCHITECTURE}"
 		;;
 
 	hdd*|tar)
@@ -94,7 +94,7 @@ case "${LB_DEBIAN_INSTALLER}" in
 		DI_IMAGE_TYPE="netboot"
 		;;
 	*)
-		case "${LB_BINARY_IMAGES}" in
+		case "${LIVE_IMAGE_TYPE}" in
 			netboot)
 				DI_IMAGE_TYPE="netboot"
 				;;
@@ -107,7 +107,7 @@ case "${LB_DEBIAN_INSTALLER}" in
 esac
 
 # Set architecture-specific variables
-case "${LB_ARCHITECTURES}" in
+case "${LIVE_IMAGE_ARCHITECTURE}" in
 	armel)
 		DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')"
 		case "${DI_IMAGE_TYPE}" in
@@ -127,11 +127,11 @@ case "${LB_ARCHITECTURES}" in
 	powerpc)
 		case "${DI_IMAGE_TYPE}" in
 			cdrom)
-				DI_REMOTE_BASE="${LB_ARCHITECTURES}/cdrom"
+				DI_REMOTE_BASE="${LIVE_IMAGE_ARCHITECTURE}/cdrom"
 			;;
 
 			netboot)
-				DI_REMOTE_BASE="${LB_ARCHITECTURES}/netboot"
+				DI_REMOTE_BASE="${LIVE_IMAGE_ARCHITECTURE}/netboot"
 				;;
 		esac
 
@@ -149,8 +149,8 @@ case "${LB_ARCHITECTURES}" in
 	*)
 		case "${DI_IMAGE_TYPE}" in
 			netboot)
-				DI_REMOTE_BASE="netboot/debian-installer/${LB_ARCHITECTURES}"
+				DI_REMOTE_BASE="netboot/debian-installer/${LIVE_IMAGE_ARCHITECTURE}"
-				DI_REMOTE_BASE_GTK="netboot/gtk/debian-installer/${LB_ARCHITECTURES}"
+				DI_REMOTE_BASE_GTK="netboot/gtk/debian-installer/${LIVE_IMAGE_ARCHITECTURE}"
 				DI_REMOTE_KERNEL="linux"
 				;;
 
@@ -255,9 +255,9 @@ case "${LB_DERIVATIVE}" in
 			LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="sid"
 
 			# Debian Installer daily builds
-			URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/"
+			URL="http://d-i.debian.org/daily-images/${LIVE_IMAGE_ARCHITECTURE}/daily/"
 		else
-			URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/"
+			URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LIVE_IMAGE_ARCHITECTURE}/current/images/"
 		fi
 		;;
 
@@ -267,23 +267,23 @@ case "${LB_DERIVATIVE}" in
 			LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="sid"
 
 			# Debian Installer daily builds
-			URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/"
+			URL="http://d-i.debian.org/daily-images/${LIVE_IMAGE_ARCHITECTURE}/daily/"
 		else
-			URL="${LB_PARENT_MIRROR_DEBIAN_INSTALLER}/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/"
+			URL="${LB_PARENT_MIRROR_DEBIAN_INSTALLER}/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LIVE_IMAGE_ARCHITECTURE}/current/images/"
 		fi
 
 		if [ "${LB_MODE}" = "progress-linux" ]
 		then
 			# FIXME: normal derivatives probably don't rebuild d-i,
 			# but progress-linux does.
-			URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/"
+			URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LIVE_IMAGE_ARCHITECTURE}/current/images/"
 		fi
 		;;
 esac
 
 mkdir -p "${DESTDIR_DI}"
 
-if [ "${LB_ARCHITECTURES}" = "sparc" ] && [ "${DI_IMAGE_TYPE}" = "netboot" ]
+if [ "${LIVE_IMAGE_ARCHITECTURE}" = "sparc" ] && [ "${DI_IMAGE_TYPE}" = "netboot" ]
 then
 	# There are no prepared kernel/initrd pairs for sparc netboot so we
 	# must unpack them from a mini.iso
@@ -306,7 +306,7 @@ else
 	DOWNLOAD_GTK_INSTALLER=0
 	if [ "${LB_DEBIAN_INSTALLER_GUI}" = "true" ]
 	then
-		case "${LB_ARCHITECTURES}" in
+		case "${LIVE_IMAGE_ARCHITECTURE}" in
 			amd64|i386)
 				DOWNLOAD_GTK_INSTALLER=1
 				;;
@@ -337,12 +337,12 @@ then
 	mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
 	touch chroot/var/lib/dpkg/status
 
-	case "${LB_ARCHITECTURES}" in
+	case "${LIVE_IMAGE_ARCHITECTURE}" in
 		amd64)
-			DI_REQ_PACKAGES="lilo grub grub-pc"
+			DI_REQ_PACKAGES="lilo grub-pc"
 
 			case "${LB_MODE}" in
-				ubuntu|kubuntu)
+				ubuntu)
 					DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic"
 					;;
 
@@ -353,14 +353,15 @@ then
 			;;
 
 		i386)
-			DI_REQ_PACKAGES="elilo lilo grub grub-pc"
+			DI_REQ_PACKAGES="elilo lilo grub-pc"
 
 			case "${LB_MODE}" in
-				ubuntu|kubuntu)
+				ubuntu)
 					case "${LB_DISTRIBUTION}" in
 						precise)
 							DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic-pae"
 							;;
+
 						*)
 							DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic"
 							;;
@@ -376,7 +377,7 @@ then
 		sparc)
 			DI_REQ_PACKAGES="silo"
 			case "${LB_MODE}" in
-				ubuntu|kubuntu)
+				ubuntu)
 					DI_PACKAGES="${DI_REQ_PACKAGES} linux-sparc64"
 					;;
 
@@ -389,8 +390,8 @@ 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"
+					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc-smp linux-image-powerpc64-smp linux-image-powerpc-e500 linux-image-powerpc-e500mc"
 					;;
 
 				*)
@@ -418,23 +419,18 @@ then
 
 		FIRMWARE_PACKAGES=""
 
-		if [ "${LB_PARENT_DISTRIBUTION}" = "squeeze" ] || [ "${LB_MODE}" = "ubuntu" ] || [ "${LB_MODE}" = "kubuntu" ]
+		_CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}; do echo ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/${_PARENT_ARCHIVE_AREA}/Contents-${LIVE_IMAGE_ARCHITECTURE}.gz; done)"
-		then
-			_CONTENTS="${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/Contents-${LB_ARCHITECTURES}.gz"
-		else
-			_CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LB_PARENT_ARCHIVE_AREAS}; do echo ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/${_PARENT_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)"
-		fi
 
-		rm -f cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES}
+		rm -f cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE}
 
 		for _CONTENT in ${_CONTENTS}
 		do
-			wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES}
+			wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE}
 
-			FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES} | sort -u)"
+			FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} | sort -u)"
 		done
 
-		if echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free"
+		if echo ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS} | grep -qs "non-free"
 		then
 			# FIXME: should check that we're building on debian through e.g. a 'derivative-is-based-on' variable or somesuch.
 			# Manually add firmware-linux/non-free meta package
@@ -445,20 +441,15 @@ then
 		then
 			# FIXME: account for the fact that PARENT_DISTRIBUTION and DISTRIBUTION might be the same (to not have overlapping cache files for contents).
 
-			if [ "${_PARENT_DISTRIBUTION}" = "squeeze" ] || [ "${LB_MODE}" = "ubuntu" ] || [ "${LB_MODE}" = "kubuntu" ]
+			_CONTENTS="$(for _ARCHIVE_AREA in ${LIVE_IMAGE_ARCHIVE_AREAS}; do echo ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/Contents-${LIVE_IMAGE_ARCHITECTURE}.gz; done)"
-			then
-				_CONTENTS="${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/Contents-${LB_ARCHITECTURES}.gz"
-			else
-				_CONTENTS="$(for _ARCHIVE_AREA in ${LB_ARCHIVE_AREAS}; do echo ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)"
-			fi
 
-			rm -f cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES}
+			rm -f cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE}
 
 			for _CONTENT in ${_CONTENTS}
 			do
-				wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES}
+				wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE}
 
-				FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES} | sort -u)"
+				FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} | sort -u)"
 			done
 		fi
 
@@ -481,37 +472,28 @@ then
 		# d-i does not support (for example) re-installing grub from target/ - the grub
 		# .debs must actually exist.
 
-		# Modify dpkg status to show the required packages are not installed.
-		cp chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
-		for PACKAGE in ${DI_REQ_PACKAGES}
-		do
-			awk -v f=0 '
-				f == 1 { print "Status: purge ok not-installed"; f=0; next }
-				/Package: '"${PACKAGE}"'/ { f=1; }
-				{ print }
-				' chroot/var/lib/dpkg/status > chroot/var/lib/dpkg/status.awk
-			mv chroot/var/lib/dpkg/status.awk chroot/var/lib/dpkg/status
-		done
-
-		# Download .deb's that we just marked as "purged" which caused broken dependencies
-		Chroot chroot ${_LB_APT_COMMAND} -f dist-upgrade
-
-		# Revert dpkg status file
-		mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
-
 		# Download .debs of the required packages
 		Chroot chroot ${_LB_APT_COMMAND} install ${DI_PACKAGES} ${DI_FIRMWARE_PACKAGES} ${DI_REQ_PACKAGES}
+
+		# Drop the packages already installed that d-i doesn't explicitely need
+		_REMAINING_PACKAGES="$(echo ${DI_FIRMWARE_PACKAGES} ${DI_REQ_PACKAGES} | sed -e 's# #|#g')"
+		_REMAINING_PACKAGES="$(sed -n -e 's|Package: ||p' chroot/var/lib/dpkg/status.tmp | grep -E -v \"^${_REMAINING_PACKAGES}$\")"
+
+		for _PACKAGE in ${_REMAINING_PACKAGES}
+		do
+			rm -f "chroot/binary.deb/archives/${_PACKAGE}_*.deb"
+		done
 	else
 		# Download .debs of the required packages
 		Chroot chroot ${_LB_APT_COMMAND} install ${DI_PACKAGES} ${DI_FIRMWARE_PACKAGES}
-
-		# Revert dpkg status file
-		mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
 	fi
 
+	# Revert dpkg status file
+	mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
+
 	mv chroot/binary.deb ./
 
-	for _ARCHIVE_AREA in $(echo ${LB_PARENT_ARCHIVE_AREAS} ${LB_ARCHIVE_AREAS})
+	for _ARCHIVE_AREA in $(echo ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS} ${LIVE_IMAGE_ARCHIVE_AREAS})
 	do
 		mkdir -p binary/pool/${_ARCHIVE_AREA}
 	done
@@ -541,9 +523,9 @@ then
 	fi
 
 	# Including local debs
-	if Find_files config/packages.binary/*_"${LB_ARCHITECTURES}".deb || Find_files config/packages/*_"${LB_ARCHITECTURES}".deb
+	if Find_files config/packages.binary/*_"${LIVE_IMAGE_ARCHITECTURE}".deb || Find_files config/packages/*_"${LIVE_IMAGE_ARCHITECTURE}".deb
 	then
-		for FILE in config/packages.binary/*_"${LB_ARCHITECTURES}".deb config/packages/*_"${LB_ARCHITECTURES}".deb
+		for FILE in config/packages.binary/*_"${LIVE_IMAGE_ARCHITECTURE}".deb config/packages/*_"${LIVE_IMAGE_ARCHITECTURE}".deb
 		do
 			if [ -e "${FILE}" ]
 			then
@@ -566,18 +548,18 @@ then
 	# Generating deb indices
 	for _ARCHIVE_AREA in $(cd binary/pool && ls)
 	do
-		mkdir -p binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}
+		mkdir -p binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LIVE_IMAGE_ARCHITECTURE}
 
 		mv binary chroot/root
-		echo "cd /root/binary && apt-ftparchive packages pool/${_ARCHIVE_AREA} > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}/Packages" > chroot/binary.sh
+		echo "cd /root/binary && apt-ftparchive packages pool/${_ARCHIVE_AREA} > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages" > chroot/binary.sh
 		Chroot chroot "sh binary.sh"
 		rm -f chroot/binary.sh
 		mv chroot/root/binary ./
 
-		gzip -9 -c binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}/Packages > binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}/Packages.gz
+		gzip -9 -c binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages > binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages.gz
 
 		# Fetching release
-		Download_file binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}/Release "${LB_PARENT_MIRROR_CHROOT}"/dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/${_ARCHIVE_AREA}/binary-"${LB_ARCHITECTURES}"/Release
+		Download_file binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LIVE_IMAGE_ARCHITECTURE}/Release "${LB_PARENT_MIRROR_CHROOT}"/dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/${_ARCHIVE_AREA}/binary-"${LIVE_IMAGE_ARCHITECTURE}"/Release
 	done
 
 	# Symlink firmware packages to /firmware
@@ -590,7 +572,7 @@ then
 		do
 			for _FILE in $(find ../pool -name "${_PACKAGE}_*.deb")
 			do
-				ln -s ${_FILE} ./
+				ln -sf ${_FILE} ./
 			done
 		done
 
@@ -602,12 +584,12 @@ then
 	cd binary.udeb
 
 	# Downloading udeb indices
-	Download_file Packages.gz "${LB_PARENT_MIRROR_CHROOT}"/dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LB_ARCHITECTURES}"/Packages.gz
+	Download_file Packages.gz "${LB_PARENT_MIRROR_CHROOT}"/dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_IMAGE_ARCHITECTURE}"/Packages.gz
 	gunzip -c Packages.gz > Packages
 
 	if [ "${LB_DERIVATIVE}" = "true" ]
 	then
-		Download_file Packages.derivative.gz "${LB_MIRROR_CHROOT}"/dists/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LB_ARCHITECTURES}"/Packages.gz
+		Download_file Packages.derivative.gz "${LB_MIRROR_CHROOT}"/dists/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_IMAGE_ARCHITECTURE}"/Packages.gz
 		gunzip -c Packages.derivative.gz > Packages.derivative
 	fi
 
@@ -648,9 +630,9 @@ then
 	cp *.udeb ../cache/packages.binary_debian-installer.udeb
 
 	# Including local udebs
-	if Find_files ../config/packages.binary/*_"${LB_ARCHITECTURES}".udeb || Find_files ../config/packages/*_"${LB_ARCHITECTURES}".udeb
+	if Find_files ../config/packages.binary/*_"${LIVE_IMAGE_ARCHITECTURE}".udeb || Find_files ../config/packages/*_"${LIVE_IMAGE_ARCHITECTURE}".udeb
 	then
-		for FILE in ../config/packages.binary/*_"${LB_ARCHITECTURES}".udeb ../config/packages/*_"${LB_ARCHITECTURES}".udeb
+		for FILE in ../config/packages.binary/*_"${LIVE_IMAGE_ARCHITECTURE}".udeb ../config/packages/*_"${LIVE_IMAGE_ARCHITECTURE}".udeb
 		do
 			if [ -e "${FILE}" ]
 			then
@@ -683,7 +665,7 @@ then
 		then
 			grep -v "^#" "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/udeb_exclude" > exclude || true
 	grep -v "^#" "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/exclude-udebs" >> exclude || true
-	grep -v "^#" "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/exclude-udebs-${LB_ARCHITECTURES}" >> exclude || true
+	grep -v "^#" "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/exclude-udebs-${LIVE_IMAGE_ARCHITECTURE}" >> exclude || true
 
 			continue
 		fi
@@ -719,17 +701,17 @@ then
 	done
 
 	# Creating udeb indices
-	mkdir -p dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LB_ARCHITECTURES}"
+	mkdir -p dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_IMAGE_ARCHITECTURE}"
 	cd "${OLDPWD}"
 
 	mv binary.udeb chroot/root
-	echo "cd /root/binary.udeb && apt-ftparchive packages pool/main > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURES}/Packages" > chroot/binary.sh
+	echo "cd /root/binary.udeb && apt-ftparchive packages pool/main > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages" > chroot/binary.sh
 	Chroot chroot "sh binary.sh"
 	rm -f chroot/binary.sh
 	mv chroot/root/binary.udeb ./
 
 	cd binary.udeb
-	gzip -9 -c dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURES}/Packages > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURES}/Packages.gz
+	gzip -9 -c dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages.gz
 
 	rm -f Packages* exclude
 	find . | cpio -dmpu "${OLDPWD}"/binary
@@ -761,8 +743,8 @@ cd /root/binary && apt-ftparchive \
 	-o APT::FTPArchive::Release::Version="${_VERSION}" \
 	-o APT::FTPArchive::Release::Codename="${LB_PARENT_DISTRIBUTION}" \
 	-o APT::FTPArchive::Release::Date="$(date -R)" \
-	-o APT::FTPArchive::Release::Architectures="${LB_ARCHITECTURES}" \
+	-o APT::FTPArchive::Release::Architectures="${LIVE_IMAGE_ARCHITECTURE}" \
-	-o APT::FTPArchive::Release::Components="${LB_PARENT_ARCHIVE_AREAS}" \
+	-o APT::FTPArchive::Release::Components="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}" \
 	-o APT::FTPArchive::Release::Description="Last updated: $(date -R)" \
 	release dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION} > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/Release
 EOF
@@ -771,14 +753,22 @@ EOF
 	rm -f chroot/binary.sh
 	mv chroot/root/binary ./
 
-	DISTRIBUTIONS="stable testing unstable"
+	case "${LB_PARENT_DISTRIBUTION}" in
+		wheezy)
+			DISTRIBUTIONS="testing"
+			;;
+
+		*)
+			DISTRIBUTIONS="stable testing unstable"
+			;;
+	esac
 
 	if [ "${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}" != "${LB_PARENT_DISTRIBUTION}" ]
 	then
 		DISTRIBUTIONS="${DISTRIBUTIONS} ${LB_PARENT_DISTRIBUTION}"
 	fi
 
-	case "${LB_BINARY_IMAGES}" in
+	case "${LIVE_IMAGE_TYPE}" in
 		hdd)
 			case "${LB_BINARY_FILESYSTEM}" in
 				fat*|ntfs)
@@ -812,14 +802,14 @@ fi
 Repack_initrd()
 {
 	local TARGET_INITRD
-	local INCLUDE_PATH
+	local INCLUDES_SOURCE
 	TARGET_INITRD="${1}"
-	INCLUDE_PATH="${2}"
+	INCLUDES_SOURCE="${2}"
 	REPACK_TMPDIR="unpacked-initrd"
 
-	if [ -d "${INCLUDE_PATH}" ]
+	if [ -d "${INCLUDES_SOURCE}" ]
 	then
-		INCLUDE_PATH=$(readlink -f ${INCLUDE_PATH})
+		INCLUDES_SOURCE=$(readlink -f ${INCLUDES_SOURCE})
 	fi
 
 	# cpio does not have a "extract to directory", so we must change directory
@@ -827,33 +817,50 @@ Repack_initrd()
 	cd ${REPACK_TMPDIR}
 
 	gzip -d < ../${TARGET_INITRD} | cpio -i --make-directories --no-absolute-filenames
-	if [ ! -d "${INCLUDE_PATH}" ]
+
-	then
+	for _INCLUDE in ${INCLUDES_SOURCE}
-		# Invoked the old way, just copy the preseeds
+	do
-		cp ../config/debian-installer/*.cfg .
+		if [ ! -d ${_INCLUDE} ]
-	else
+		then
-		# New way, include target directory content in the initrd
+			cp ${_INCLUDE} .
-		REPACK_TMPDIR_ABS="${PWD}"
+		else
-		cd "${INCLUDE_PATH}"
+			REPACK_TMPDIR_ABS="${PWD}"
-		find -print0 | cpio -pumd0 --no-preserve-owner "${REPACK_TMPDIR_ABS}/"
+			cd "${_INCLUDE}"
-		cd "${OLDPWD}"
+			find -print0 | cpio -pumd0 --no-preserve-owner "${REPACK_TMPDIR_ABS}/"
-	fi
+			cd "${OLDPWD}"
+		fi
+	done
 	find -print0 | cpio -H newc -o0 | gzip -9 > ../${TARGET_INITRD}
 
 	cd ..
 	rm -rf ${REPACK_TMPDIR}
 }
 
-# Preseed d-i by repacking the initrd in certain situations
+case "${DI_IMAGE_TYPE}" in
-if [ "${DI_IMAGE_TYPE}" = "netboot" ] && [ -e config/debian-installer/preseed.cfg ]
+	netboot)
-then
+		# Include firmware into d-i initrd on netboot images
-	Repack_initrd "${DESTDIR}"/"${INITRD_DI}"
+		if ls binary/firmware/*.deb > /dev/null 2>&1
+		then
+			Repack_initrd "${DESTDIR}"/"${INITRD_DI}" "binary/firmware/*.deb"
 
-	if [ -e "${DESTDIR}"/"${INITRD_GI}" ]
+			if [ -e "${DESTDIR}"/"${INITRD_GI}" ]
-	then
+			then
-		Repack_initrd "${DESTDIR}"/"${INITRD_GI}"
+				Repack_initrd "${DESTDIR}"/"${INITRD_GI}" "binary/firmware/*.deb"
-	fi
+			fi
-fi
+		fi
+
+		# Preseed d-i by repacking the initrd in certain situations
+		if [ -e config/debian-installer/preseed.cfg ]
+		then
+			Repack_initrd "${DESTDIR}"/"${INITRD_DI}" config/debian-installer/preseed.cfg
+
+			if [ -e "${DESTDIR}"/"${INITRD_GI}" ]
+			then
+				Repack_initrd "${DESTDIR}"/"${INITRD_GI}" config/debian-installer/preseed.cfg
+			fi
+		fi
+		;;
+esac
 
 # Include content of config/includes.debian-installer if exists and not empty
 if [ -d config/includes.debian-installer ] && [ -n "$(ls -A config/includes.debian-installer)" ]

scripts/build/binary_disk

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -24,7 +24,7 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-case "${LB_BINARY_IMAGES}" in
+case "${LIVE_IMAGE_TYPE}" in
 	iso*|hdd*)
 		;;
 	*)
@@ -48,7 +48,7 @@ Create_lockfile .lock
 
 mkdir -p binary/.disk
 
-ARCHITECTURE="$(echo ${LB_ARCHITECTURES} | sed -e 's| |/|g')"
+ARCHITECTURE="$(echo ${LIVE_IMAGE_ARCHITECTURE} | sed -e 's| |/|g')"
 DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')"
 DISTRIBUTION="${DISTRIBUTION}$(echo ${LB_DISTRIBUTION} | cut -b 2-)"
 eval VERSION="$`echo RELEASE_${LB_DISTRIBUTION}`"
@@ -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}"
@@ -139,7 +133,7 @@ case "${LB_DEBIAN_INSTALLER}" in
 		do
 			if [ -e "${LOCATION}" ]
 			then
-				cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_udeb_include" binary/.disk/udeb_include
+				cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LIVE_IMAGE_ARCHITECTURE}_udeb_include" binary/.disk/udeb_include
 
 				continue
 			fi
@@ -164,7 +158,7 @@ case "${LB_DEBIAN_INSTALLER}" in
 		do
 			if [ -e "${LOCATION}" ]
 			then
-				cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_netinst_udeb_include" binary/.disk/udeb_include
+				cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LIVE_IMAGE_ARCHITECTURE}_netinst_udeb_include" binary/.disk/udeb_include
 
 				continue
 			fi
@@ -187,7 +181,7 @@ case "${LB_DEBIAN_INSTALLER}" in
 		do
 			if [ -e "${LOCATION}" ]
 			then
-				cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_businesscard_udeb_include" binary/.disk/udeb_include
+				cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LIVE_IMAGE_ARCHITECTURE}_businesscard_udeb_include" binary/.disk/udeb_include
 
 				continue
 			fi

scripts/build/binary_grub

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -132,7 +132,7 @@ case "${LB_INITRAMFS}" in
 esac
 
 # Setting destination directory
-case "${LB_BINARY_IMAGES}" in
+case "${LIVE_IMAGE_TYPE}" in
 	iso*|tar)
 		case "${LB_INITRAMFS}" in
 			casper)
@@ -245,7 +245,7 @@ fi
 mkdir -p binary/boot/grub
 cp -r "${TEMPLATES}"/* binary/boot/grub
 
-case ${LB_BINARY_IMAGES} in
+case ${LIVE_IMAGE_TYPE} in
 	iso*)
 		FILES="chroot/usr/lib/grub/*/stage2_eltorito"
 		;;

scripts/build/binary_grub2

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -106,7 +106,7 @@ case "${LB_INITRAMFS}" in
 esac
 
 # Setting destination directory
-case "${LB_BINARY_IMAGES}" in
+case "${LIVE_IMAGE_TYPE}" in
 	iso*|tar)
 		case "${LB_INITRAMFS}" in
 			casper)
@@ -218,7 +218,7 @@ fi
 mkdir -p binary/boot/grub
 cp -r "${TEMPLATES}"/* binary/boot/grub
 
-case ${LB_BINARY_IMAGES} in
+case ${LIVE_IMAGE_TYPE} in
 	iso*)
 		FILES="chroot/usr/lib/grub/i386-pc/*.mod chroot/usr/lib/grub/i386-pc/*.lst chroot/usr/lib/grub/i386-pc/efiemu??.o chroot/usr/share/grub/*.pf2"
 		;;

scripts/build/binary_hdd

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -24,7 +24,7 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if ! In_list hdd "${LB_BINARY_IMAGES}"
+if ! In_list hdd "${LIVE_IMAGE_TYPE}"
 then
 	exit 0
 fi
@@ -50,22 +50,14 @@ case "${LB_BINARY_FILESYSTEM}" in
 		;;
 
 	ntfs)
-		case "${LB_PARENT_DISTRIBUTION}" in
+		Check_package chroot/sbin/mkfs.nfts ntfs-3g
-			squeeze)
-				Check_package chroot/sbin/mkfs.ntfs ntfsprogs
-				;;
-
-			*)
-				Check_package chroot/sbin/mkfs.nfts ntfs-3g
-				;;
-		esac
 		;;
 esac
 
 Check_package chroot/usr/share/doc/mtools mtools
 Check_package chroot/sbin/parted parted
 
-if [ "${LB_ARCHITECTURES}" = "sparc" ]
+if [ "${LIVE_IMAGE_ARCHITECTURE}" = "sparc" ]
 then
 	case "${LB_BINARY_FILESYSTEM}" in
 		ext2|ext3|ext4)
@@ -96,9 +88,9 @@ Restore_cache cache/packages.binary
 Install_package
 
 # Remove old binary
-if [ -f binary.img ]
+if [ -f ${LIVE_iMAGE_NAME}.img ]
 then
-	rm -f binary.img
+	rm -f ${LIVE_iMAGE_NAME}.img
 fi
 
 # Enforce fat32 if we find individual files bigger than 2GB
@@ -144,7 +136,7 @@ fi
 echo "!!! The following error/warning messages can be ignored !!!"
 Losetup $FREELO chroot/binary.img 0
 
-case "${LB_ARCHITECTURES}" in
+case "${LIVE_IMAGE_ARCHITECTURE}" in
 	sparc)
 		PARTITION_TABLE_TYPE="sun"
 		;;
@@ -302,7 +294,7 @@ then
 	mv chroot/dev.tmp chroot/dev
 fi
 
-mv chroot/binary.img ./
+mv chroot/binary.img ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}
 
 # Saving cache
 Save_cache cache/packages.binary

scripts/build/binary_hooks

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it

scripts/build/binary_includes

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -46,7 +46,7 @@ then
 	cd "${OLDPWD}"
 
 	# Removing symlinks
-	case "${LB_BINARY_IMAGES}" in
+	case "${LIVE_IMAGE_TYPE}" in
 		hdd*)
 			find binary -type l | xargs rm -f
 			;;

scripts/build/binary_iso

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -24,13 +24,13 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-case "${LB_BINARY_IMAGES}" in
+case "${LIVE_IMAGE_TYPE}" in
 	iso)
-		IMAGE="binary.iso"
+		IMAGE="${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.iso"
 		;;
 
 	iso-hybrid)
-		IMAGE="binary.hybrid.iso"
+		IMAGE="${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.hybrid.iso"
 		;;
 
 	*)
@@ -53,11 +53,11 @@ Check_lockfile .lock
 Create_lockfile .lock
 
 # Checking depends
-Check_package chroot/usr/bin/genisoimage genisoimage
+Check_package chroot/usr/bin/xorriso xorriso
 
-if [ "${LB_BINARY_IMAGES}" = "iso-hybrid" ]
+if [ "${LIVE_IMAGE_TYPE}" = "iso-hybrid" ]
 then
-	Check_package chroot/usr/bin/isohybrid syslinux
+	Check_package chroot/usr/lib/syslinux/isohdpfx.bin syslinux-common
 fi
 
 # Restoring cache
@@ -72,79 +72,85 @@ then
 	rm -f ${IMAGE}
 fi
 
-# Handle genisoimage generic options
+# Handle xorriso generic options
-GENISOIMAGE_OPTIONS="-J -l -cache-inodes -allow-multidot"
+XORRISO_OPTIONS="-r -J -joliet-long -l -cache-inodes"
+
+# Handle xorriso live-build specific options
+if [ "${LIVE_IMAGE_TYPE}" = "iso-hybrid" ]
+then
+	XORRISO_OPTIONS="${XORRISO_OPTIONS} -isohybrid-mbr /usr/lib/syslinux/isohdpfx.bin -partition_offset 16"
+fi
 
-# Handle genisoimage live-build specific options
 if [ "${_QUIET}" = "true" ]
 then
-	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -quiet"
+	XORRISO_OPTIONS="${XORRISO_OPTIONS} -quiet"
 fi
 
 if [ "${_VERBOSE}" = "true" ]
 then
-	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
+	XORRISO_OPTIONS="${XORRISO_OPTIONS} -v"
 fi
 
 if [ -n "${LB_ISO_APPLICATION}" ] && [ "${LB_ISO_APPLICATION}" != "none" ]
 then
-	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LB_ISO_APPLICATION}\""
+	XORRISO_OPTIONS="${XORRISO_OPTIONS} -A \"${LB_ISO_APPLICATION}\""
 fi
 
 if [ -n "${LB_ISO_PREPARER}" ] && [ "${LB_ISO_PREPARER}" != "none" ]
 then
-	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LB_ISO_PREPARER}\""
+	XORRISO_OPTIONS="${XORRISO_OPTIONS} -p \"${LB_ISO_PREPARER}\""
 fi
 
 if [ -n "${LB_ISO_PUBLISHER}" ] && [ "${LB_ISO_PUBLISHER}" != "none" ]
 then
-	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LB_ISO_PUBLISHER}\""
+	XORRISO_OPTIONS="${XORRISO_OPTIONS} -publisher \"${LB_ISO_PUBLISHER}\""
 fi
 
 if [ -n "${LB_ISO_VOLUME}" ] && [ "${LB_ISO_VOLUME}" != "none" ]
 then
-	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LB_ISO_VOLUME}\""
+	XORRISO_OPTIONS="${XORRISO_OPTIONS} -V \"${LB_ISO_VOLUME}\""
 fi
 
-# Handle genisoimage architecture specific options
+# Handle xorriso architecture specific options
 case "${LB_BOOTLOADER}" in
 	grub)
-		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
+		XORRISO_OPTIONS="${XORRISO_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
-		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b boot/grub/stage2_eltorito"
+		XORRISO_OPTIONS="${XORRISO_OPTIONS} -b boot/grub/stage2_eltorito"
-		GENISOIMAGE_EXCLUDE="boot/grub/stage2_eltorito"
+		XORRISO_EXCLUDE="boot/grub/stage2_eltorito"
 		;;
 
 	grub2)
-		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
+		XORRISO_OPTIONS="${XORRISO_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
-		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b boot/grub/grub_eltorito -J"
+		XORRISO_OPTIONS="${XORRISO_OPTIONS} -b boot/grub/grub_eltorito -J"
-		GENISOIMAGE_EXCLUDE="boot/grub/grub_eltorito"
+		XORRISO_EXCLUDE="boot/grub/grub_eltorito"
 		;;
 
 	silo)
-		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -G boot/isofs.b -B ..."
+		XORRISO_OPTIONS="${XORRISO_OPTIONS} -G boot/isofs.b -B ..."
-		GENISOIMAGE_EXCLUDE="boot/isofs.b"
+		XORRISO_EXCLUDE="boot/isofs.b"
 		;;
 
 	syslinux)
-		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
 		case "${LB_MODE}" in
 			progress-linux)
-				GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b boot/boot.bin -c boot/boot.cat"
+				XORRISO_OPTIONS="${XORRISO_OPTIONS} -b boot/boot.bin -c boot/boot.cat"
-				GENISOIMAGE_EXCLUDE="boot/boot.bin"
+				XORRISO_EXCLUDE="boot/boot.bin"
 				;;
 
 			*)
-				GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b isolinux/isolinux.bin -c isolinux/boot.cat"
+				XORRISO_OPTIONS="${XORRISO_OPTIONS} -b isolinux/isolinux.bin -c isolinux/boot.cat"
-				GENISOIMAGE_EXCLUDE="isolinux/isolinux.bin"
+				XORRISO_EXCLUDE="isolinux/isolinux.bin"
 				;;
 		esac
+
+		XORRISO_OPTIONS="${XORRISO_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
 		;;
 
 	yaboot)
-		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r --iso-level 2 --netatalk -hfs -probe -map"
+		XORRISO_OPTIONS="${XORRISO_OPTIONS} --iso-level 2 --netatalk -hfs -probe -map"
-		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} binary/yaboot/hfs.map --chrp-boot -part -no-desktop"
+		XORRISO_OPTIONS="${XORRISO_OPTIONS} binary/yaboot/hfs.map --chrp-boot -part -no-desktop"
-		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -hfs-bless binary/yaboot -hfs-volid Debian/Live_powerpc"
+		XORRISO_OPTIONS="${XORRISO_OPTIONS} -hfs-bless binary/yaboot -hfs-volid Debian/Live_powerpc"
-		GENISOIMAGE_EXCLUDE="yaboot/hfs.map"
+		XORRISO_EXCLUDE="yaboot/hfs.map"
 		;;
 
 	*)
@@ -156,7 +162,7 @@ esac
 
 #if [ "${LB_DEBIAN_INSTALLER}" != "live" ]
 #then
-#	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m ${GENISOIMAGE_EXCLUDE}"
+#	XORRISO_OPTIONS="${XORRISO_OPTIONS} -m ${XORRISO_EXCLUDE}"
 #fi
 
 if [ "${LB_BOOTLOADER}" = "grub2" ]
@@ -193,19 +199,9 @@ fi
 
 cat >> binary.sh << EOF
 
-genisoimage ${GENISOIMAGE_OPTIONS} -o ${IMAGE} binary
+xorriso -as mkisofs ${XORRISO_OPTIONS} -o ${IMAGE} binary
 EOF
 
-if [ "${LB_BINARY_IMAGES}" = "iso-hybrid" ]
-then
-
-cat >> binary.sh << EOF
-
-isohybrid ${ISOHYBRID_OPTIONS} ${IMAGE}
-EOF
-
-fi
-
 case "${LB_BUILD_WITH_CHROOT}" in
 	true)
 		# Moving image

scripts/build/binary_linux-image

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -57,7 +57,7 @@ case "${LB_INITRAMFS}" in
 		;;
 esac
 
-case "${LB_ARCHITECTURES}" in
+case "${LIVE_IMAGE_ARCHITECTURE}" in
 	powerpc)
 		LINUX="vmlinux"
 		;;
@@ -73,11 +73,8 @@ Check_multiarchitectures
 mkdir -p "${DESTDIR}"
 
 # Installing linux-image
-if [ "${LB_LINUX_PACKAGES}" != "none" ]
+cp chroot/boot/"${LINUX}"-* "${DESTDIR}"
-then
+cp chroot/boot/initrd.img-* "${DESTDIR}"
-	cp chroot/boot/"${LINUX}"-* "${DESTDIR}"
-	cp chroot/boot/initrd.img-* "${DESTDIR}"
-fi
 
 case "${LB_INITRAMFS}" in
 	live-boot)

scripts/build/binary_loadlin

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -43,41 +43,60 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-case "${LB_ARCHITECTURES}" in
+case "${LIVE_IMAGE_ARCHITECTURE}" in
 	amd64|i386)
-		if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
+		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"
+				;;
+
+			false)
+				_PREFIX=""
+				;;
+		esac
+
+		# Copying loadlin
+		mkdir -p binary/tools
+		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
+
+				# Removing depends
+				Remove_package
+				;;
+		esac
+
+cat > binary/install/install.bat << EOF
+\tools\loadlin.exe vmlinuz initrd=initrd.gz
+EOF
+
+		if [ -e binary/install/gtk ]
 		then
-			# Checking depends
-			Check_package chroot/usr/lib/loadlin/loadlin.exe.gz loadlin
 
-			# Restoring cache
+cat > binary/install/gtk/install.bat << EOF
-			Restore_cache cache/packages.binary
+\tools\loadlin.exe \install\vmlinuz initrd=initrd.gz vga=788
+EOF
 
-			# Installing depends
-			Install_package
-
-			# Copying loadlin
-			mkdir -p binary/tools
-			gunzip -c chroot/usr/lib/loadlin/loadlin.exe.gz > binary/tools/loadlin.exe
-			gunzip -c chroot/usr/share/doc/loadlin/manual.txt.gz > binary/tools/loadlin.txt
-
-			# Saving cache
-			Save_cache cache/packages.binary
-
-			# Removing depends
-			Remove_package
-		else
-			# Copying loadlin
-			mkdir -p binary/tools
-			gunzip -c /usr/lib/loadlin/loadlin.exe.gz > binary/tools/loadlin.exe
-			gunzip -c /usr/share/doc/loadlin/manual.txt.gz > binary/tools/loadlin.txt
 		fi
+
+		# Creating stage file
+		Create_stagefile .build/binary_loadlin
 		;;
 
 	*)
 		Echo_warning "loadlin inclusion is set to true but not compatible with your architecture, ignoring."
 		;;
 esac
-
-# Creating stage file
-Create_stagefile .build/binary_loadlin

scripts/build/binary_manifest

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -24,6 +24,11 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
+if [ "${LB_CHROOT_FILESYSTEM}" = "none" ]
+then
+	exit 0
+fi
+
 Echo_message "Begin creating manifest..."
 
 # Requiring stage file
@@ -60,7 +65,7 @@ cp chroot.packages.live "binary/${INITFS}/filesystem.${SUFFIX}"
 echo "$(diff chroot.packages.live chroot.packages.install | awk '/^< / { print $2 }')" \
 	> "binary/${INITFS}/filesystem.${SUFFIX}-remove"
 
-cp chroot.packages.live binary.packages
+cp chroot.packages.live ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.packages
 
 # Creating stage file
 Create_stagefile .build/binary_manifest

scripts/build/binary_memtest

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -24,7 +24,7 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if [ "${LB_MEMTEST}" = "false" ] || [ "${LB_MEMTEST}" = "none" ]
+if [ "${LB_MEMTEST}" = "false" ] || [ "${LB_MEMTEST}" = "none" ] || [ "${LB_CHROOT_FILESYSTEM}" = "none" ]
 then
 	exit 0
 fi
@@ -43,7 +43,7 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-if [ "${LB_ARCHITECTURES}" != "amd64" ] && [ "${LB_ARCHITECTURES}" != "i386" ]
+if [ "${LIVE_IMAGE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_IMAGE_ARCHITECTURE}" != "i386" ]
 then
 	Echo_warning "skipping binary_memtest, foreign architecture."
 	exit 0

scripts/build/binary_netboot

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-build(7) - System Build Scripts
-## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
+## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org>
 ##
 ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
 ## This is free software, and you are welcome to redistribute it
@@ -24,7 +24,7 @@ Arguments "${@}"
 Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
 Set_defaults
 
-if ! In_list netboot "${LB_BINARY_IMAGES}"
+if ! In_list netboot "${LIVE_IMAGE_TYPE}"
 then
 	exit 0
 fi
@@ -48,7 +48,7 @@ Check_lockfile .lock
 # Creating lock file
 Create_lockfile .lock
 
-if [ "${LB_ARCHITECTURES}" = "sparc" ]
+if [ "${LIVE_IMAGE_ARCHITECTURE}" = "sparc" ]
 then
 	# Checking depends
 	Check_package chroot/usr/bin/elftoaout sparc-utils
@@ -119,7 +119,7 @@ then
 fi
 
 # Remove old binary
-rm -f binary.netboot.tar binary.netboot.tar.gz binary.netboot.tar.bz2 binary.netboot.tar.xz binary.netboot.tar.xz
+rm -f ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar.gz ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar.bz2 ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar.xz ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar.xz
 
 # Creating image file
 ROOT_DIR=$(basename ${LB_NET_ROOT_PATH})
@@ -142,23 +142,23 @@ cd binary.tmp
 mkdir tftpboot/live
 mv */live/vmlinuz* */live/initrd* tftpboot/live
 
-tar cf ../binary.netboot.tar *
+tar cf ../${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar *
 
 case "${LB_COMPRESSION}" in
 	bzip2)
-		bzip2 ${BZIP2_OPTIONS} ../binary.netboot.tar
+		bzip2 ${BZIP2_OPTIONS} ../${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar
 		;;
 
 	gzip)
-		gzip ${GZIP_OPTIONS} ../binary.netboot.tar
+		gzip ${GZIP_OPTIONS} ../${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar
 		;;
 
 	lzip)
-		lzip ${LZIP_OPTIONS} ../binary.netboot.tar
+		lzip ${LZIP_OPTIONS} ../${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar
 		;;
 
 	xz)
-		xz ${XZ_OPTIONS} ../binary.netboot.tar
+		xz ${XZ_OPTIONS} ../${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar
 		;;
 
 	none)