[SCM] live-tools branch, upstream, updated. upstream/3.0_a6-1-ga56f563
Daniel Baumann
daniel at debian.org
Sun Mar 18 13:49:44 UTC 2012
The following commit has been merged in the upstream branch:
commit a56f56310b58f1f7991fc8ac569d676269b05b6a
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Mar 18 14:48:26 2012 +0100
Adding upstream version 3.0~a7.
diff --git a/Makefile b/Makefile
index 27333ab..44a2a1d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,13 @@
# Makefile
+## live-tools(7) - System Support Scripts
+## Copyright (C) 2006-2012 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.
+
+
SHELL := sh -e
LANGUAGES = $(shell cd manpages/po && ls)
@@ -46,7 +54,7 @@ install:
# Installing docs
mkdir -p $(DESTDIR)/usr/share/doc/live-tools
- cp -r COPYING docs/* $(DESTDIR)/usr/share/doc/live-tools
+ cp -r COPYING $(DESTDIR)/usr/share/doc/live-tools
# Installing manpages
for MANPAGE in manpages/en/*; \
diff --git a/VERSION b/VERSION
index 7855bab..71373e8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a6
+3.0~a7-1
diff --git a/docs/TODO b/docs/TODO
deleted file mode 100644
index e93111b..0000000
--- a/docs/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-* once there are more than one script, generalize shell functions into a common
- file to be sourced.
diff --git a/manpages/Makefile b/manpages/Makefile
index 3b8b063..6dee660 100644
--- a/manpages/Makefile
+++ b/manpages/Makefile
@@ -1,5 +1,13 @@
# Makefile
+## live-tools(7) - System Support Scripts
+## Copyright (C) 2006-2012 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.
+
+
SHELL := sh -e
LANGUAGES = $(shell cd po && ls)
diff --git a/manpages/bin/update-version.sh b/manpages/bin/update-version.sh
index 095979e..698dd60 100755
--- a/manpages/bin/update-version.sh
+++ b/manpages/bin/update-version.sh
@@ -1,5 +1,13 @@
#!/bin/sh
+## live-tools(7) - System Support Scripts
+## Copyright (C) 2006-2012 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
DATE="$(LC_ALL=C date +%Y\\\\-%m\\\\-%d)"
diff --git a/manpages/de/live-tools.de.7 b/manpages/de/live-tools.de.7
index 430e3cf..5421ec7 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 2012\-02\-06 3.0~a6 "Debian Live Projekt"
+.TH LIVE\-TOOLS 7 03.18.2012 3.0~a7\-1 "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 425ca4e..a9cd0ec 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 2012\-02\-06 3.0~a6 "Debian Live Project"
+.TH LIVE\-TOOLS 7 2012\-03\-18 3.0~a7-1 "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 980ac8f..8455088 100644
--- a/manpages/po/de/live-tools.7.po
+++ b/manpages/po/de/live-tools.7.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-tools 3.0~a5\n"
-"POT-Creation-Date: 2012-02-06 23:36+0100\n"
+"POT-Creation-Date: 2012-03-18 14:46+0100\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,15 +24,14 @@ msgstr "LIVE-TOOLS"
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "2012-02-06"
-msgstr ""
+msgid "2012-03-18"
+msgstr "03.18.2012"
#. type: TH
#: en/live-tools.7:9
-#, fuzzy, no-wrap
-#| msgid "3.0~a5"
-msgid "3.0~a6"
-msgstr "3.0~a5"
+#, no-wrap
+msgid "3.0~a7-1"
+msgstr "3.0~a7-1"
#. type: TH
#: en/live-tools.7:9
diff --git a/manpages/pot/live-tools.7.pot b/manpages/pot/live-tools.7.pot
index 8351cf0..15bf117 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: 2012-02-06 23:36+0100\n"
+"POT-Creation-Date: 2012-03-18 14:46+0100\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 "2012-02-06"
+msgid "2012-03-18"
msgstr ""
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "3.0~a6"
+msgid "3.0~a7-1"
msgstr ""
#. type: TH
diff --git a/scripts/live-system b/scripts/live-system
index 6f0e0c0..bf35357 100755
--- a/scripts/live-system
+++ b/scripts/live-system
@@ -3,9 +3,21 @@
## live-tools(7) - System Support Scripts
## Copyright (C) 2006-2012 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.
+## This program is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program. If not, see <http://www.gnu.org/licenses/>.
+##
+## The complete text of the GNU General Public License
+## can be found in /usr/share/common-licenses/GPL-3 file.
# Redirect stdout to stderr
--
live-tools
More information about the debian-live-changes
mailing list