summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--VERSION2
-rw-r--r--debian/changelog10
-rw-r--r--manpages/de/live-boot.de.72
-rw-r--r--manpages/de/persistence.conf.de.52
-rw-r--r--manpages/en/live-boot.72
-rw-r--r--manpages/en/persistence.conf.52
-rw-r--r--manpages/es/live-boot.es.72
-rw-r--r--manpages/es/persistence.conf.es.52
-rw-r--r--manpages/po/de/live-boot.7.po12
-rw-r--r--manpages/po/de/persistence.conf.5.po12
-rw-r--r--manpages/po/es/live-boot.7.po12
-rw-r--r--manpages/po/es/persistence.conf.5.po12
-rw-r--r--manpages/pot/live-boot.7.pot6
-rw-r--r--manpages/pot/persistence.conf.5.pot6
14 files changed, 47 insertions, 37 deletions
diff --git a/VERSION b/VERSION
index f7d9b10..a391e7d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0~a11-1
+4.0~a12-1
diff --git a/debian/changelog b/debian/changelog
index 20ff157..f41b306 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+live-boot (4.0~a12-1) experimental; urgency=low
+
+ * Updating manpage wrt/ quickreboot (Closes: #706686).
+ * Moving overwriting of /bin/mount with /bin/mount.util-linux for httpfs
+ to make it active (Closes: #707116).
+ * Further guarding overwriting of /bin/mount by making it dependent on
+ the existence of /bin/mount.util-linux.
+
+ -- Daniel Baumann <mail@daniel-baumann.ch> Wed, 08 May 2013 08:42:54 +0200
+
live-boot (4.0~a11-1) experimental; urgency=low
[ chals ]
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 2251d5b..1274e83 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 06.05.2013 4.0~a11\-1 "Live Systems Project"
+.TH LIVE\-BOOT 7 08.05.2013 4.0~a12\-1 "Live Systems Project"
.SH NAME
\fBlive\-boot\fP \- System Boot Scripts
diff --git a/manpages/de/persistence.conf.de.5 b/manpages/de/persistence.conf.de.5
index c134248..b3b622a 100644
--- a/manpages/de/persistence.conf.de.5
+++ b/manpages/de/persistence.conf.de.5
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT conf 06.05.2013 4.0~a11\-1 "Live Systems Project"
+.TH LIVE\-BOOT conf 08.05.2013 4.0~a12\-1 "Live Systems Project"
.SH NAME
\fBpersistence.conf\fP \- Configuration file for persistence media in live\-boot
diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index 8a16b80..a5fa565 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2013\-05\-06 4.0~a11-1 "Live Systems Project"
+.TH LIVE\-BOOT 7 2013\-05\-08 4.0~a12-1 "Live Systems Project"
.SH NAME
\fBlive\-boot\fR \- System Boot Scripts
diff --git a/manpages/en/persistence.conf.5 b/manpages/en/persistence.conf.5
index 698b079..c946ed9 100644
--- a/manpages/en/persistence.conf.5
+++ b/manpages/en/persistence.conf.5
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT conf 2013\-05\-06 4.0~a11-1 "Live Systems Project"
+.TH LIVE\-BOOT conf 2013\-05\-08 4.0~a12-1 "Live Systems Project"
.SH NAME
\fBpersistence.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 7e4a5f7..d4ca1f7 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 06.05.2013 4.0~a11\-1 "Proyecto Live Systems"
+.TH LIVE\-BOOT 7 08.05.2013 4.0~a12\-1 "Proyecto Live Systems"
.SH NOMBRE
\fBlive\-boot\fP \- Scripts de Arranque del Sistema
diff --git a/manpages/es/persistence.conf.es.5 b/manpages/es/persistence.conf.es.5
index 92ef054..5ae3624 100644
--- a/manpages/es/persistence.conf.es.5
+++ b/manpages/es/persistence.conf.es.5
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT conf 06.05.2013 4.0~a11\-1 "Proyecto Live Systems"
+.TH LIVE\-BOOT conf 08.05.2013 4.0~a12\-1 "Proyecto Live Systems"
.SH NOMBRE
\fBpersistence.conf\fP \- Fichero para configurar medios de almacenamiento con
diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index 6e45506..e4ac683 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 4.0~a11-1\n"
-"POT-Creation-Date: 2013-05-06 20:50+0300\n"
+"Project-Id-Version: live-boot 4.0~a12-1\n"
+"POT-Creation-Date: 2013-05-08 08:42+0300\n"
"PO-Revision-Date: 2013-04-13 16:48+0100\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2013-05-06"
-msgstr "06.05.2013"
+msgid "2013-05-08"
+msgstr "08.05.2013"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~a11-1"
-msgstr "4.0~a11-1"
+msgid "4.0~a12-1"
+msgstr "4.0~a12-1"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
diff --git a/manpages/po/de/persistence.conf.5.po b/manpages/po/de/persistence.conf.5.po
index 63b0b03..2fa6a16 100644
--- a/manpages/po/de/persistence.conf.5.po
+++ b/manpages/po/de/persistence.conf.5.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 4.0~a11-1\n"
-"POT-Creation-Date: 2013-05-06 14:23+0300\n"
+"Project-Id-Version: live-boot 4.0~a12-1\n"
+"POT-Creation-Date: 2013-05-08 08:42+0300\n"
"PO-Revision-Date: 2013-04-13 16:48+0100\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2013-05-06"
-msgstr "06.05.2013"
+msgid "2013-05-08"
+msgstr "08.05.2013"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~a11-1"
-msgstr "4.0~a11-1"
+msgid "4.0~a12-1"
+msgstr "4.0~a12-1"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
diff --git a/manpages/po/es/live-boot.7.po b/manpages/po/es/live-boot.7.po
index ac76a8f..ce4c329 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 4.0~a11-1\n"
-"POT-Creation-Date: 2013-05-06 20:50+0300\n"
+"Project-Id-Version: live-boot 4.0~a12-1\n"
+"POT-Creation-Date: 2013-05-08 08:42+0300\n"
"PO-Revision-Date: 2013-04-13 22:38+0100\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2013-05-06"
-msgstr "06.05.2013"
+msgid "2013-05-08"
+msgstr "08.05.2013"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~a11-1"
-msgstr "4.0~a11-1"
+msgid "4.0~a12-1"
+msgstr "4.0~a12-1"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
diff --git a/manpages/po/es/persistence.conf.5.po b/manpages/po/es/persistence.conf.5.po
index b349e5d..fef3743 100644
--- a/manpages/po/es/persistence.conf.5.po
+++ b/manpages/po/es/persistence.conf.5.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 4.0~a11-1\n"
-"POT-Creation-Date: 2013-05-06 14:23+0300\n"
+"Project-Id-Version: live-boot 4.0~a12-1\n"
+"POT-Creation-Date: 2013-05-08 08:42+0300\n"
"PO-Revision-Date: 2013-04-13 16:38+0100\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
@@ -23,14 +23,14 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2013-05-06"
-msgstr "06.05.2013"
+msgid "2013-05-08"
+msgstr "08.05.2013"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~a11-1"
-msgstr "4.0~a11-1"
+msgid "4.0~a12-1"
+msgstr "4.0~a12-1"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 723b8ea..fe2760a 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: 2013-05-06 20:50+0300\n"
+"POT-Creation-Date: 2013-05-08 08:42+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2013-05-06"
+msgid "2013-05-08"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~a11-1"
+msgid "4.0~a12-1"
msgstr ""
#. type: TH
diff --git a/manpages/pot/persistence.conf.5.pot b/manpages/pot/persistence.conf.5.pot
index 517d088..62c4044 100644
--- a/manpages/pot/persistence.conf.5.pot
+++ b/manpages/pot/persistence.conf.5.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2013-05-06 14:23+0300\n"
+"POT-Creation-Date: 2013-05-08 08:42+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "2013-05-06"
+msgid "2013-05-08"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~a11-1"
+msgid "4.0~a12-1"
msgstr ""
#. type: TH