The following commit has been merged in the upstream branch:
commit 827aa7605b7e7c9c20974ea8febe6d29799ca9a4
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Aug 14 20:07:16 2010 +0200
Adding upstream version 2.0.1.
diff --git a/VERSION b/VERSION
index 227cea2..38f77a6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.0
+2.0.1
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 149d8be..04ede97 100644
--- a/manpages/de/live-config.de.7
+++ b/manpages/de/live-config.de.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 10.08.2010 2.0.0 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 14.08.2010 2.0.1 "Debian Live Projekt"
.SH NAME
\fBlive\-config\fP \- System Konfiguration Skripte
diff --git a/manpages/en/live-config.7 b/manpages/en/live-config.7
index 41836a6..c3b9601 100644
--- a/manpages/en/live-config.7
+++ b/manpages/en/live-config.7
@@ -6,7 +6,7 @@
.\" under certain conditions; see COPYING for details.
.\"
.\"
-.TH LIVE\-CONFIG 7 2010\-08\-10 2.0.0 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2010\-08\-14 2.0.1 "Debian Live Project"
.SH NAME
\fBlive\-config\fR \- System Configuration Scripts
diff --git a/manpages/fr/live-config.fr.7 b/manpages/fr/live-config.fr.7
index b002e72..9ecec0b 100644
--- a/manpages/fr/live-config.fr.7
+++ b/manpages/fr/live-config.fr.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 10.08.2010 2.0.0 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 14.08.2010 2.0.1 "Projet Debian Live"
.SH NOM
\fBlive\-config\fP \- Scripts de configuration du système
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index dd05e67..0ec0482 100644
--- a/manpages/po/de/live-config.7.po
+++ b/manpages/po/de/live-config.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 2.0.0\n"
-"POT-Creation-Date: 2010-08-10 00:00+0300\n"
+"Project-Id-Version: live-config 2.0.1\n"
+"POT-Creation-Date: 2010-08-14 20:04+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2010-08-10"
-msgstr "10.08.2010"
+msgid "2010-08-14"
+msgstr "14.08.2010"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0.0"
-msgstr ""
+msgid "2.0.1"
+msgstr "2.0.1"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/po/fr/live-config.7.po b/manpages/po/fr/live-config.7.po
index 26cdf9a..ebb51c1 100644
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 2.0.0\n"
-"POT-Creation-Date: 2010-08-10 00:00+0300\n"
+"Project-Id-Version: live-config 2.0.1\n"
+"POT-Creation-Date: 2010-08-14 20:04+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Thierry Lépicier <thierry.lepicier at free.fr>\n"
"Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2010-08-10"
-msgstr "10.08.2010"
+msgid "2010-08-14"
+msgstr "14.08.2010"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0.0"
-msgstr ""
+msgid "2.0.1"
+msgstr "2.0.1"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/po/pt_BR/live-config.7.po b/manpages/po/pt_BR/live-config.7.po
index e158894..9bf079d 100644
--- a/manpages/po/pt_BR/live-config.7.po
+++ b/manpages/po/pt_BR/live-config.7.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-config 2.0.0\n"
-"POT-Creation-Date: 2010-08-10 00:00+0300\n"
+"Project-Id-Version: live-config 2.0.1\n"
+"POT-Creation-Date: 2010-08-14 20:04+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Tassia Camoes Araujo <tassia at gmail.com>\n"
"Language-Team: none\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2010-08-10"
-msgstr "10-08-2010"
+msgid "2010-08-14"
+msgstr "14-08-2010"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0.0"
-msgstr ""
+msgid "2.0.1"
+msgstr "2.0.1"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 99ba064..0e4f0b3 100644
--- a/manpages/pot/live-config.7.pot
+++ b/manpages/pot/live-config.7.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config VERSION\n"
-"POT-Creation-Date: 2010-08-10 00:00+0300\n"
+"POT-Creation-Date: 2010-08-14 20:04+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -24,13 +24,13 @@ msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2010-08-10"
+msgid "2010-08-14"
msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0.0"
+msgid "2.0.1"
msgstr ""
#. type: TH
diff --git a/manpages/pt_BR/live-config.pt_BR.7 b/manpages/pt_BR/live-config.pt_BR.7
index 174967b..bd28bea 100644
--- a/manpages/pt_BR/live-config.pt_BR.7
+++ b/manpages/pt_BR/live-config.pt_BR.7
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-CONFIG 7 10\-08\-2010 2.0.0 "Projeto Debian Live"
+.TH LIVE\-CONFIG 7 14\-08\-2010 2.0.1 "Projeto Debian Live"
.SH NOME
\fBlive\-config\fP \- Scripts para Configuração do Sistema
diff --git a/scripts/config/116-xserver-xorg b/scripts/config/116-xserver-xorg
index 0afdd79..8493925 100755
--- a/scripts/config/116-xserver-xorg
+++ b/scripts/config/116-xserver-xorg
@@ -37,7 +37,6 @@ Configure_xserver_xorg ()
if [ -n "${LIVE_KEYBOARD_VARIANT}" ]
then
echo "xserver-xorg xserver-xorg/config/inputdevice/keyboard/variant select ${LIVE_KEYBOARD_VARIANT}" >> /tmp/debconf.live
-xserver-xorg/config/inputdevice/keyboard/variant
fi
if [ -n "${LIVE_KEYBOARD_OPTIONS}" ]
@@ -45,15 +44,18 @@ xserver-xorg/config/inputdevice/keyboard/variant
echo "xserver-xorg xserver-xorg/config/inputdevice/keyboard/options string ${LIVE_KEYBOARD_OPTIONS}" >> /tmp/debconf.live
fi
- case "${LIVE_X_SESSION_MANAGER}" in
- none)
- rm -f /etc/X11/default-display-manager
- ;;
-
- *)
- update-alternatives --quiet --set x-session-manager "${LIVE_X_SESSION_MANAGER}"
- ;;
- esac
+ if [ -n "${LIVE_X_SESSION_MANAGER}" ]
+ then
+ case "${LIVE_X_SESSION_MANAGER}" in
+ none)
+ rm -f /etc/X11/default-display-manager
+ ;;
+
+ *)
+ update-alternatives --quiet --set x-session-manager "${LIVE_X_SESSION_MANAGER}"
+ ;;
+ esac
+ fi
if [ -n "${LIVE_XORG_DRIVER}" ]
then
@@ -73,12 +75,10 @@ xserver-xorg/config/inputdevice/keyboard/variant
debconf-set-selections < /tmp/debconf.live
rm -f /tmp/debconf.live
- dexconf
-
-# dpkg-reconfigure -f non-interactive -p critical \
-# xserver-xorg 2>&1 \
-# | grep -v "overwriting possibly-customised configuration" \
-# | grep -v "file; backup in /etc/X11/xorg.conf"
+ dpkg-reconfigure -f non-interactive -p critical \
+ xserver-xorg 2>&1 \
+ | grep -v "overwriting possibly-customised configuration" \
+ | grep -v "file; backup in /etc/X11/xorg.conf" || true
# Creating state file
touch /var/lib/live/config/xserver-xorg
--
live-config