[SCM] live-config branch, upstream, updated. upstream/3.0.4-1-ga3cc4c7

Daniel Baumann daniel at debian.org
Mon Sep 24 07:48:04 UTC 2012


The following commit has been merged in the upstream branch:
commit a3cc4c77f0a4748c5df2280c0d61c864c79be321
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Sep 24 09:47:55 2012 +0200

    Adding upstream version 3.0.5.

diff --git a/VERSION b/VERSION
index 30591bd..803e8b1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0.4-1
+3.0.5-1
diff --git a/bin/live-config-update b/bin/live-config-update
index 4797648..876cba9 100755
--- a/bin/live-config-update
+++ b/bin/live-config-update
@@ -44,6 +44,10 @@ case "${_DISTRIBUTION}" in
 			squeeze)
 				LIVE_USER_DEFAULT_GROUPS="audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth"
 				;;
+
+			*)
+				NOSCRIPTS="${NOSCRIPTS} gdm"
+				;;
 		esac
 		;;
 
@@ -59,6 +63,10 @@ case "${_DISTRIBUTION}" in
 			artax|artax-backports)
 				LIVE_USER_DEFAULT_GROUPS="audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth sudo"
 				;;
+
+			*)
+				NOSCRIPTS="${NOSCRIPTS} gdm"
+				;;
 		esac
 		;;
 
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 4907764..a8a6e78 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 24.08.2012 3.0.4\-1 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 24.09.2012 3.0.5\-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 da526aa..f79680d 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 2012\-08\-24 3.0.4-1 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2012\-09\-24 3.0.5-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-config\fR \- System Configuration Scripts
diff --git a/manpages/es/live-config.es.7 b/manpages/es/live-config.es.7
index 2baf803..0167bcb 100644
--- a/manpages/es/live-config.es.7
+++ b/manpages/es/live-config.es.7
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-CONFIG 7 24.08.2012 3.0.4\-1 "Proyecto Debian Live"
+.TH LIVE\-CONFIG 7 24.09.2012 3.0.5\-1 "Proyecto Debian Live"
 
 .SH NOMBRE
 \fBlive\-config\fP \- Scripts de configuración del sistema
diff --git a/manpages/fr/live-config.fr.7 b/manpages/fr/live-config.fr.7
index b5346ca..e5a9c74 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 24.08.2012 3.0.4\-1 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 24.09.2012 3.0.5\-1 "Projet Debian Live"
 
 .SH NOM
 \fBlive\-config\fP \- Scripts de configuration du système
diff --git a/manpages/it/live-config.it.7 b/manpages/it/live-config.it.7
index 088fa01..c7fc799 100644
--- a/manpages/it/live-config.it.7
+++ b/manpages/it/live-config.it.7
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-CONFIG 7 24.08.2012 3.0.4\-1 "Progetto Debian Live"
+.TH LIVE\-CONFIG 7 24.09.2012 3.0.5\-1 "Progetto Debian Live"
 
 .SH NOME
 \fBlive\-config\fP \- Script di configurazione del sistema
diff --git a/manpages/po/de/live-config.7.po b/manpages/po/de/live-config.7.po
index 84fd10b..f366695 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 3.0.4-1\n"
-"POT-Creation-Date: 2012-08-24 11:46+0300\n"
+"Project-Id-Version: live-config 3.0.5-1\n"
+"POT-Creation-Date: 2012-09-24 09:43+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 "2012-08-24"
-msgstr "24.08.2012"
+msgid "2012-09-24"
+msgstr "24.09.2012"
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "3.0.4-1"
-msgstr "3.0.4-1"
+msgid "3.0.5-1"
+msgstr "3.0.5-1"
 
 #. type: TH
 #: en/live-config.7:9
diff --git a/manpages/po/es/live-config.7.po b/manpages/po/es/live-config.7.po
index 48a2e1c..74f5215 100644
--- a/manpages/po/es/live-config.7.po
+++ b/manpages/po/es/live-config.7.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-config 3.0.4-1\n"
-"POT-Creation-Date: 2012-08-24 11:46+0300\n"
+"Project-Id-Version: live-config 3.0.5-1\n"
+"POT-Creation-Date: 2012-09-24 09:43+0300\n"
 "PO-Revision-Date: 2012-07-28 22:11+0100\n"
 "Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
 "Language-Team: none\n"
