14 files changed, 36 insertions, 27 deletions
diff --git a/VERSION b/VERSION
index e4179e0..fcdc2fc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~b3-1
+3.0~b4-1
diff --git a/debian/changelog b/debian/changelog
index c459b88..8f80cba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+live-boot (3.0~b4-1) unstable; urgency=low
+
+  * Switching to final name for the persistence configuration file
+    'persistence.conf' in line with boot parameter.
+  * Moving remaining stuff from /live to /lib/live to avoid further
+    namespace pollution.
+
+ -- Daniel Baumann <daniel@debian.org>  Thu, 27 Sep 2012 13:23:33 +0200
+
 live-boot (3.0~b3-1) unstable; urgency=low
 
   [ Daniel Baumann ]
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 2078b06..0c8f57b 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.09.2012 3.0~b3\-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 27.09.2012 3.0~b4\-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 18e6b4f..6b038fe 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 27.09.2012 3.0~b3\-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 27.09.2012 3.0~b4\-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 ba5b114..9f1756a 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2012\-09\-27 3.0~b3-1 "Debian Live Project"
+.TH LIVE\-BOOT 7 2012\-09\-27 3.0~b4-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 cb5503b..311fa5c 100644
--- a/manpages/en/persistence.conf.5
+++ b/manpages/en/persistence.conf.5
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT conf 2012\-09\-27 3.0~b3-1 "Debian Live Project"
+.TH LIVE\-BOOT conf 2012\-09\-27 3.0~b4-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 6f756fb..abd67f3 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.09.2012 3.0~b3\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT 7 27.09.2012 3.0~b4\-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 52cd84f..ea7ea84 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 27.09.2012 3.0~b3\-1 "Proyecto Debian Live"
+.TH LIVE\-BOOT conf 27.09.2012 3.0~b4\-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 65c2ee7..60b83fb 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~b3-1\n"
-"POT-Creation-Date: 2012-09-27 12:32+0300\n"
+"Project-Id-Version: live-boot 3.0~b4-1\n"
+"POT-Creation-Date: 2012-09-27 13:22+0300\n"
 "PO-Revision-Date: 2012-04-08 22:48+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -30,8 +30,8 @@ msgstr "27.09.2012"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "3.0~b3-1"
-msgstr "3.0~b3-1"
+msgid "3.0~b4-1"
+msgstr "3.0~b4-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 000363b..b3b14a0 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 3.0~b3-1\n"
-"POT-Creation-Date: 2012-09-27 10:49+0300\n"
+"Project-Id-Version: live-boot 3.0~b4-1\n"
+"POT-Creation-Date: 2012-09-27 13:22+0300\n"
 "PO-Revision-Date: 2012-04-08 22:48+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -30,8 +30,8 @@ msgstr "27.09.2012"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "3.0~b3-1"
-msgstr "3.0~b3-1"
+msgid "3.0~b4-1"
+msgstr "3.0~b4-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 a9f67f6..3b4916c 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~b3-1\n"
-"POT-Creation-Date: 2012-09-27 12:32+0300\n"
+"Project-Id-Version: live-boot 3.0~b4-1\n"
+"POT-Creation-Date: 2012-09-27 13:22+0300\n"
 "PO-Revision-Date: 2012-06-07 20:29+0200\n"
 "Last-Translator: Carlos Zuferri «chals» <chals@altorricon.com>\n"
 "Language-Team:  none\n"
@@ -30,8 +30,8 @@ msgstr "27.09.2012"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "3.0~b3-1"
-msgstr "3.0~b3-1"
+msgid "3.0~b4-1"
+msgstr "3.0~b4-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 7a9bd4c..ebfda64 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 3.0~b3-1\n"
-"POT-Creation-Date: 2012-09-27 10:54+0300\n"
+"Project-Id-Version: live-boot 3.0~b4-1\n"
+"POT-Creation-Date: 2012-09-27 13:22+0300\n"
 "PO-Revision-Date: 2012-06-07 19:11+0200\n"
 "Last-Translator: Carlos Zuferri «chals» <chals@altorricon.com>\n"
 "Language-Team:  none\n"
@@ -29,8 +29,8 @@ msgstr "27.09.2012"
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "3.0~b3-1"
-msgstr "3.0~b3-1"
+msgid "3.0~b4-1"
+msgstr "3.0~b4-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 a089154..f2e9b58 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-09-27 12:32+0300\n"
+"POT-Creation-Date: 2012-09-27 13:22+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"
@@ -31,7 +31,7 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "3.0~b3-1"
+msgid "3.0~b4-1"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/persistence.conf.5.pot b/manpages/pot/persistence.conf.5.pot
index d537884..df1e920 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-09-27 11:01+0300\n"
+"POT-Creation-Date: 2012-09-27 13:22+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"
@@ -31,7 +31,7 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/persistence.conf.5:1
 #, no-wrap
-msgid "3.0~b3-1"
+msgid "3.0~b4-1"
 msgstr ""
 
 #. type: TH