[SCM] live-tools branch, upstream, updated. upstream/3.0_a4-1-g778b317

Daniel Baumann daniel at debian.org
Sat Jun 11 11:24:16 UTC 2011


The following commit has been merged in the upstream branch:
commit 778b3179057096ff064ee672088fe6240a561ac4
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jun 11 13:24:28 2011 +0200

    Adding upstream version 3.0~a5.

diff --git a/Makefile b/Makefile
index 46231cc..ef9749b 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 SHELL := sh -e
 
-LANGUAGES = en $(shell cd manpages/po && ls)
+LANGUAGES = $(shell cd manpages/po && ls)
 
 SCRIPTS = scripts/*
 
@@ -70,6 +70,7 @@ uninstall:
 	do \
 		rm -f $(DESTDIR)/usr/$$(basename $${SCRIPT}); \
 	done
+
 	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/bin || true
 	rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr || true
 	rmdir --ignore-fail-on-non-empty $(DESTDIR) || true
diff --git a/VERSION b/VERSION
index d436840..97c929b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a4
+3.0~a5
diff --git a/manpages/de/live-tools.de.7 b/manpages/de/live-tools.de.7
index c73c43e..c28e189 100644
--- a/manpages/de/live-tools.de.7
+++ b/manpages/de/live-tools.de.7
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-TOOLS 7 18.05.2011 3.0~a4 "Debian Live Projekt"
+.TH LIVE\-TOOLS 7 11.06.2011 3.0~a5 "Debian Live Projekt"
 
 .SH NAME
 \fBlive\-tools\fP \- System Support Skripte
diff --git a/manpages/en/live-tools.7 b/manpages/en/live-tools.7
index 5f3a5a6..8d260db 100644
--- a/manpages/en/live-tools.7
+++ b/manpages/en/live-tools.7
@@ -6,7 +6,7 @@
 .\" under certain conditions; see COPYING for details.
 .\"
 .\"
-.TH LIVE\-TOOLS 7 2011\-05\-18 3.0~a4 "Debian Live Project"
+.TH LIVE\-TOOLS 7 2011\-06\-11 3.0~a5 "Debian Live Project"
 
 .SH NAME
 \fBlive\-tools\fR \- System Support Scripts
diff --git a/manpages/po/de/live-tools.7.po b/manpages/po/de/live-tools.7.po
index b0bbcba..13bf469 100644
--- a/manpages/po/de/live-tools.7.po
+++ b/manpages/po/de/live-tools.7.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-tools 3.0~a4\n"
-"POT-Creation-Date: 2011-05-18 18:34+0300\n"
+"Project-Id-Version: live-tools 3.0~a5\n"
+"POT-Creation-Date: 2011-06-11 13:20+0300\n"
 "PO-Revision-Date: 2010-05-24 09:59+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-TOOLS"
 #. type: TH
 #: en/live-tools.7:9
 #, no-wrap
-msgid "2011-05-18"
-msgstr "18.05.2011"
+msgid "2011-06-11"
+msgstr "11.06.2011"
 
 #. type: TH
 #: en/live-tools.7:9
 #, no-wrap
-msgid "3.0~a4"
-msgstr "3.0~a4"
+msgid "3.0~a5"
+msgstr "3.0~a5"
 
 #. type: TH
 #: en/live-tools.7:9
diff --git a/manpages/pot/live-tools.7.pot b/manpages/pot/live-tools.7.pot
index 86ea1e9..4ebf09e 100644
--- a/manpages/pot/live-tools.7.pot
+++ b/manpages/pot/live-tools.7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-config VERSION\n"
-"POT-Creation-Date: 2011-05-18 18:34+0300\n"
+"POT-Creation-Date: 2011-06-11 13:20+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"
@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/live-tools.7:9
 #, no-wrap
-msgid "2011-05-18"
+msgid "2011-06-11"
 msgstr ""
 
 #. type: TH
 #: en/live-tools.7:9
 #, no-wrap
-msgid "3.0~a4"
+msgid "3.0~a5"
 msgstr ""
 
 #. type: TH
diff --git a/scripts/live-system b/scripts/live-system
index 026ab64..bcae199 100755
--- a/scripts/live-system
+++ b/scripts/live-system
@@ -1,5 +1,13 @@
 #!/bin/sh
 
+## live-tools(7) - System Support Scripts
+## Copyright (C) 2006-2011 Daniel Baumann <daniel at debian.org>
+##
+## live-tools comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
+
+
 # Redirect stdout to stderr
 exec 1>&2
 
diff --git a/scripts/live-toram b/scripts/live-toram
index b7740a2..507e5cb 100755
--- a/scripts/live-toram
+++ b/scripts/live-toram
@@ -1,5 +1,13 @@
 #!/bin/sh
 
+## live-tools(7) - System Support Scripts
+## Copyright (C) 2006-2011 Daniel Baumann <daniel at debian.org>
+##
+## live-tools comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+## This is free software, and you are welcome to redistribute it
+## under certain conditions; see COPYING for details.
+
+
 set -e
 
 # Read cmdline

-- 
live-tools



More information about the debian-live-changes mailing list