summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--VERSION2
-rw-r--r--debian/changelog13
-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, 50 insertions, 37 deletions
diff --git a/VERSION b/VERSION
index c3b296a..74e367d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.0~a1-1
+4.0~a2-1
diff --git a/debian/changelog b/debian/changelog
index 8193ebb..6387b44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+live-boot (4.0~a2-1) experimental; urgency=low
+
+ [ Tails developers ]
+ * Making the /live to /lib/live move for the persistence code.
+ * Handling already mounted persistence backing media correctly.
+ * Fixing persistence-media option when no devices are attached.
+ * Using 'local' in a safe way.
+
+ [ Daniel Baumann ]
+ * Adding 3.0~b9-1 changelog entries.
+
+ -- Daniel Baumann <daniel@debian.org> Mon, 10 Dec 2012 20:06:28 +0100
+
live-boot (4.0~a1-1) experimental; urgency=low
* Dropping specifics for squeeze based distributions.
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index ae21ae1..99f66cc 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 30.11.2012 4.0~a1\-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 10.12.2012 4.0~a2\-1 "Debian Live 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 c8d2d5d..cb2450a 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 30.11.2012 4.0~a1\-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 10.12.2012 4.0~a2\-1 "Debian Live 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 2dfe725..1137f09 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2012\-11\-30 4.0~a1-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2012\-12\-10 4.0~a2-1 "Debian Live Project"
.SH NAME
\fBlive\-boot\fR \- System Boot Scripts
diff --git a/manpages/en/persistence.conf.5 b/manpages/en/persistence.conf.5
index 37f69ef..b886cc2 100644
--- a/manpages/en/persistence.conf.5
+++ b/manpages/en/persistence.conf.5
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT conf 2012\-11\-30 4.0~a1-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 2012\-12\-10 4.0~a2-1 "Debian Live 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 e303e1e..6d35b55 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 30.11.2012 4.0~a1\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT 7 10.12.2012 4.0~a2\-1 "Proyecto Debian Live"
.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 14be4b7..d5fd5e2 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 30.11.2012 4.0~a1\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT conf 10.12.2012 4.0~a2\-1 "Proyecto Debian Live"
.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 6d3910a..2f785f9 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~a1-1\n"
-"POT-Creation-Date: 2012-11-30 14:56+0100\n"
+"Project-Id-Version: live-boot 4.0~a2-1\n"
+"POT-Creation-Date: 2012-12-10 20:04+0100\n"
"PO-Revision-Date: 2012-04-08 22:48+0300\n"
"Last-Translator: Daniel Baumann <daniel@debian.org>\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 "2012-11-30"
-msgstr "30.11.2012"
+msgid "2012-12-10"
+msgstr "10.12.2012"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~a1-1"
-msgstr ""
+msgid "4.0~a2-1"
+msgstr "4.0~a2-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 6e4559a..0ccb9d2 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~a1-1\n"
-"POT-Creation-Date: 2012-11-30 14:56+0100\n"
+"Project-Id-Version: live-boot 4.0~a2-1\n"
+"POT-Creation-Date: 2012-12-10 20:04+0100\n"
"PO-Revision-Date: 2012-04-08 22:48+0300\n"
"Last-Translator: Daniel Baumann <daniel@debian.org>\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 "2012-11-30"
-msgstr "30.11.2012"
+msgid "2012-12-10"
+msgstr "10.12.2012"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~a1-1"
-msgstr ""
+msgid "4.0~a2-1"
+msgstr "4.0~a2-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 255db5a..95fcaaa 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~a1-1\n"
-"POT-Creation-Date: 2012-11-30 14:56+0100\n"
+"Project-Id-Version: live-boot 4.0~a2-1\n"
+"POT-Creation-Date: 2012-12-10 20:04+0100\n"
"PO-Revision-Date: 2012-06-07 20:29+0200\n"
"Last-Translator: Carlos Zuferri «chals» <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 "2012-11-30"
-msgstr "30.11.2012"
+msgid "2012-12-10"
+msgstr "10.12.2012"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~a1-1"
-msgstr "4.0~a1-1"
+msgid "4.0~a2-1"
+msgstr "4.0~a2-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 349849a..81b897b 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~a1-1\n"
-"POT-Creation-Date: 2012-11-30 14:56+0100\n"
+"Project-Id-Version: live-boot 4.0~a2-1\n"
+"POT-Creation-Date: 2012-12-10 20:04+0100\n"
"PO-Revision-Date: 2012-06-07 19:11+0200\n"
"Last-Translator: Carlos Zuferri «chals» <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 "2012-11-30"
-msgstr "30.11.2012"
+msgid "2012-12-10"
+msgstr "10.12.2012"
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~a1-1"
-msgstr "4.0~a1-1"
+msgid "4.0~a2-1"
+msgstr "4.0~a2-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 2b94356..3e96638 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-11-30 14:56+0100\n"
+"POT-Creation-Date: 2012-12-10 20:04+0100\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 "2012-11-30"
+msgid "2012-12-10"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~a1-1"
+msgid "4.0~a2-1"
msgstr ""
#. type: TH
diff --git a/manpages/pot/persistence.conf.5.pot b/manpages/pot/persistence.conf.5.pot
index 2751003..4f76c9b 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: 2012-11-30 14:56+0100\n"
+"POT-Creation-Date: 2012-12-10 20:04+0100\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 "2012-11-30"
+msgid "2012-12-10"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/persistence.conf.5:1
#, no-wrap
-msgid "4.0~a1-1"
+msgid "4.0~a2-1"
msgstr ""
#. type: TH