[SCM] live-config branch, upstream, updated. upstream/2.0.12-1-g9fec092
Daniel Baumann
daniel at debian.org
Mon Nov 29 22:25:30 UTC 2010
The following commit has been merged in the upstream branch:
commit 9fec092a4166c1b3ef71510e9c40cbe091614fd5
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Nov 29 23:24:54 2010 +0100
Adding upstream version 2.0.13.
diff --git a/VERSION b/VERSION
index 280a1e3..82bd22f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.12
+2.0.13
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 2d5a448..cca6ebe 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 22.11.2010 2.0.12 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 29.11.2010 2.0.13 "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 72ac6b6..5423bc5 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\-11\-22 2.0.12 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2010\-11\-29 2.0.13 "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 a7496f4..4c8857c 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 22.11.2010 2.0.12 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 29.11.2010 2.0.13 "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 03ea678..737c88d 100644
--- a/manpages/po/de/live-config.7.po
+++ b/manpages/po/de/live-config.7.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config 2.0.12\n"
-"POT-Creation-Date: 2010-11-22 23:00+0100\n"
+"POT-Creation-Date: 2010-11-29 23:23+0100\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-11-22"
-msgstr "22.11.2010"
+msgid "2010-11-29"
+msgstr "29.11.2010"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0.12"
-msgstr "2.0.12"
+msgid "2.0.13"
+msgstr "2.0.13"
#. 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 394ecea..1a105d2 100644
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config 2.0.12\n"
-"POT-Creation-Date: 2010-11-22 23:00+0100\n"
+"POT-Creation-Date: 2010-11-29 23:23+0100\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-11-22"
-msgstr "22.11.2010"
+msgid "2010-11-29"
+msgstr "29.11.2010"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0.12"
-msgstr "2.0.12"
+msgid "2.0.13"
+msgstr "2.0.13"
#. 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 a5251a2..cbee580 100644
--- a/manpages/po/pt_BR/live-config.7.po
+++ b/manpages/po/pt_BR/live-config.7.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-config 2.0.12\n"
-"POT-Creation-Date: 2010-11-22 23:00+0100\n"
+"POT-Creation-Date: 2010-11-29 23:23+0100\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-11-22"
-msgstr "22-11-2010"
+msgid "2010-11-29"
+msgstr "29-11-2010"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0.12"
-msgstr "2.0.12"
+msgid "2.0.13"
+msgstr "2.0.13"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 1741e00..e07d3e4 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-11-22 23:00+0100\n"
+"POT-Creation-Date: 2010-11-29 23:23+0100\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"
@@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2010-11-22"
+msgid "2010-11-29"
msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0.12"
+msgid "2.0.13"
msgstr ""
#. type: TH
diff --git a/manpages/pt_BR/live-config.pt_BR.7 b/manpages/pt_BR/live-config.pt_BR.7
index 970a224..8e4305a 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 22\-11\-2010 2.0.12 "Projeto Debian Live"
+.TH LIVE\-CONFIG 7 29\-11\-2010 2.0.13 "Projeto Debian Live"
.SH NOME
\fBlive\-config\fP \- Scripts para Configuração do Sistema
diff --git a/scripts/config/109-debian-installer-launcher b/scripts/config/109-debian-installer-launcher
index 2894f5b..a31112c 100755
--- a/scripts/config/109-debian-installer-launcher
+++ b/scripts/config/109-debian-installer-launcher
@@ -24,8 +24,15 @@ Debian_installer_launcher ()
Configure_debian_installer_launcher ()
{
- install -D -o ${LIVE_USERNAME} -g ${LIVE_USERNAME} /usr/share/applications/debian-installer-launcher.desktop /home/${LIVE_USERNAME}/Desktop/debian-installer-launcher.desktop
- chown ${LIVE_USERNAME}:${LIVE_USERNAME} /home/${LIVE_USERNAME}/Desktop -R
+ # KDE4 needs the desktop file somewhere else,
+ # otherwise no Home and Trash icons on the desktop.
+ if [ -d /usr/share/kde4/apps/kio_desktop/DesktopLinks ]
+ then
+ install -D -o ${LIVE_USERNAME} -g ${LIVE_USERNAME} /usr/share/applications/debian-installer-launcher.desktop /usr/share/kde4/apps/kio_desktop/DesktopLinks/debian-installer-launcher.desktop
+ else
+ install -D -o ${LIVE_USERNAME} -g ${LIVE_USERNAME} /usr/share/applications/debian-installer-launcher.desktop /home/${LIVE_USERNAME}/Desktop/debian-installer-launcher.desktop
+ chown ${LIVE_USERNAME}:${LIVE_USERNAME} /home/${LIVE_USERNAME}/Desktop -R
+ fi
# Creating state file
touch /var/lib/live/config/debian-installer-launcher
diff --git a/scripts/config/119-openssh-server b/scripts/config/119-openssh-server
index 3f9221a..8f3a403 100755
--- a/scripts/config/119-openssh-server
+++ b/scripts/config/119-openssh-server
@@ -26,14 +26,14 @@ Configure_openssh_server ()
{
if [ ! -e /etc/ssh/ssh_host_rsa_key ]
then
- ssh-keygen -q -f /etc/ssh/ssh_host_rsa_key -N -t rsa
+ ssh-keygen -q -f /etc/ssh/ssh_host_rsa_key -N "" -t rsa
_SSH="true"
fi
if [ ! -e /etc/ssh/ssh_host_dsa_key ]
then
- ssh-keygen -q -f /etc/ssh/ssh_host_dsa_key -N -t dsa
+ ssh-keygen -q -f /etc/ssh/ssh_host_dsa_key -N "" -t dsa
_SSH="true"
fi
--
live-config
More information about the debian-live-changes
mailing list