[SCM] live-boot branch, upstream, updated. upstream/3.0_a34-1-g91f7dd9

Daniel Baumann daniel at debian.org
Thu Jun 28 12:36:49 UTC 2012


The following commit has been merged in the upstream branch:
commit 91f7dd99ace16941e74e0b4d4889e46b39194429
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Jun 28 14:36:42 2012 +0200

    Adding upstream version 3.0~a35.

diff --git a/VERSION b/VERSION
index 871361b..c915247 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a34-1
+3.0~a35-1
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 1d4a368..c9ac3f1 100644
--- a/manpages/de/live-boot.de.7
+++ b/manpages/de/live-boot.de.7
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 27.06.2012 3.0~a34\-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 28.06.2012 3.0~a35\-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fP \- System Boot Scripts
diff --git a/manpages/de/live-persistence.conf.de.5 b/manpages/de/live-persistence.conf.de.5
index 7d2ea4c..0070ce1 100644
--- a/manpages/de/live-persistence.conf.de.5
+++ b/manpages/de/live-persistence.conf.de.5
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT conf 27.06.2012 3.0~a34\-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 28.06.2012 3.0~a35\-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-persistence.conf\fP \- Configuration file for persistence media in
diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 226d812..5badb72 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2012\-06\-27 3.0~a34-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2012\-06\-28 3.0~a35-1 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Scripts
diff --git a/manpages/en/live-persistence.conf.5 b/manpages/en/live-persistence.conf.5
index 8c70256..8d019f1 100644
--- a/manpages/en/live-persistence.conf.5
+++ b/manpages/en/live-persistence.conf.5
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT conf 2012\-06\-27 3.0~a34-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 2012\-06\-28 3.0~a35-1 "Debian Live Project"
 
 .SH NAME
 \fBlive-persistence.conf\fR \- Configuration file for persistence media in
diff --git a/manpages/es/live-boot.es.7 b/manpages/es/live-boot.es.7
index cb97a53..88f4055 100644
--- a/manpages/es/live-boot.es.7
+++ b/manpages/es/live-boot.es.7
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 27.06.2012 3.0~a34\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT 7 28.06.2012 3.0~a35\-1 "Proyecto Debian Live"
 
 .SH NOMBRE
 \fBlive\-boot\fP \- Scripts de Arranque del Sistema
diff --git a/manpages/es/live-persistence.conf.es.5 b/manpages/es/live-persistence.conf.es.5
index 410b21f..cc0e8d1 100644
--- a/manpages/es/live-persistence.conf.es.5
+++ b/manpages/es/live-persistence.conf.es.5
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT conf 27.06.2012 3.0~a34\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT conf 28.06.2012 3.0~a35\-1 "Proyecto Debian Live"
 
 .SH NOMBRE
 \fBlive\-persistence.conf\fP \- Fichero para configurar medios de almacenamiento
diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index 4d25a95..9d27fa1 100644
--- a/manpages/po/de/live-boot.7.po
+++ b/manpages/po/de/live-boot.7.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 3.0~a34-1\n"
-"POT-Creation-Date: 2012-06-27 14:14+0300\n"
+"Project-Id-Version: live-boot 3.0~a35-1\n"
+"POT-Creation-Date: 2012-06-28 14:28+0300\n"
 "PO-Revision-Date: 2012-04-08 22:48+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -24,13 +24,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1
 #, no-wrap
-msgid "2012-06-27"
-msgstr "27.06.2012"
+msgid "2012-06-28"
+msgstr "28.06.2012"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1
 #, no-wrap
-msgid "3.0~a34-1"
+msgid "3.0~a35-1"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/po/de/live-persistence.conf.5.po b/manpages/po/de/live-persistence.conf.5.po
index 77b6f30..9546483 100644
--- a/manpages/po/de/live-persistence.conf.5.po
+++ b/manpages/po/de/live-persistence.conf.5.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 3.0~a34-1\n"
-"POT-Creation-Date: 2012-06-27 14:14+0300\n"
+"Project-Id-Version: live-boot 3.0~a35-1\n"
+"POT-Creation-Date: 2012-06-28 14:28+0300\n"
 "PO-Revision-Date: 2012-04-08 22:48+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -24,13 +24,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1
 #, no-wrap
