summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--VERSION2
-rw-r--r--debian/changelog23
-rw-r--r--manpages/de/live-boot.de.72
-rw-r--r--manpages/de/live-snapshot.de.12
-rw-r--r--manpages/en/live-boot.72
-rw-r--r--manpages/en/live-snapshot.12
-rw-r--r--manpages/po/de/live-boot.7.po13
-rw-r--r--manpages/po/de/live-snapshot.1.po13
-rw-r--r--manpages/pot/live-boot.7.pot6
-rw-r--r--manpages/pot/live-snapshot.1.pot6
10 files changed, 46 insertions, 25 deletions
diff --git a/VERSION b/VERSION
index abdb08b..e9c3b95 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a13
+3.0~a14
diff --git a/debian/changelog b/debian/changelog
index 2606dae..add53f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+live-boot (3.0~a14-1) experimental; urgency=low
+
+ [ Richard Nelson ]
+ * Populate adapters in /etc/network/interfaces when ethdevice= on
+ cmdline.
+
+ [ Daniel Baumann ]
+ * Removing header in copyright file.
+ * Don't hard-depend on test target in Makefile.
+ * Using dh auto magic in override, rather than manual make call.
+
+ [ Steven Shiau ]
+ * Removing the duplicated "the" in the live-boot.init script.
+
+ [ Daniel Baumann ]
+ * Updating auto_install overrides in rules.
+ * Correcting live hook to include mtdblock for syslinux memdisk usage,
+ thanks to Michael Prokop <mika@grml.org>.
+ * Supporting /dev/mtdblock0 as valid device name (for memdisk boot),
+ thanks to Michael Prokop <mika@grml.org>.
+
+ -- Daniel Baumann <daniel@debian.org> Tue, 11 Jan 2011 13:38:56 +0100
+
live-boot (3.0~a13-1) experimental; urgency=low
[ Daniel Baumann ]
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 26cfc5d..a67253f 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.12.2010 3.0~a13 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 2011\-01\-11 3.0~a14 "Debian Live Projekt"
.SH NAME
\fBlive\-boot\fP \- System Boot Skripte
diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1
index 2302ad1..e080c99 100644
--- a/manpages/de/live-snapshot.de.1
+++ b/manpages/de/live-snapshot.de.1
@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-BOOT 1 06.12.2010 3.0~a13 "Debian Live Projekt"
+.TH LIVE\-BOOT 1 2011\-01\-11 3.0~a14 "Debian Live Projekt"
.SH NAME
\fBlive\-snapshot\fP \- simple script to ease persistence usage
diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index d5041be..80edf70 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2010\-12\-06 3.0~a13 "Debian Live Project"
+.TH LIVE\-BOOT 7 2011\-01\-11 3.0~a14 "Debian Live Project"
.SH NAME
\fBlive\-boot\fR \- System Boot Scripts
diff --git a/manpages/en/live-snapshot.1 b/manpages/en/live-snapshot.1
index 5b4e9ef..bd1a087 100644
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2010\-12\-06 3.0~a13 "Debian Live Project"
+.TH LIVE\-BOOT 1 2011\-01\-11 3.0~a14 "Debian Live Project"
.SH NAME
\fBlive\-snapshot\fR \- simple script to ease persistence usage
diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index 5f9a676..dda7dd5 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~a13\n"
-"POT-Creation-Date: 2010-12-06 11:27+0100\n"
+"Project-Id-Version: live-boot 3.0~a14\n"
+"POT-Creation-Date: 2011-01-11 13:39+0100\n"
"PO-Revision-Date: 2010-05-24 12:34+0300\n"
"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
"Language-Team: none\n"
@@ -24,14 +24,13 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-12-06"
-msgstr "06.12.2010"
+msgid "2011-01-11"
+msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
-#, no-wrap
-msgid "3.0~a13"
-msgstr "3.0~a13"
+msgid "3.0~a14"
+msgstr "3.0~a14"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
diff --git a/manpages/po/de/live-snapshot.1.po b/manpages/po/de/live-snapshot.1.po
index 0c1719d..c67050f 100644
--- a/manpages/po/de/live-snapshot.1.po
+++ b/manpages/po/de/live-snapshot.1.po
@@ -4,8 +4,8 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: live-boot 3.0~a13\n"
-"POT-Creation-Date: 2010-12-06 11:27+0100\n"
+"Project-Id-Version: live-boot 3.0~a14\n"
+"POT-Creation-Date: 2011-01-11 13:39+0100\n"
"PO-Revision-Date: 2010-05-24 12:34+0300\n"
"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
"Language-Team: none\n"
@@ -24,14 +24,13 @@ msgstr "LIVE-BOOT"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2010-12-06"
-msgstr "06.12.2010"
+msgid "2011-01-11"
+msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
-#, no-wrap
-msgid "3.0~a13"
-msgstr "3.0~a13"
+msgid "3.0~a14"
+msgstr "3.0~a14"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 2836a98..f94ea75 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: 2010-12-06 11:27+0100\n"
+"POT-Creation-Date: 2011-01-11 13:39+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/live-snapshot.1:1
#, no-wrap
-msgid "2010-12-06"
+msgid "2011-01-11"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "3.0~a13"
+msgid "3.0~a14"
msgstr ""
#. type: TH
diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot
index d642156..f27f305 100644
--- a/manpages/pot/live-snapshot.1.pot
+++ b/manpages/pot/live-snapshot.1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2010-12-06 11:27+0100\n"
+"POT-Creation-Date: 2011-01-11 13:39+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/live-snapshot.1:1
#, no-wrap
-msgid "2010-12-06"
+msgid "2011-01-11"
msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "3.0~a13"
+msgid "3.0~a14"
msgstr ""
#. type: TH