[SCM] live-config branch, upstream, updated. upstream/2.0.13-1-g4a87362
Daniel Baumann
daniel at debian.org
Mon Dec 6 10:33:58 UTC 2010
The following commit has been merged in the upstream branch:
commit 4a8736268751f5cc88dc2633aea217c44a328d9d
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Dec 6 11:33:18 2010 +0100
Adding upstream version 2.0.14.
diff --git a/VERSION b/VERSION
index 82bd22f..3d45b5c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.13
+2.0.14
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index cca6ebe..c78976e 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 29.11.2010 2.0.13 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 06.12.2010 2.0.14 "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 5423bc5..8242e76 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\-29 2.0.13 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2010\-12\-06 2.0.14 "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 4c8857c..32bf593 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 29.11.2010 2.0.13 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 06.12.2010 2.0.14 "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 737c88d..5d43dee 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.12\n"
-"POT-Creation-Date: 2010-11-29 23:23+0100\n"
+"Project-Id-Version: live-config 2.0.14\n"
+"POT-Creation-Date: 2010-12-06 11:31+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-29"
-msgstr "29.11.2010"
+msgid "2010-12-06"
+msgstr "06.12.2010"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0.13"
-msgstr "2.0.13"
+msgid "2.0.14"
+msgstr "2.0.14"
#. 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 1a105d2..1236200 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.12\n"
-"POT-Creation-Date: 2010-11-29 23:23+0100\n"
+"Project-Id-Version: live-config 2.0.14\n"
+"POT-Creation-Date: 2010-12-06 11:31+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-29"
-msgstr "29.11.2010"
+msgid "2010-12-06"
+msgstr "06.12.2010"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0.13"
-msgstr "2.0.13"
+msgid "2.0.14"
+msgstr "2.0.14"
#. 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 cbee580..1fe9066 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.12\n"
-"POT-Creation-Date: 2010-11-29 23:23+0100\n"
+"Project-Id-Version: live-config 2.0.14\n"
+"POT-Creation-Date: 2010-12-06 11:31+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-29"
-msgstr "29-11-2010"
+msgid "2010-12-06"
+msgstr "06-12-2010"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0.13"
-msgstr "2.0.13"
+msgid "2.0.14"
+msgstr "2.0.14"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index e07d3e4..b73a260 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-29 23:23+0100\n"
+"POT-Creation-Date: 2010-12-06 11:31+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-29"
+msgid "2010-12-06"
msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2.0.13"
+msgid "2.0.14"
msgstr ""
#. type: TH
diff --git a/manpages/pt_BR/live-config.pt_BR.7 b/manpages/pt_BR/live-config.pt_BR.7
index 8e4305a..57e92bf 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 29\-11\-2010 2.0.13 "Projeto Debian Live"
+.TH LIVE\-CONFIG 7 06\-12\-2010 2.0.14 "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 a31112c..fa767ff 100755
--- a/scripts/config/109-debian-installer-launcher
+++ b/scripts/config/109-debian-installer-launcher
@@ -26,7 +26,8 @@ Configure_debian_installer_launcher ()
{
# 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 ]
+ if [ -d /usr/share/kde4/apps/kio_desktop/DesktopLinks ] && \
+ [ -e /var/lib/dpkg/info/xdg-user-dirs.list ]
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
--
live-config
More information about the debian-live-changes
mailing list