Commit cfcdd3e6 authored by Daniel Baumann's avatar Daniel Baumann
Browse files

Adding upstream version 4.0~alpha26.

parent 5092592c
4.0~alpha25-1
4.0~alpha26-1
......@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 18.09.2013 4.0~alpha25\-1 "Live Systems Projekt"
.TH LIVE\-BUILD 1 19.09.2013 4.0~alpha26\-1 "Live Systems Projekt"
.SH NAME
\fBlive\-build\fP \- System Build Skripte
......
......@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 18.09.2013 4.0~alpha25\-1 "Live Systems Projekt"
.TH LIVE\-BUILD 1 19.09.2013 4.0~alpha26\-1 "Live Systems Projekt"
.SH NAME
\fBlive\-build\fP \- System Build Skripte
......
......@@ -6,7 +6,7 @@
.\" under certain conditions; see COPYING for details.
.\"
.\"
.TH LIVE\-BUILD 1 2013\-09\-18 4.0~alpha25-1 "Live Systems Project"
.TH LIVE\-BUILD 1 2013\-09\-19 4.0~alpha26-1 "Live Systems Project"
.SH NAME
\fBlive\-build\fR \- System Build Scripts
......
......@@ -6,7 +6,7 @@
.\" under certain conditions; see COPYING for details.
.\"
.\"
.TH LIVE\-BUILD 1 2013\-09\-18 4.0~alpha25-1 "Live Systems Project"
.TH LIVE\-BUILD 1 2013\-09\-19 4.0~alpha26-1 "Live Systems Project"
.SH NAME
\fBlive\-build\fR \- System Build Scripts
......
......@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 18.09.2013 4.0~alpha25\-1 "Proyecto Live Systems"
.TH LIVE\-BUILD 1 19.09.2013 4.0~alpha26\-1 "Proyecto Live Systems"
.SH NOMBRE
\fBlive\-build\fP \- Scripts de Creación del Sistema
......
......@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 18.09.2013 4.0~alpha25\-1 "Proyecto Live Systems"
.TH LIVE\-BUILD 1 19.09.2013 4.0~alpha26\-1 "Proyecto Live Systems"
.SH NOMBRE
\fBlive\-build\fP \- Scripts de Creación del Sistema
......
......@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~alpha25-1\n"
"POT-Creation-Date: 2013-09-18 10:24+0300\n"
"Project-Id-Version: live-build 4.0~alpha26-1\n"
"POT-Creation-Date: 2013-09-19 09:09+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
"Language-Team: none\n"
......@@ -24,14 +24,14 @@ msgstr "LIVE-BUILD"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "2013-09-18"
msgstr "18.09.2013"
msgid "2013-09-19"
msgstr "19.09.2013"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~alpha25-1"
msgstr "4.0~alpha25-1"
msgid "4.0~alpha26-1"
msgstr "4.0~alpha26-1"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
......
......@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~alpha25-1\n"
"POT-Creation-Date: 2013-09-18 10:24+0300\n"
"Project-Id-Version: live-build 4.0~alpha26-1\n"
"POT-Creation-Date: 2013-09-19 09:09+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
"Language-Team: none\n"
......@@ -24,14 +24,14 @@ msgstr "LIVE-BUILD"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "2013-09-18"
msgstr "18.09.2013"
msgid "2013-09-19"
msgstr "19.09.2013"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~alpha25-1"
msgstr "4.0~alpha25-1"
msgid "4.0~alpha26-1"
msgstr "4.0~alpha26-1"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
......
......@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~alpha25-1\n"
"POT-Creation-Date: 2013-09-18 10:24+0300\n"
"Project-Id-Version: live-build 4.0~alpha26-1\n"
"POT-Creation-Date: 2013-09-19 09:09+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
......@@ -23,14 +23,14 @@ msgstr "LIVE-BUILD"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "2013-09-18"
msgstr "18.09.2013"
msgid "2013-09-19"
msgstr "19.09.2013"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~alpha25-1"
msgstr "4.0~alpha25-1"
msgid "4.0~alpha26-1"
msgstr "4.0~alpha26-1"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
......
......@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~alpha25-1\n"
"POT-Creation-Date: 2013-09-18 10:24+0300\n"
"Project-Id-Version: live-build 4.0~alpha26-1\n"
"POT-Creation-Date: 2013-09-19 09:09+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
......@@ -23,14 +23,14 @@ msgstr "LIVE-BUILD"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "2013-09-18"
msgstr "18.09.2013"
msgid "2013-09-19"
msgstr "19.09.2013"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~alpha25-1"
msgstr "4.0~alpha25-1"
msgid "4.0~alpha26-1"
msgstr "4.0~alpha26-1"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2013-09-18 10:24+0300\n"
"POT-Creation-Date: 2013-09-19 09:09+0300\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"
......@@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "2013-09-18"
msgid "2013-09-19"
msgstr ""
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~alpha25-1"
msgid "4.0~alpha26-1"
msgstr ""
#. type: TH
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2013-09-18 10:24+0300\n"
"POT-Creation-Date: 2013-09-19 09:09+0300\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"
......@@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "2013-09-18"
msgid "2013-09-19"
msgstr ""
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~alpha25-1"
msgid "4.0~alpha26-1"
msgstr ""
#. type: TH
......
......@@ -232,24 +232,10 @@ _LIVE_TOOLS_VERSION="$(chroot chroot apt-cache policy live-tools | awk '/Install
case "${LB_MODE}" in
progress-linux)
_PROJECT="Progress Linux"
if ls config/package-lists/base-system.list*
then
_DESCRIPTION="Base System"
elif ls config/package-lists/gnome-desktop.list*
then
_DESCRIPTION="GNOME Desktop"
elif ls config/package-lists/lxc-server.list* > /dev/null 2>&1
then
_DESCRIPTION="LXC Server"
else
_DESCRIPTION=""
fi
;;
*)
_PROJECT="Debian GNU/Linux"
_DESCRIPTION=""
;;
esac
......@@ -266,7 +252,6 @@ do
-e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \
-e "s|@VERSION@|${_VERSION}|g" \
-e "s|@ARCHITECTURE@|${_ARCHITECTURE}|g" \
-e "s|@DESCRIPTION@|${_DESCRIPTION}|g" \
-e "s|@DATE@|${_DATE}|g" \
-e "s|@YEAR@|${_YEAR}|g" \
-e "s|@MONTH@|${_MONTH}|g" \
......
#!/usr/bin/python3.2
#!/usr/bin/python3.3
## live-build(7) - System Build Scripts
## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
......
#!/usr/bin/python3.2
#!/usr/bin/python3.3
## live-build(7) - System Build Scripts
## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
......
......@@ -673,9 +673,32 @@ EOF
fi
fi
# probably too bold, needs refinment (FIXME)
rm -f chroot/etc/apt/conf.d/*
rm -f chroot/etc/apt/preferences.d/*
# Removing chroot-only apt sources
for FILE in config/archives/*.list.chroot
do
if [ -e "${FILE}" ]
then
rm -f "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)"
fi
done
# Removing chroot-only apt configuration
for FILE in config/archives/*.conf.chroot
do
if [ -e "${FILE}" ]
then
rm -f "chroot/etc/apt/conf.d/$(basename ${FILE} .chroot)"
fi
done
# Removing chroot-only apt preferences
for FILE in config/archives/*.pref.chroot
do
if [ -e "${FILE}" ]
then
rm -f "chroot/etc/apt/preferences.d/$(basename ${FILE} .chroot)"
fi
done
# Adding local apt sources (binary)
for FILE in config/archives/*.list config/archives/*.list.binary
......
......@@ -244,7 +244,7 @@
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
id="tspan3041">@DESCRIPTION@ @ARCHITECTURE@</tspan><tspan
id="tspan3041">@ARCHITECTURE@</tspan><tspan
y="659.20679"
x="190.68135"
sodipodi:role="line"
......
......@@ -244,7 +244,7 @@
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
id="tspan3041">@DESCRIPTION@ @ARCHITECTURE@</tspan><tspan
id="tspan3041">@ARCHITECTURE@</tspan><tspan
y="659.20679"
x="190.68135"
sodipodi:role="line"
......
......@@ -244,7 +244,7 @@
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
id="tspan3041">@DESCRIPTION@ @ARCHITECTURE@</tspan><tspan
id="tspan3041">@ARCHITECTURE@</tspan><tspan
y="659.20679"
x="190.68135"
sodipodi:role="line"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment