Commit 635a69c6 authored by Raphaël Hertzog's avatar Raphaël Hertzog
Browse files

Merge branch 'debian'

Conflicts:
	debian/changelog
parents e26d981a 3985c957
live-build (3.0~b5-1) kali; urgency=low
live-build (3.0.1-1) unstable; urgency=low
* Import newer live-build into kali.
* Removing superfluous menu default directive in installer syslinux
menues.
* Updating wheezy release number.
* Updating squeeze point-release number.
* Dropping German manpage translations stubs for the release.
-- Daniel Baumann <daniel@debian.org> Thu, 14 Feb 2013 19:31:04 +0100
live-build (3.0.0-1) unstable; urgency=low
* Updating wheezy pre-release number for b4.
* Dropping dpkg compression level.
* Correcting spelling typos in changelog to make lintian happy.
* Escaping quotes to workaround a false-positive of checkbashisms in
binary_debian-installer.
* Correcting install path in loadlins install.bat for the gtk d-i
flavour.
* Switching default binary filesystem for hdd images to fat32 to be more
robust on todays flash devices.
* Correcting vshift in syslinux themes to correct display bug with
overlong lines, thanks to Thanatermesis <thanatermesis@gmail.com>.
* Adding bootrap_archive-keys to establish secure trust-chain on top of
debian-keyring for derivatives.
* Updating syslinux configurations and handling for syslinux 5.
* Adding hook to remove systemd machine-id.
* Renumbering hooks.
* Correcting wrong debian-installer syslinux menu files.
* Including HDT in advanced options menu within syslinux menu.
* Updating binary_debian-installer for newer append replacement
variables used in syslinux configs.
* Dropping theme package support, themes are either in the config tree
or the embedded one from live-build is used.
* Correctly remove binary contents and packages file in clean script.
* Adding key-shortcut for advanced options in syslinux menu.
* Removing default menu marker for install entry in syslinux menu.
* Converting splash.svg not just splash.svg.in files as syslinux
bootsplashes.
* Removing dropped syslinux-theme config option from lb_config manpage.
-- Daniel Baumann <daniel@debian.org> Sat, 09 Feb 2013 00:18:07 +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.
......@@ -38,7 +114,7 @@ live-build (3.0~b5-1) kali; urgency=low
* Adding support for sha512 checksums.
* Dropping pre-squeeze handling for win32-loader files.
-- Raphaël Hertzog <hertzog@debian.org> Wed, 09 Jan 2013 15:52:46 +0100
-- Daniel Baumann <daniel@debian.org> Wed, 02 Jan 2013 11:45:30 +0100
live-build (3.0~b4-1) unstable; urgency=low
......@@ -54,7 +130,7 @@ live-build (3.0~b4-1) unstable; urgency=low
[ Daniel Baumann ]
* Removing grub package from binary_debian-installer for wheezy.
-- Raphaël Hertzog <hertzog@debian.org> Mon, 24 Dec 2012 14:10:40 +0100
-- Daniel Baumann <daniel@debian.org> Sun, 23 Dec 2012 10:50:38 +0100
live-build (3.0~b3-1) unstable; urgency=low
......@@ -4342,7 +4418,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>.
......
......@@ -16,8 +16,8 @@ Recommends:
live-boot-doc, live-config-doc, live-manual-html | live-manual, cpio,
gnu-fdisk
Suggests:
dosfstools, xorriso, git, loadlin, memtest86+ | memtest86, mtools, parted,
squashfs-tools | mtd-tools, sudo | fakeroot, syslinux | grub,
dosfstools, debian-keyring, xorriso, git, gpgv, loadlin, memtest86+ | memtest86,
mtools, parted, squashfs-tools | mtd-tools, sudo | fakeroot, syslinux | grub,
uuid-runtime, win32-loader
Description: Live System Build Scripts
live-build contains the scripts that build a live system from a configuration
......
......@@ -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
......
compression = xz
compression-level = 9
......@@ -303,7 +303,7 @@ Set_defaults ()
esac
# Setting templates
if [ -n "${LIVE_BUID}" ]
if [ -n "${LIVE_BUILD}" ]
then
LB_TEMPLATES="${LB_TEMPLATES:-${LIVE_BUILD}/templates}"
else
......@@ -624,6 +624,7 @@ Set_defaults ()
remove-python-py \
remove-temporary-files \
remove-udev-persistent-rules \
remove-systemd-machine-id \
update-apt-file-cache \
update-apt-xapian-index \
update-glx-alternative \
......@@ -830,7 +831,7 @@ Set_defaults ()
;;
*)
LB_BINARY_FILESYSTEM="${LB_BINARY_FILESYSTEM:-fat16}"
LB_BINARY_FILESYSTEM="${LB_BINARY_FILESYSTEM:-fat32}"
;;
esac
......@@ -1140,21 +1141,6 @@ Set_defaults ()
# Setting net tarball
LB_NET_TARBALL="${LB_NET_TARBALL:-true}"
# Setting syslinux theme package
case "${LB_MODE}" in
progress-linux)
LB_SYSLINUX_THEME="${LB_SYSLINUX_THEME:-progress-standard}"
;;
ubuntu)
LB_SYSLINUX_THEME="${LB_SYSLINUX_THEME:-ubuntu-oneiric}"
;;
*)
LB_SYSLINUX_THEME="${LB_SYSLINUX_THEME:-live-build}"
;;
esac
# Setting firmware option
case "${LB_MODE}" in
ubuntu)
......
......@@ -9,8 +9,8 @@
# Debian releases
RELEASE_squeeze="6.0.6"
RELEASE_wheezy="7.0~b2"
RELEASE_squeeze="6.0.7"
RELEASE_wheezy="7.0.0"
RELEASE_jessie="8"
RELEASE_sid="unstable"
......
#!/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
.\"*******************************************************************
.\"
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2013\-01\-02 3.0~b5\-1 "Debian Live Project"
.SH NAME
\fBlb\fP \- wrapper for live\-build programs
.SH SYNOPSIS
\fBlb\fP COMMAND [COMMAND_OPTIONS]
.PP
\fBlb\fP [\fIlive\-build\ options\fP]
.SH DESCRIPTION
\fBlb\fP is a high\-level command (porcelain) of \fIlive\-build\fP(7), the Debian
Live tool suite.
.PP
.\" FIXME
.SH OPTIONS
\fBlb\fP has no specific options but understands all generic live\-build
options. See \fIlive\-build\fP(7) for a complete list of all generic live\-build
options.
.SH FILES
.IP \fBnone\fP 4
.SH "SEE ALSO"
\fIlive\-build\fP(7)
.PP
This program is a part of live\-build.
.SH HOMEPAGE
More information about live\-build and the Debian Live project can be found
on the homepage at <\fIhttp://live.debian.net/\fP> and in the manual at
<\fIhttp://live.debian.net/manual/\fP>.
.SH BUGS
Bugs can be reported by submitting a bugreport for the live\-build package in
the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fP> or by
writing a mail to the Debian Live mailing list at
<\fIdebian\-live@lists.debian.org\fP>.
.SH AUTHOR
live\-build was written by Daniel Baumann <\fIdaniel@debian.org\fP> for
the Debian project.
.\"*******************************************************************
.\"
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2013\-01\-02 3.0~b5\-1 "Debian Live Project"
.SH NAME
\fBlb binary\fP \- Complete the binary stage
.SH SYNOPSIS
\fBlb binary\fP [\fIlive\-build options\fP]
.SH DESCRIPTION
\fBlb binary\fP is a high\-level command (porcelain) of \fIlive\-build\fP(7), the
Debian Live tool suite.
.PP
\fBlb binary\fP calls all necessary live\-build programs in the correct order to
complete the binary stage.
.SH OPTIONS
\fBlb binary\fP has no specific options but understands all generic live\-build
options. See \fIlive\-build\fP(7) for a complete list of all generic live\-build
options.
.SH FILES
.IP \fBnone\fP 4
.SH "SEE ALSO"
\fIlive\-build\fP(7)
.PP
This program is a part of live\-build.
.SH HOMEPAGE
More information about live\-build and the Debian Live project can be found
on the homepage at <\fIhttp://live.debian.net/\fP> and in the manual at
<\fIhttp://live.debian.net/manual/\fP>.
.SH BUGS
Bugs can be reported by submitting a bugreport for the live\-build package in
the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fP> or by
writing a mail to the Debian Live mailing list at
<\fIdebian\-live@lists.debian.org\fP>.
.SH AUTHOR
live\-build was written by Daniel Baumann <\fIdaniel@debian.org\fP> for
the Debian project.
.\"*******************************************************************
.\"
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2013\-01\-02 3.0~b5\-1 "Debian Live Project"
.SH NAME
\fBlb bootstrap\fP \- Complete the bootstrap stage
.SH SYNOPSIS
\fBlb bootstrap\fP [\fIlive\-build options\fP]
.SH DESCRIPTION
\fBlb bootstrap\fP is a high\-level command (porcelain) of \fIlive\-build\fP(7), the
Debian Live tool suite.
.PP
\fBlb bootstrap\fP calls all necessary live\-build programs in the correct order
to complete the bootstrap stage.
.SH OPTIONS
\fBlb bootstrap\fP has no specific options but understands all generic
live\-build options. See \fIlive\-build\fP(7) for a complete list of all generic
live\-build options.
.SH FILES
.IP \fBnone\fP 4
.SH "SEE ALSO"
\fIlive\-build\fP(7)
.PP
This program is a part of live\-build.
.SH HOMEPAGE
More information about live\-build and the Debian Live project can be found
on the homepage at <\fIhttp://live.debian.net/\fP> and in the manual at
<\fIhttp://live.debian.net/manual/\fP>.
.SH BUGS
Bugs can be reported by submitting a bugreport for the live\-build package in
the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fP> or by
writing a mail to the Debian Live mailing list at
<\fIdebian\-live@lists.debian.org\fP>.
.SH AUTHOR
live\-build was written by Daniel Baumann <\fIdaniel@debian.org\fP> for
the Debian project.
.\"*******************************************************************
.\"
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2013\-01\-02 3.0~b5\-1 "Debian Live Project"
.SH NAME
\fBlb build\fP \- Complete the bootstrap, chroot, binary, and source stages
.SH SYNOPSIS
\fBlb build\fP [\fIlive\-build options\fP]
.SH DESCRIPTION
\fBlb build\fP is a high\-level command (porcelain) of \fIlive\-build\fP(7), the
Debian Live tool suite.
.PP
\fBlb build\fP calls all necessary live\-build programs in the correct order to
complete the bootstrap, chroot, binary, and source stages.
.SH OPTIONS
\fBlb build\fP has no specific options but understands all generic live\-build
options. See \fIlive\-build\fP(7) for a complete list of all generic live\-build
options.
.SH FILES
.\" FIXME
.IP \fBauto/build\fP 4
.\" FIXME
.SH "SEE ALSO"
\fIlive\-build\fP(7)
.PP
This program is a part of live\-build.
.SH HOMEPAGE
More information about live\-build and the Debian Live project can be found
on the homepage at <\fIhttp://live.debian.net/\fP> and in the manual at
<\fIhttp://live.debian.net/manual/\fP>.
.SH BUGS
Bugs can be reported by submitting a bugreport for the live\-build package in
the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fP> or by
writing a mail to the Debian Live mailing list at
<\fIdebian\-live@lists.debian.org\fP>.
.SH AUTHOR
live\-build was written by Daniel Baumann <\fIdaniel@debian.org\fP> for
the Debian project.
.\"*******************************************************************
.\"
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2013\-01\-02 3.0~b5\-1 "Debian Live Project"
.SH NAME
\fBlb chroot\fP \- Complete the chroot stage
.SH SYNOPSIS
\fBlb chroot\fP [\fIlive\-build options\fP]
.SH DESCRIPTION
\fBlb chroot\fP is a high\-level command (porcelain) of \fIlive\-build\fP(7), the
Debian Live tool suite.
.PP
\fBlb chroot\fP calls all necessary live\-build programs in the correct order to
complete the chroot stage.
.SH OPTIONS
\fBlb chroot\fP has no specific options but understands all generic live\-build
options. See \fIlive\-build\fP(7) for a complete list of all generic live\-build
options.
.SH FILES
.IP \fBnone\fP 4
.SH "SEE ALSO"
\fIlive\-build\fP(7)
.PP
This program is a part of live\-build.
.SH HOMEPAGE
More information about live\-build and the Debian Live project can be found
on the homepage at <\fIhttp://live.debian.net/\fP> and in the manual at
<\fIhttp://live.debian.net/manual/\fP>.
.SH BUGS
Bugs can be reported by submitting a bugreport for the live\-build package in
the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fP> or by
writing a mail to the Debian Live mailing list at
<\fIdebian\-live@lists.debian.org\fP>.
.SH AUTHOR
live\-build was written by Daniel Baumann <\fIdaniel@debian.org\fP> for
the Debian project.
.\"*******************************************************************
.\"
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2013\-01\-02 3.0~b5\-1 "Debian Live Project"
.SH NAME
\fBlb clean\fP \- Clean build directory
.SH SYNOPSIS
\fBlb clean\fP [\fIlive\-build options\fP]
.SH DESCRIPTION
\fBlb clean\fP is a high\-level command (porcelain) of \fIlive\-build\fP(7), the
Debian Live tool suite.
.PP
.\" FIXME
.\" FIXME
\fBlb clean\fP is responsible for cleaning up after a system is built. It
removes the build directories, and removes some other files including stage
files, and any detritus left behind by other live\-build commands.
.SH OPTIONS
In addition to its specific options \fBlb clean\fP understands all generic
live\-build options. See \fIlive\-build\fP(7) for a complete list of all generic
live\-build options.
.PP
.\" FIXME
.IP \fB\-\-all\fP 4
removes chroot, binary, stage, and source. The cache directory is kept. This
is the default operation and will be performed if no argument is given.
.IP \fB\-\-cache\fP 4
removes the cache directories.
.IP \fB\-\-chroot\fP 4
unmounts and removes the chroot directory.
.IP \fB\-\-binary\fP 4
removes all binary related caches, files, directories, and stages files.
.IP \fB\-\-purge\fP 4
removes everything, including all caches. The config directory is kept.
.IP \fB\-\-remove\fP 4
removes everything, including package cache but not stage cache. The config
directory is kept.
.IP \fB\-\-stage\fP 4
removes all stage files.
.IP \fB\-\-source\fP 4
.\" FIXME
removes all source related caches, files, directories, and stage files.
.SH FILES
.\" FIXME
.IP \fBauto/clean\fP 4
.\" FIXME
.SH "SEE ALSO"
\fIlive\-build\fP(7)
.PP
This program is a part of live\-build.
.SH HOMEPAGE
More information about live\-build and the Debian Live project can be found
on the homepage at <\fIhttp://live.debian.net/\fP> and in the manual at
<\fIhttp://live.debian.net/manual/\fP>.
.SH BUGS
Bugs can be reported by submitting a bugreport for the live\-build package in
the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fP> or by
writing a mail to the Debian Live mailing list at
<\fIdebian\-live@lists.debian.org\fP>.
.SH AUTHOR
live\-build was written by Daniel Baumann <\fIdaniel@debian.org\fP> for
the Debian project.
This diff is collapsed.
.\"*******************************************************************
.\"
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2013\-01\-02 3.0~b5\-1 "Debian Live Project"
.SH NAME
\fBlb source\fP \- Complete the source stage
.SH SYNOPSIS
\fBlb source\fP [\fIlive\-build options\fP]
.SH DESCRIPTION
\fBlb source\fP is a high\-level command (porcelain) of \fIlive\-build\fP(7), the
Debian Live tool suite.
.PP
\fBlb source\fP calls all necessary live\-build programs in the correct order to
complete the source stage.
.SH OPTIONS
\fBlb source\fP has no specific options but understands all generic live\-build
options. See \fIlive\-build\fP(7) for a complete list of all generic live\-build
options.
.SH FILES
.IP \fBnone\fP 4
.SH "SEE ALSO"
\fIlive\-build\fP(7)
.PP
This program is a part of live\-build.
.SH HOMEPAGE
More information about live\-build and the Debian Live project can be found
on the homepage at <\fIhttp://live.debian.net/\fP> and in the manual at
<\fIhttp://live.debian.net/manual/\fP>.
.SH BUGS
Bugs can be reported by submitting a bugreport for the live\-build package in
the Debian Bug Tracking System at <\fIhttp://bugs.debian.org/\fP> or by
writing a mail to the Debian Live mailing list at
<\fIdebian\-live@lists.debian.org\fP>.
.SH AUTHOR
live\-build was written by Daniel Baumann <\fIdaniel@debian.org\fP> for
the Debian project.
.\"*******************************************************************
.\"
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2013\-01\-02 3.0~b5\-1 "Debian Live Project"
.SH NAME
\fBlb testroot\fP \- Ensure that a system is built as root
.SH SYNOPSIS
\fBlb testroot\fP [\fIlive\-build options\fP]
.SH DESCRIPTION
\fBlb testroot\fP is a high\-level command (porcelain) of \fIlive\-build\fP(7), the
Debian Live tool suite.
.PP
.\" FIXME
\fBlb testroot\fP simply checks to see if you are root. If not, it exits with
an error. Debian Live images must currently be built as real root.
.PP
.\" FIXME
Note: Support for using \fIfakeroot\fP(1) and \fIsudo\fP(8) internally in
live\-build itself is still experimental, however, calling a helper yourself
with sudo is safe.
.SH OPTIONS
\fBlb testroot\fP has no specific options but understands all generic
live\-build options. See \fIlive\-build\fP(7) for a complete list of all generic
live\-build options.
.SH FILES
.IP \fBnone\fP 4
.SH "SEE ALSO"
\fIlive\-build\fP(7)
.PP