[SCM] live-config branch, upstream, updated. upstream/3.0_a21-1-g36d456b
Daniel Baumann
daniel at debian.org
Mon Jun 13 07:17:59 UTC 2011
The following commit has been merged in the upstream branch:
commit 36d456bae055c9de661d41ef003391d3c446f530
Author: Daniel Baumann <daniel at debian.org>
Date: Mon Jun 13 09:18:16 2011 +0200
Adding upstream version 3.0~a22.
diff --git a/VERSION b/VERSION
index bfac0ec..c77fcb6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a21
+3.0~a22
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index cf610c4..e53dc6f 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 11.06.2011 3.0~a21 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 13.06.2011 3.0~a22 "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 c37db8c..a275949 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 2011\-06\-11 3.0~a21 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2011\-06\-13 3.0~a22 "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 294179e..b859681 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 11.06.2011 3.0~a21 "Proyecto Debian Live"
+.TH LIVE\-CONFIG 7 13.06.2011 3.0~a22 "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 d0d9a80..e9a3ee6 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 11.06.2011 3.0~a21 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 13.06.2011 3.0~a22 "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 37aac77..84babb7 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 11.06.2011 3.0~a21 "Progetto Debian Live"
+.TH LIVE\-CONFIG 7 13.06.2011 3.0~a22 "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 8ca08a9..a798e1e 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~a21\n"
-"POT-Creation-Date: 2011-06-11 11:14+0300\n"
+"Project-Id-Version: live-config 3.0~a22\n"
+"POT-Creation-Date: 2011-06-13 09:15+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 "2011-06-11"
-msgstr "11.06.2011"
+msgid "2011-06-13"
+msgstr "13.06.2011"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a21"
-msgstr "3.0~a21"
+msgid "3.0~a22"
+msgstr "3.0~a22"
#. 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 036f10e..15c22d1 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~a21\n"
-"POT-Creation-Date: 2011-06-11 11:14+0300\n"
+"Project-Id-Version: live-config 3.0~a22\n"
+"POT-Creation-Date: 2011-06-13 09:15+0300\n"
"PO-Revision-Date: 2011-05-07 19:51+0100\n"
"Last-Translator: José Luis Zabalza <jlz.3008 at gmail.com> and Carlos Zuferri "
"\"chals\" <chals at altorricon.com>\n"
@@ -25,14 +25,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2011-06-11"
-msgstr "11.06.2011"
+msgid "2011-06-13"
+msgstr "13.06.2011"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a21"
-msgstr "3.0~a21"
+msgid "3.0~a22"
+msgstr "3.0~a22"
#. 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 834a443..02a5aa7 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 3.0~a21\n"
-"POT-Creation-Date: 2011-06-11 11:14+0300\n"
+"Project-Id-Version: live-config 3.0~a22\n"
+"POT-Creation-Date: 2011-06-13 09:15+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 "2011-06-11"
-msgstr "11.06.2011"
+msgid "2011-06-13"
+msgstr "13.06.2011"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a21"
-msgstr "3.0~a21"
+msgid "3.0~a22"
+msgstr "3.0~a22"
#. 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 cbab48a..b2b0b45 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~a21\n"
-"POT-Creation-Date: 2011-06-11 11:14+0300\n"
+"Project-Id-Version: live-config 3.0~a22\n"
+"POT-Creation-Date: 2011-06-13 09:15+0300\n"
"PO-Revision-Date: 2011-01-20 22:31+0100\n"
"Last-Translator: skizzhg <skizzhg at gmx.com>\n"
"Language-Team: Italian <tp at lists.linux.it>\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-CONFIG"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "2011-06-11"
-msgstr "11.06.2011"
+msgid "2011-06-13"
+msgstr "13.06.2011"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a21"
-msgstr "3.0~a21"
+msgid "3.0~a22"
+msgstr "3.0~a22"
#. 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 a4b9cbc..2235712 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 3.0~a21\n"
-"POT-Creation-Date: 2011-06-11 11:14+0300\n"
+"Project-Id-Version: live-config 3.0~a22\n"
+"POT-Creation-Date: 2011-06-13 09:15+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 "2011-06-11"
-msgstr "06-11-2011"
+msgid "2011-06-13"
+msgstr "06-13-2011"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a21"
-msgstr "3.0~a21"
+msgid "3.0~a22"
+msgstr "3.0~a22"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index ffd2598..539c797 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: 2011-06-11 11:14+0300\n"
+"POT-Creation-Date: 2011-06-13 09:15+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 "2011-06-11"
+msgid "2011-06-13"
msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a21"
+msgid "3.0~a22"
msgstr ""
#. type: TH
diff --git a/manpages/pt_BR/live-config.pt_BR.7 b/manpages/pt_BR/live-config.pt_BR.7
index 9ef785a..7b5c869 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 06\-11\-2011 3.0~a21 "Projeto Debian Live"
+.TH LIVE\-CONFIG 7 06\-13\-2011 3.0~a22 "Projeto Debian Live"
.SH NOME
\fBlive\-config\fP \- Scripts para Configuração do Sistema
diff --git a/scripts/config/015-sysv-rc b/scripts/config/015-sysv-rc
index 83e96cf..8191782 100755
--- a/scripts/config/015-sysv-rc
+++ b/scripts/config/015-sysv-rc
@@ -38,7 +38,7 @@ Configure_sysv_rc ()
for SERVICE in $(echo ${LIVE_SYSV_RC} | sed -e 's|,| |g')
do
update-rc.d -f ${SERVICE} remove | \
- grep -v "update-rc.d: using dependency based boot sequencing"
+ grep -v "update-rc.d: using dependency based boot sequencing" || true
done
fi
--
live-config
More information about the debian-live-changes
mailing list