[SCM] live-config branch, upstream, updated. upstream/3.0_a22-1-g2f66cb0
Daniel Baumann
daniel at debian.org
Wed Jul 13 08:36:11 UTC 2011
The following commit has been merged in the upstream branch:
commit 2f66cb0a14c1c328891222087245425686a63a92
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Jul 13 10:37:21 2011 +0200
Adding upstream version 3.0~a23.
diff --git a/Makefile b/Makefile
index e79c363..a70562d 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ test:
echo "W: checkbashisms - command not found"; \
echo "I: checkbashisms can be optained from: "; \
echo "I: http://git.debian.org/?p=devscripts/devscripts.git"; \
- echo "I: On Debian systems, checkbashisms can be installed with:"; \
+ echo "I: On Debian based systems, checkbashisms can be installed with:"; \
echo "I: apt-get install devscripts"; \
fi
@@ -78,9 +78,9 @@ uninstall:
# Uninstalling docs
rm -rf $(DESTDIR)/usr/share/doc/live-config
- rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/doc
- rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share
- rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/doc || true
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share || true
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr || true
# Uninstalling manpages
for MANPAGE in manpages/en/*; \
diff --git a/VERSION b/VERSION
index c77fcb6..58106a4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a22
+3.0~a23
diff --git a/bin/live-config-update b/bin/live-config-update
index de32661..035b883 100755
--- a/bin/live-config-update
+++ b/bin/live-config-update
@@ -15,7 +15,7 @@ then
echo "E: lsb_release - command not found"
echo "I: lsb_release can be optained from:"
echo "I: http://www.linux-foundation.org/en/LSB"
- echo "I: On Debian systems, lsb_release can be installed with:"
+ echo "I: On Debian based systems, lsb_release can be installed with:"
echo "I: apt-get install lsb-release"
exit 1
fi
diff --git a/manpages/Makefile b/manpages/Makefile
index 68b5e31..3b8b063 100644
--- a/manpages/Makefile
+++ b/manpages/Makefile
@@ -25,7 +25,7 @@ build: po4a.cfg
echo "E: po4a - command not found"; \
echo "I: po4a can be optained from:"; \
echo "I: http://po4a.alioth.debian.org/"; \
- echo "I: On Debian systems, po4a can be installed with:"; \
+ echo "I: On Debian based systems, po4a can be installed with:"; \
echo "I: apt-get install po4a"; \
exit 1; \
fi
diff --git a/manpages/de/live-config.de.7 b/manpages/de/live-config.de.7
index e53dc6f..80baea8 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 13.06.2011 3.0~a22 "Debian Live Projekt"
+.TH LIVE\-CONFIG 7 13.07.2011 3.0~a23 "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 a275949..cad55dd 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\-13 3.0~a22 "Debian Live Project"
+.TH LIVE\-CONFIG 7 2011\-07\-13 3.0~a23 "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 b859681..a247bb3 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 13.06.2011 3.0~a22 "Proyecto Debian Live"
+.TH LIVE\-CONFIG 7 13.07.2011 3.0~a23 "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 e9a3ee6..7751b7a 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 13.06.2011 3.0~a22 "Projet Debian Live"
+.TH LIVE\-CONFIG 7 13.07.2011 3.0~a23 "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 84babb7..6724778 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 13.06.2011 3.0~a22 "Progetto Debian Live"
+.TH LIVE\-CONFIG 7 13.07.2011 3.0~a23 "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 a798e1e..29e4906 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~a22\n"
-"POT-Creation-Date: 2011-06-13 09:15+0300\n"
+"Project-Id-Version: live-config 3.0~a23\n"
+"POT-Creation-Date: 2011-07-13 10:34+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-13"
-msgstr "13.06.2011"
+msgid "2011-07-13"
+msgstr "13.07.2011"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a22"
-msgstr "3.0~a22"
+msgid "3.0~a23"
+msgstr "3.0~a23"
#. 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 15c22d1..abf2d0d 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~a22\n"
-"POT-Creation-Date: 2011-06-13 09:15+0300\n"
+"Project-Id-Version: live-config 3.0~a23\n"
+"POT-Creation-Date: 2011-07-13 10:34+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-13"
-msgstr "13.06.2011"
+msgid "2011-07-13"
+msgstr "13.07.2011"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a22"
-msgstr "3.0~a22"
+msgid "3.0~a23"
+msgstr "3.0~a23"
#. 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 02a5aa7..8e6b6c5 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~a22\n"
-"POT-Creation-Date: 2011-06-13 09:15+0300\n"
+"Project-Id-Version: live-config 3.0~a23\n"
+"POT-Creation-Date: 2011-07-13 10:34+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-13"
-msgstr "13.06.2011"
+msgid "2011-07-13"
+msgstr "13.07.2011"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a22"
-msgstr "3.0~a22"
+msgid "3.0~a23"
+msgstr "3.0~a23"
#. 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 b2b0b45..0220bdd 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~a22\n"
-"POT-Creation-Date: 2011-06-13 09:15+0300\n"
+"Project-Id-Version: live-config 3.0~a23\n"
+"POT-Creation-Date: 2011-07-13 10:34+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-13"
-msgstr "13.06.2011"
+msgid "2011-07-13"
+msgstr "13.07.2011"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a22"
-msgstr "3.0~a22"
+msgid "3.0~a23"
+msgstr "3.0~a23"
#. 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 2235712..cdbbc50 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~a22\n"
-"POT-Creation-Date: 2011-06-13 09:15+0300\n"
+"Project-Id-Version: live-config 3.0~a23\n"
+"POT-Creation-Date: 2011-07-13 10:34+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-13"
-msgstr "06-13-2011"
+msgid "2011-07-13"
+msgstr "07-13-2011"
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a22"
-msgstr "3.0~a22"
+msgid "3.0~a23"
+msgstr "3.0~a23"
#. type: TH
#: en/live-config.7:9
diff --git a/manpages/pot/live-config.7.pot b/manpages/pot/live-config.7.pot
index 539c797..2a39851 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-13 09:15+0300\n"
+"POT-Creation-Date: 2011-07-13 10:34+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-13"
+msgid "2011-07-13"
msgstr ""
#. type: TH
#: en/live-config.7:9
#, no-wrap
-msgid "3.0~a22"
+msgid "3.0~a23"
msgstr ""
#. type: TH
diff --git a/manpages/pt_BR/live-config.pt_BR.7 b/manpages/pt_BR/live-config.pt_BR.7
index 7b5c869..550b9a3 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\-13\-2011 3.0~a22 "Projeto Debian Live"
+.TH LIVE\-CONFIG 7 07\-13\-2011 3.0~a23 "Projeto Debian Live"
.SH NOME
\fBlive\-config\fP \- Scripts para Configuração do Sistema
diff --git a/scripts/config.sh b/scripts/config.sh
index fdcc24d..6633aeb 100755
--- a/scripts/config.sh
+++ b/scripts/config.sh
@@ -16,7 +16,7 @@
## You should have received a copy of the GNU General Public License
## along with this program. If not, see <http://www.gnu.org/licenses/>.
##
-## On Debian systems, the complete text of the GNU General Public License
+## The complete text of the GNU General Public License
## can be found in /usr/share/common-licenses/GPL-3 file.
--
live-config
More information about the debian-live-changes
mailing list