[SCM] live-config branch, upstream, updated. upstream/3.0.6-1-g6461b40
Daniel Baumann
daniel at debian.org
Wed Sep 26 13:06:22 UTC 2012
The following commit has been merged in the upstream branch:
commit 6461b406c1097b7e147e9e6fcffafcb87eccb415
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Sep 26 15:06:14 2012 +0200
Adding upstream version 4.0~a1.
diff --git a/VERSION b/VERSION
index 3418252..c3b296a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0.6-1
+4.0~a1-1
diff --git a/bin/live-config-update b/bin/live-config-update
index 17f0cc3..99fc214 100755
--- a/bin/live-config-update
+++ b/bin/live-config-update
@@ -33,44 +33,24 @@ _RELEASE="$(lsb_release -cs | tr [A-Z] [a-z])"
case "${_DISTRIBUTION}" in
debian)
- NOSCRIPTS="apport ureadahead"
+ NOSCRIPTS="apport gdm ureadahead"
LIVE_HOSTNAME="debian"
LIVE_USERNAME="user"
LIVE_USER_FULLNAME="Debian Live user"
LIVE_USER_DEFAULT_GROUPS="audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth debian-tor"
- case "${_RELEASE}" in
- squeeze)
- LIVE_USER_DEFAULT_GROUPS="audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth"
- ;;
-
- *)
- NOSCRIPTS="${NOSCRIPTS} gdm"
- ;;
- esac
-
PROC_OPTIONS="onodev,noexec,nosuid"
;;
progress)
- NOSCRIPTS="upstart apport ureadahead"
+ NOSCRIPTS="apport gdm upstart ureadahead"
LIVE_HOSTNAME="progress"
LIVE_USERNAME="user"
LIVE_USER_FULLNAME="Progress Linux user"
LIVE_USER_DEFAULT_GROUPS="audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth debian-tor sudo"
- case "${_RELEASE}" in
- artax|artax-backports)
- LIVE_USER_DEFAULT_GROUPS="audio cdrom dip floppy video plugdev netdev powerdev scanner bluetooth sudo"
- ;;
-
- *)
- NOSCRIPTS="${NOSCRIPTS} gdm"
- ;;
- esac
-
PROC_OPTIONS="onodev,noexec,nosuid,hidepid=2"
;;
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index 8d24978..49a4e58 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 26.09.2012 3.0.6\-1 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 26.09.2012 4.0~a1\-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 f36126e..bfdeba5 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\-09\-26 3.0.6-1 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2012\-09\-26 4.0~a1-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 1bdeda1..d771754 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 26.09.2012 3.0.6\-1 "Proyecto Debian Live"
+.TH LIVE\-CONFIG 7 26.09.2012 4.0~a1\-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 c4ce68a..f654c66 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 26.09.2012 3.0.6\-1 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 26.09.2012 4.0~a1\-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 fb9844c..8806fdf 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 26.09.2012 3.0.6\-1 "Progetto Debian Live"
+.TH LIVE\-CONFIG 7 26.09.2012 4.0~a1\-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 5f82bd3..7b9f6c6 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.6-1\n"
-"POT-Creation-Date: 2012-09-26 14:23+0300\n"
+"Project-Id-Version: live-config 4.0~a1-1\n"
+"POT-Creation-Date: 2012-09-26 15:03+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"
@@ -30,8 +30,8 @@ msgstr "26.09.2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0.6-1"
-msgstr "3.0.6-1"
+msgid "4.0~a1-1"
+msgstr "4.0~a1-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 e6687c3..8de710a 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.6-1\n"
-"POT-Creation-Date: 2012-09-26 14:23+0300\n"
+"Project-Id-Version: live-config 4.0~a1-1\n"
+"POT-Creation-Date: 2012-09-26 15:03+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"
@@ -31,8 +31,8 @@ msgstr "26.09.2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0.6-1"
-msgstr "3.0.6-1"
+msgid "4.0~a1-1"
+msgstr "4.0~a1-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 010a0f4..2274073 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.6-1\n"
-"POT-Creation-Date: 2012-09-26 14:23+0300\n"
+"Project-Id-Version: live-config 4.0~a1-1\n"
+"POT-Creation-Date: 2012-09-26 15:03+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"
@@ -31,8 +31,8 @@ msgstr "26.09.2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0.6-1"
-msgstr "3.0.6-1"
+msgid "4.0~a1-1"
+msgstr "4.0~a1-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 984b3e9..6223bbf 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.6-1\n"
-"POT-Creation-Date: 2012-09-26 14:23+0300\n"
+"Project-Id-Version: live-config 4.0~a1-1\n"
+"POT-Creation-Date: 2012-09-26 15:03+0300\n"
"PO-Revision-Date: 2012-08-03 17:13+0200\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: none\n"
@@ -29,8 +29,8 @@ msgstr "26.09.2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0.6-1"
-msgstr "3.0.6-1"
+msgid "4.0~a1-1"
+msgstr "4.0~a1-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 24a7b29..b2cff69 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.6-1\n"
-"POT-Creation-Date: 2012-09-26 14:23+0300\n"
+"Project-Id-Version: live-config 4.0~a1-1\n"
+"POT-Creation-Date: 2012-09-26 15:03+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"
@@ -31,8 +31,8 @@ msgstr "26-09-2012"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0.6-1"
-msgstr "3.0.6-1"
+msgid "4.0~a1-1"
+msgstr "4.0~a1-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 5f1feaf..fd59aec 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-09-26 14:23+0300\n"
+"POT-Creation-Date: 2012-09-26 15:03+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"
@@ -31,7 +31,7 @@ msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0.6-1"
+msgid "4.0~a1-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 5d22c70..dbe6e3c 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 26\-09\-2012 3.0.6\-1 "Projeto Debian Live"
+.TH LIVE\-CONFIG 7 26\-09\-2012 4.0~a1\-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