[SCM] live-config branch, upstream, updated. upstream/3.0_a20-1-gdc03df9

Daniel Baumann daniel at debian.org
Sat Jun 11 09:19:47 UTC 2011 

The following commit has been merged in the upstream branch:
commit dc03df9cffe7ccedae881885a603964221c71491
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jun 11 11:19:56 2011 +0200

    Adding upstream version 3.0~a21.

diff --git a/Makefile b/Makefile
index ef64403..e79c363 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 SHELL := sh -e
 
-LANGUAGES = en $(shell cd manpages/po && ls)
+LANGUAGES = $(shell cd manpages/po && ls)
 
 SCRIPTS = bin/* scripts/*.sh scripts/*/*
 
diff --git a/VERSION b/VERSION
index 75df682..bfac0ec 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a20
+3.0~a21
diff --git a/examples/README b/examples/README
index 200f43d..8e47059 100644
--- a/examples/README
+++ b/examples/README
@@ -1,8 +1,8 @@
 live-config-foobar Example
 --------------------------
 
-Best practise for downstream projects is to ship their custom live-config
-scripts in an own debian package.
+Best practise for downstream projects and derivatives is to ship their custom
+live-config scripts in an own debian package.
 
 The following live-config-foobar example package should be used as a starting
 point. The following things should minimally be changed:
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index b161fa2..cf610c4 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 28.05.2011 3.0~a20 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 11.06.2011 3.0~a21 "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 0e463c9..c37db8c 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\-05\-28 3.0~a20 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2011\-06\-11 3.0~a21 "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 2c4a544..294179e 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 28.05.2011 3.0~a20 "Proyecto Debian Live"
+.TH LIVE\-CONFIG 7 11.06.2011 3.0~a21 "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 6334577..d0d9a80 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 28.05.2011 3.0~a20 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 11.06.2011 3.0~a21 "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 5bc574c..37aac77 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 28.05.2011 3.0~a20 "Progetto Debian Live"
+.TH LIVE\-CONFIG 7 11.06.2011 3.0~a21 "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 2266824..8ca08a9 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~a20\n"
-"POT-Creation-Date: 2011-05-28 08:08+0300\n"
+"Project-Id-Version: live-config 3.0~a21\n"
+"POT-Creation-Date: 2011-06-11 11:14+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-05-28"
-msgstr "28.05.2011"
+msgid "2011-06-11"
+msgstr "11.06.2011"
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "3.0~a20"
-msgstr "3.0~a20"
+msgid "3.0~a21"
+msgstr "3.0~a21"
 
 #. 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 7e3da5e..036f10e 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~a20\n"
-"POT-Creation-Date: 2011-05-28 08:08+0300\n"
+"Project-Id-Version: live-config 3.0~a21\n"
+"POT-Creation-Date: 2011-06-11 11:14+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-05-28"
-msgstr "28.05.2011"
+msgid "2011-06-11"
+msgstr "11.06.2011"
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "3.0~a20"
-msgstr "3.0~a20"
+msgid "3.0~a21"
+msgstr "3.0~a21"
 
 #. 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 db8e315..834a443 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~a20\n"
-"POT-Creation-Date: 2011-05-28 08:08+0300\n"
+"Project-Id-Version: live-config 3.0~a21\n"
+"POT-Creation-Date: 2011-06-11 11:14+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-05-28"
-msgstr "28.05.2011"
+msgid "2011-06-11"
+msgstr "11.06.2011"
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "3.0~a20"
-msgstr "3.0~a20"
+msgid "3.0~a21"
+msgstr "3.0~a21"
 
 #. 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 e5cb86f..cbab48a 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~a20\n"
-"POT-Creation-Date: 2011-05-28 08:08+0300\n"
+"Project-Id-Version: live-config 3.0~a21\n"
+"POT-Creation-Date: 2011-06-11 11:14+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-05-28"
-msgstr "28.05.2011"
+msgid "2011-06-11"
+msgstr "11.06.2011"
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "3.0~a20"
-msgstr "3.0~a20"
+msgid "3.0~a21"
+msgstr "3.0~a21"
 
 #. 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 7d7ea69..a4b9cbc 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~a20\n"
-"POT-Creation-Date: 2011-05-28 08:08+0300\n"
+"Project-Id-Version: live-config 3.0~a21\n"
+"POT-Creation-Date: 2011-06-11 11:14+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-05-28"
-msgstr "05-28-2011"
+msgid "2011-06-11"
+msgstr "06-11-2011"
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "3.0~a20"
-msgstr "3.0~a20"
+msgid "3.0~a21"
+msgstr "3.0~a21"
 
 #. type: TH
 #: en/live-config.7:9
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 96e7f25..ffd2598 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-05-28 08:08+0300\n"
+"POT-Creation-Date: 2011-06-11 11:14+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-05-28"
+msgid "2011-06-11"
 msgstr ""
 
 #. type: TH
 #: en/live-config.7:9
 #, no-wrap
-msgid "3.0~a20"
+msgid "3.0~a21"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pt_BR/live-config.pt_BR.7 b/manpages/pt_BR/live-config.pt_BR.7
index 45df161..9ef785a 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 05\-28\-2011 3.0~a20 "Projeto Debian Live"
+.TH LIVE\-CONFIG 7 06\-11\-2011 3.0~a21 "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