@@ -25,14 +25,14 @@ msgstr "LIVE-CONFIG"
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2012-08-24"
-msgstr "24.08.2012"
+msgid "2012-09-24"
+msgstr "24.09.2012"
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "3.0.4-1"
-msgstr "3.0.4-1"
+msgid "3.0.5-1"
+msgstr "3.0.5-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 c0ccc15..22329c1 100644
--- a/manpages/po/fr/live-config.7.po
+++ b/manpages/po/fr/live-config.7.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-config 3.0.4-1\n"
-"POT-Creation-Date: 2012-08-24 11:46+0300\n"
+"Project-Id-Version: live-config 3.0.5-1\n"
+"POT-Creation-Date: 2012-09-24 09:43+0300\n"
 "PO-Revision-Date: 2012-07-28 22:13+0100\n"
 "Last-Translator: Carlos Zuferri <chals at altorricon.com>\n"
 "Language-Team: none\n"
@@ -25,14 +25,14 @@ msgstr "LIVE-CONFIG"
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2012-08-24"
-msgstr "24.08.2012"
+msgid "2012-09-24"
+msgstr "24.09.2012"
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "3.0.4-1"
-msgstr "3.0.4-1"
+msgid "3.0.5-1"
+msgstr "3.0.5-1"
 
 #. type: TH
 #: en/live-config.7:9
diff --git a/manpages/po/it/live-config.7.po b/manpages/po/it/live-config.7.po
index b80b83e..55211a0 100644
--- a/manpages/po/it/live-config.7.po
+++ b/manpages/po/it/live-config.7.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-config 3.0.4-1\n"
-"POT-Creation-Date: 2012-08-24 11:46+0300\n"
+"Project-Id-Version: live-config 3.0.5-1\n"
+"POT-Creation-Date: 2012-09-24 09:43+0300\n"
 "PO-Revision-Date: 2012-08-03 17:13+0200\n"
 "Last-Translator: skizzhg <skizzhg at gmx.com>\n"
 "Language-Team: none\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-CONFIG"
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2012-08-24"
-msgstr "24.08.2012"
+msgid "2012-09-24"
+msgstr "24.09.2012"
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "3.0.4-1"
-msgstr "3.0.4-1"
+msgid "3.0.5-1"
+msgstr "3.0.5-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 859ec56..246a93d 100644
--- a/manpages/po/pt_BR/live-config.7.po
+++ b/manpages/po/pt_BR/live-config.7.po
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-config 3.0.4-1\n"
-"POT-Creation-Date: 2012-08-24 11:46+0300\n"
+"Project-Id-Version: live-config 3.0.5-1\n"
+"POT-Creation-Date: 2012-09-24 09:43+0300\n"
 "PO-Revision-Date: 2012-07-28 11:38-0400\n"
 "Last-Translator: Tiago Bortoletto Vaz <tiago at debian.org>\n"
 "Language-Team: none\n"
@@ -25,14 +25,14 @@ msgstr "LIVE-CONFIG"
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2012-08-24"
-msgstr "24-08-2012"
+msgid "2012-09-24"
+msgstr "24-09-2012"
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "3.0.4-1"
-msgstr "3.0.4-1"
+msgid "3.0.5-1"
+msgstr "3.0.5-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 03f556a..83c2089 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: 2012-08-24 11:46+0300\n"
+"POT-Creation-Date: 2012-09-24 09:43+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"
@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "2012-08-24"
+msgid "2012-09-24"
 msgstr ""
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "3.0.4-1"
+msgid "3.0.5-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 af62320..34b794f 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 24\-08\-2012 3.0.4\-1 "Projeto Debian Live"
+.TH LIVE\-CONFIG 7 24\-09\-2012 3.0.5\-1 "Projeto Debian Live"
 
 .SH NOME
 \fBlive\-config\fP \- Scripts para Configuração do Sistema

-- 
live-config



More information about the debian-live-changes mailing list