[SCM] live-tools branch, upstream, updated. upstream/3.0.3-1-gdfaecf8
Daniel Baumann
daniel at debian.org
Wed Jul 25 13:34:10 UTC 2012
The following commit has been merged in the upstream branch:
commit dfaecf843ebd13a26d419aa02c345bb445d496e7
Author: Daniel Baumann <daniel at debian.org>
Date: Wed Jul 25 15:33:40 2012 +0200
Adding upstream version 3.0.4.
diff --git a/Makefile b/Makefile
index 44a2a1d..5f2f812 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
## 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 program 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.
@@ -12,7 +12,7 @@ SHELL := sh -e
LANGUAGES = $(shell cd manpages/po && ls)
-SCRIPTS = scripts/*
+SCRIPTS = bin/*
all: build
@@ -49,8 +49,8 @@ build:
install:
# Installing scripts
- mkdir -p $(DESTDIR)/usr
- cp -r scripts $(DESTDIR)/usr/bin
+ mkdir -p $(DESTDIR)/bin
+ cp -r bin/* $(DESTDIR)/bin
# Installing docs
mkdir -p $(DESTDIR)/usr/share/doc/live-tools
@@ -74,23 +74,32 @@ install:
uninstall:
# Uninstalling scripts
- for SCRIPT in scripts/*; \
+ for SCRIPT in bin/*; \
do \
- rm -f $(DESTDIR)/usr/$$(basename $${SCRIPT}); \
+ rm -f $(DESTDIR)/bin/$$(basename $${SCRIPT}); \
done
- rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/bin > /dev/null 2>&1 || true
- rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr > /dev/null 2>&1 || true
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/bin > /dev/null 2>&1 || true
rmdir --ignore-fail-on-non-empty $(DESTDIR) > /dev/null 2>&1 || true
# Uninstalling docs
rm -rf $(DESTDIR)/usr/share/doc/live-tools
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/doc > /dev/null 2>&1 || true
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share > /dev/null 2>&1 || true
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr > /dev/null 2>&1 || true
+ rmdir --ignore-fail-on-non-empty $(DESTDIR) > /dev/null 2>&1 || true
+
# Uninstalling manpages
for MANPAGE in manpages/en/*; \
do \
SECTION="$$(basename $${MANPAGE} | awk -F. '{ print $$2 }')"; \
rm -f $(DESTDIR)/usr/share/man/man$${SECTION}/$$(basename $${MANPAGE} .en.$${SECTION}).$${SECTION}; \
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man/man$${SECTION} > /dev/null 2>&1 || true; \
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man > /dev/null 2>&1 || true; \
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share > /dev/null 2>&1 || true; \
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr > /dev/null 2>&1 || true; \
+ rmdir --ignore-fail-on-non-empty $(DESTDIR) > /dev/null 2>&1 || true; \
done
for LANGUAGE in $(LANGUAGES); \
@@ -99,11 +108,17 @@ uninstall:
do \
SECTION="$$(basename $${MANPAGE} | awk -F. '{ print $$3 }')"; \
rm -f $(DESTDIR)/usr/share/man/$${LANGUAGE}/man$${SECTION}/$$(basename $${MANPAGE} .$${LANGUAGE}.$${SECTION}).$${SECTION}; \
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man/$${LANGUAGE}/man$${SECTION} > /dev/null 2>&1 || true; \
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man/$${LANGUAGE} > /dev/null 2>&1 || true; \
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/man > /dev/null 2>&1 || true; \
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share > /dev/null 2>&1 || true; \
+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr > /dev/null 2>&1 || true; \
+ rmdir --ignore-fail-on-non-empty $(DESTDIR) > /dev/null 2>&1 || true; \
done; \
done
clean:
-distclean:
+distclean: clean
reinstall: uninstall install
diff --git a/VERSION b/VERSION
index 50035e5..30591bd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0.3-1
+3.0.4-1
diff --git a/scripts/live-system b/bin/live-system
similarity index 100%
rename from scripts/live-system
rename to bin/live-system
diff --git a/scripts/live-toram b/bin/live-toram
similarity index 97%
rename from scripts/live-toram
rename to bin/live-toram
index f6995ad..3b2a473 100755
--- a/scripts/live-toram
+++ b/bin/live-toram
@@ -3,7 +3,7 @@
## 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 program 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.
diff --git a/scripts/live-uptime b/bin/live-uptime
similarity index 92%
rename from scripts/live-uptime
rename to bin/live-uptime
index 31ae24f..0e1af12 100755
--- a/scripts/live-uptime
+++ b/bin/live-uptime
@@ -3,7 +3,7 @@
## 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 program 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.
diff --git a/manpages/Makefile b/manpages/Makefile
index defb121..fc2146f 100644
--- a/manpages/Makefile
+++ b/manpages/Makefile
@@ -3,7 +3,7 @@
## 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 program 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.
diff --git a/manpages/bin/update-version.sh b/manpages/bin/update-version.sh
index daf73a7..51d2ffa 100755
--- a/manpages/bin/update-version.sh
+++ b/manpages/bin/update-version.sh
@@ -3,7 +3,7 @@
## 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 program 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.
@@ -35,7 +35,7 @@ do
then
for _FILE in po/${_LANGUAGE}/*.po
do
- sed -i -e "s|^msgstr .*.2012\"$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" "${_FILE}"
+ sed -i -e "s|^msgstr .*.${YEAR}\"$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" "${_FILE}"
done
fi
done
@@ -45,6 +45,6 @@ if ls po/pt_BR/*.po > /dev/null 2>&1
then
for _FILE in po/pt_BR/*.po
do
- sed -i -e "s|^msgstr .*-2012\"$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" "${_FILE}"
+ sed -i -e "s|^msgstr .*-${YEAR}\"$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" "${_FILE}"
done
fi
diff --git a/manpages/de/live-tools.de.7 b/manpages/de/live-tools.de.7
index 0c5bbf5..81af9d0 100644
--- a/manpages/de/live-tools.de.7
+++ b/manpages/de/live-tools.de.7
@@ -1,7 +1,7 @@
.\" 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 program 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.
.\"
@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
-.TH LIVE\-TOOLS 7 05.07.2012 3.0.3\-1 "Debian Live Projekt"
+.TH LIVE\-TOOLS 7 24.07.2012 3.0.4\-1 "Debian Live Projekt"
.SH NAME
\fBlive\-tools\fP \- System Support Skripte
@@ -36,6 +36,8 @@ LXC).
\fIlive\-build\fP(7)
.PP
\fIlive\-config\fP(7)
+.PP
+\fIlive\-debconfig\fP(7)
.SH HOMEPAGE
Weitere Informationen über live\-tools und das Debian Live Projekt können auf
diff --git a/manpages/en/live-tools.7 b/manpages/en/live-tools.7
index ee972f7..6ddd7d2 100644
--- a/manpages/en/live-tools.7
+++ b/manpages/en/live-tools.7
@@ -1,12 +1,12 @@
.\" 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 program 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.
.\"
.\"
-.TH LIVE\-TOOLS 7 2012\-07\-05 3.0.3-1 "Debian Live Project"
+.TH LIVE\-TOOLS 7 2012\-07\-24 3.0.4-1 "Debian Live Project"
.SH NAME
\fBlive\-tools\fR \- System Support Scripts
@@ -30,6 +30,8 @@ tells how long the system has been running (works with LXC).
\fIlive\-build\fR(7)
.PP
\fIlive\-config\fR(7)
+.PP
+\fIlive\-debconfig\fR(7)
.SH HOMEPAGE
More information about live\-tools and the Debian Live project can be found on the homepage at <\fIhttp://live.debian.net/\fR> and in the manual at <\fIhttp://live.debian.net/manual/\fR>.
diff --git a/manpages/po/de/live-tools.7.po b/manpages/po/de/live-tools.7.po
index 10088b0..fb79c68 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.3-1\n"
-"POT-Creation-Date: 2012-07-05 17:06+0300\n"
+"Project-Id-Version: live-tools 3.0.4-1\n"
+"POT-Creation-Date: 2012-07-24 21:44+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 "2012-07-05"
-msgstr "05.07.2012"
+msgid "2012-07-24"
+msgstr "24.07.2012"
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "3.0.3-1"
-msgstr "3.0.3-1"
+msgid "3.0.4-1"
+msgstr "3.0.4-1"
#. type: TH
#: en/live-tools.7:9
@@ -129,14 +129,19 @@ msgstr "I<live-build>(7)"
msgid "I<live-config>(7)"
msgstr "I<live-config>(7)"
+#. type: Plain text
+#: en/live-tools.7:35
+msgid "I<live-debconfig>(7)"
+msgstr "I<live-debconfig>(7)"
+
#. type: SH
-#: en/live-tools.7:34
+#: en/live-tools.7:36
#, no-wrap
msgid "HOMEPAGE"
msgstr "HOMEPAGE"
#. type: Plain text
-#: en/live-tools.7:36
+#: en/live-tools.7:38
msgid ""
"More information about live-tools and the Debian Live project can be found "
"on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -147,13 +152,13 @@ msgstr ""
"unter E<lt>I<http://live.debian.net/manual/>E<gt> gefunden werden."
#. type: SH
-#: en/live-tools.7:37
+#: en/live-tools.7:39
#, no-wrap
msgid "BUGS"
msgstr "FEHLER"
#. type: Plain text
-#: en/live-tools.7:39
+#: en/live-tools.7:41
msgid ""
"Bugs can be reported by submitting a bugreport for the live-tools package in "
"the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -167,13 +172,13 @@ msgstr ""
"werden."
#. type: SH
-#: en/live-tools.7:40
+#: en/live-tools.7:42
#, no-wrap
msgid "AUTHOR"
msgstr "AUTOR"
#. type: Plain text
-#: en/live-tools.7:41
+#: en/live-tools.7:43
msgid ""
"live-tools was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt>."
msgstr ""
diff --git a/manpages/pot/live-tools.7.pot b/manpages/pot/live-tools.7.pot
index 205a555..ee636c2 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-07-05 17:06+0300\n"
+"POT-Creation-Date: 2012-07-24 21:44+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 "2012-07-05"
+msgid "2012-07-24"
msgstr ""
#. type: TH
#: en/live-tools.7:9
#, no-wrap
-msgid "3.0.3-1"
+msgid "3.0.4-1"
msgstr ""
#. type: TH
@@ -128,14 +128,19 @@ msgstr ""
msgid "I<live-config>(7)"
msgstr ""
+#. type: Plain text
+#: en/live-tools.7:35
+msgid "I<live-debconfig>(7)"
+msgstr ""
+
#. type: SH
-#: en/live-tools.7:34
+#: en/live-tools.7:36
#, no-wrap
msgid "HOMEPAGE"
msgstr ""
#. type: Plain text
-#: en/live-tools.7:36
+#: en/live-tools.7:38
msgid ""
"More information about live-tools and the Debian Live project can be found "
"on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
@@ -143,13 +148,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-tools.7:37
+#: en/live-tools.7:39
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: en/live-tools.7:39
+#: en/live-tools.7:41
msgid ""
"Bugs can be reported by submitting a bugreport for the live-tools package in "
"the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
@@ -158,13 +163,13 @@ msgid ""
msgstr ""
#. type: SH
-#: en/live-tools.7:40
+#: en/live-tools.7:42
#, no-wrap
msgid "AUTHOR"
msgstr ""
#. type: Plain text
-#: en/live-tools.7:41
+#: en/live-tools.7:43
msgid ""
"live-tools was written by Daniel Baumann E<lt>I<daniel at debian.org>E<gt>."
msgstr ""
--
live-tools
More information about the debian-live-changes
mailing list