-msgid "2012-06-27"
-msgstr "27.06.2012"
+msgid "2012-06-28"
+msgstr "28.06.2012"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1
 #, no-wrap
-msgid "3.0~a34-1"
+msgid "3.0~a35-1"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/po/es/live-boot.7.po b/manpages/po/es/live-boot.7.po
index 9bfbbbc..d0e52dc 100644
--- a/manpages/po/es/live-boot.7.po
+++ b/manpages/po/es/live-boot.7.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 3.0~a34-1\n"
-"POT-Creation-Date: 2012-06-27 14:14+0300\n"
+"Project-Id-Version: live-boot 3.0~a35-1\n"
+"POT-Creation-Date: 2012-06-28 14:28+0300\n"
 "PO-Revision-Date: 2012-06-07 20:29+0200\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1
 #, no-wrap
-msgid "2012-06-27"
-msgstr "27.06.2012"
+msgid "2012-06-28"
+msgstr "28.06.2012"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1
 #, no-wrap
-msgid "3.0~a34-1"
-msgstr "3.0~a34-1"
+msgid "3.0~a35-1"
+msgstr "3.0~a35-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1
diff --git a/manpages/po/es/live-persistence.conf.5.po b/manpages/po/es/live-persistence.conf.5.po
index 14f8197..c5438f8 100644
--- a/manpages/po/es/live-persistence.conf.5.po
+++ b/manpages/po/es/live-persistence.conf.5.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 3.0~a34-1\n"
-"POT-Creation-Date: 2012-06-27 14:14+0300\n"
+"Project-Id-Version: live-boot 3.0~a35-1\n"
+"POT-Creation-Date: 2012-06-28 14:28+0300\n"
 "PO-Revision-Date: 2012-06-07 19:11+0200\n"
 "Last-Translator: Carlos Zuferri «chals» <chals at altorricon.com>\n"
 "Language-Team:  none\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1
 #, no-wrap
-msgid "2012-06-27"
-msgstr "27.06.2012"
+msgid "2012-06-28"
+msgstr "28.06.2012"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1
 #, no-wrap
-msgid "3.0~a34-1"
-msgstr "3.0~a34-1"
+msgid "3.0~a35-1"
+msgstr "3.0~a35-1"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1
diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index c5a9eec..bd226fd 100644
--- a/manpages/pot/live-boot.7.pot
+++ b/manpages/pot/live-boot.7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2012-06-27 14:14+0300\n"
+"POT-Creation-Date: 2012-06-28 14:28+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-boot.7:1 en/live-persistence.conf.5:1
 #, no-wrap
-msgid "2012-06-27"
+msgid "2012-06-28"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1
 #, no-wrap
-msgid "3.0~a34-1"
+msgid "3.0~a35-1"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/live-persistence.conf.5.pot b/manpages/pot/live-persistence.conf.5.pot
index d271396..21032ec 100644
--- a/manpages/pot/live-persistence.conf.5.pot
+++ b/manpages/pot/live-persistence.conf.5.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2012-06-27 14:14+0300\n"
+"POT-Creation-Date: 2012-06-28 14:28+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-boot.7:1 en/live-persistence.conf.5:1
 #, no-wrap
-msgid "2012-06-27"
+msgid "2012-06-28"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-persistence.conf.5:1
 #, no-wrap
-msgid "3.0~a34-1"
+msgid "3.0~a35-1"
 msgstr ""
 
 #. type: TH
diff --git a/scripts/boot/mountroot.sh b/scripts/boot/mountroot.sh
index 69f6f0a..2d14e4d 100755
--- a/scripts/boot/mountroot.sh
+++ b/scripts/boot/mountroot.sh
@@ -199,7 +199,7 @@ mountroot ()
 		panic "A wrong rootfs was mounted."
 	fi
 
-	fstab
+	Fstab
 	Netbase
 
 	case "${LIVE_SWAPON}" in

-- 
live-boot



More information about the debian-live-changes mailing list