[SCM] live-boot branch, upstream, updated. upstream/2.0_a14-1-g2fb509c
Daniel Baumann
daniel at debian.org
Sat Jul 17 15:22:22 UTC 2010
The following commit has been merged in the upstream branch:
commit 2fb509c1dabc8ea43e1e958a7ce4168d4c44047d
Author: Daniel Baumann <daniel at debian.org>
Date: Sat Jul 17 17:20:59 2010 +0200
Adding upstream version 2.0~a15.
diff --git a/VERSION b/VERSION
index 349985c..92fbbba 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0~a14
+2.0~a15
diff --git a/hooks/live b/hooks/live
index 16a2d0c..d87bfe7 100755
--- a/hooks/live
+++ b/hooks/live
@@ -27,8 +27,11 @@ esac
# Handling live-boot
# Configuration
-mkdir -p "${DESTDIR}"/usr/share/live-boot
-cp /usr/share/live-boot/languagelist "${DESTDIR}"/usr/share/live-boot
+if [ -e /usr/share/live-boot/languagelist ]
+then
+ mkdir -p "${DESTDIR}"/usr/share/live-boot
+ cp /usr/share/live-boot/languagelist "${DESTDIR}"/usr/share/live-boot
+fi
# Directories
mkdir -p "${DESTDIR}"/lib/live-boot
diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index 2d1aef0..2b34f71 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 17.07.2010 2.0~a14 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 17.07.2010 2.0~a15 "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 ccda1e5..633ec1b 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 17.07.2010 2.0~a14 "Debian Live Projekt"
+.TH LIVE\-BOOT 1 17.07.2010 2.0~a15 "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 1e1d97c..c99d1ea 100644
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2010\-07\-17 2.0~a14 "Debian Live Project"
+.TH LIVE\-BOOT 7 2010\-07\-17 2.0~a15 "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 1ba86db..e778c37 100644
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2010\-07\-17 2.0~a14 "Debian Live Project"
+.TH LIVE\-BOOT 1 2010\-07\-17 2.0~a15 "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 60ccdb2..d871206 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 2.0~a14\n"
-"POT-Creation-Date: 2010-07-15 19:29+0300\n"
+"Project-Id-Version: live-boot 2.0~a15\n"
+"POT-Creation-Date: 2010-07-17 17:19+0300\n"
"PO-Revision-Date: 2010-05-24 12:34+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -30,8 +30,8 @@ msgstr "17.07.2010"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2.0~a14"
-msgstr "2.0~a14"
+msgid "2.0~a15"
+msgstr "2.0~a15"
#. 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 1892714..42cff6f 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 2.0~a14\n"
-"POT-Creation-Date: 2010-07-17 00:36+0300\n"
+"Project-Id-Version: live-boot 2.0~a15\n"
+"POT-Creation-Date: 2010-07-17 17:19+0300\n"
"PO-Revision-Date: 2010-05-24 12:34+0300\n"
"Last-Translator: Daniel Baumann <daniel at debian.org>\n"
"Language-Team: none\n"
@@ -30,8 +30,8 @@ msgstr "17.07.2010"
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2.0~a14"
-msgstr "2.0~a14"
+msgid "2.0~a15"
+msgstr "2.0~a15"
#. 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 9174d74..5ede250 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-07-17 00:36+0300\n"
+"POT-Creation-Date: 2010-07-17 17:19+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"
@@ -30,7 +30,7 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2.0~a14"
+msgid "2.0~a15"
msgstr ""
#. type: TH
diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot
index cf98a0b..4162ba9 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-07-17 00:36+0300\n"
+"POT-Creation-Date: 2010-07-17 17:19+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"
@@ -30,7 +30,7 @@ msgstr ""
#. type: TH
#: en/live-boot.7:1 en/live-snapshot.1:1
#, no-wrap
-msgid "2.0~a14"
+msgid "2.0~a15"
msgstr ""
#. type: TH
--
live-boot
More information about the debian-live-changes
mailing list