[SCM] live-tools branch, upstream, updated. upstream/3.0_a5-1-g8a9494b

Mon Feb 6 22:38:02 UTC 2012

The following commit has been merged in the upstream branch:
commit 8a9494b0a328c88134b561ecd76731dd64d0143d
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Feb 6 23:37:23 2012 +0100

    Adding upstream version 3.0~a6.

diff --git a/Makefile b/Makefile
index ef9749b..27333ab 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ test:
 		echo "W: checkbashisms - command not found"; \
 		echo "I: checkbashisms can be optained from: "; \
 		echo "I:   http://git.debian.org/?p=devscripts/devscripts.git"; \
-		echo "I: On Debian systems, checkbashisms can be installed with:"; \
+		echo "I: On Debian based systems, checkbashisms can be installed with:"; \
 		echo "I:   apt-get install devscripts"; \
 	fi
 
@@ -71,9 +71,9 @@ uninstall:
 		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
+	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) > /dev/null 2>&1 || true
 
 	# Uninstalling docs
 	rm -rf $(DESTDIR)/usr/share/doc/live-tools
diff --git a/VERSION b/VERSION
index 97c929b..7855bab 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a5
+3.0~a6
diff --git a/manpages/Makefile b/manpages/Makefile
index 68b5e31..3b8b063 100644
--- a/manpages/Makefile
+++ b/manpages/Makefile
@@ -25,7 +25,7 @@ build: po4a.cfg
 		echo "E: po4a - command not found"; \
 		echo "I: po4a can be optained from:"; \
 		echo "I:   http://po4a.alioth.debian.org/"; \
-		echo "I: On Debian systems, po4a can be installed with:"; \
+		echo "I: On Debian based systems, po4a can be installed with:"; \
 		echo "I:   apt-get install po4a"; \
 		exit 1; \
 	fi
diff --git a/manpages/de/live-tools.de.7 b/manpages/de/live-tools.de.7
index c28e189..430e3cf 100644
--- a/manpages/de/live-tools.de.7
+++ b/manpages/de/live-tools.de.7
@@ -1,5 +1,5 @@
 .\" live-tools(7) - System Support Scripts
-.\" Copyright (C) 2006-2011 Daniel Baumann <daniel at debian.org>
+.\" 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
@@ -11,7 +11,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-TOOLS 7 11.06.2011 3.0~a5 "Debian Live Projekt"
+.TH LIVE\-TOOLS 7 2012\-02\-06 3.0~a6 "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 8d260db..425ca4e 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-2011 Daniel Baumann <daniel at debian.org>
+.\" 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.
 .\"
 .\"
-.TH LIVE\-TOOLS 7 2011\-06\-11 3.0~a5 "Debian Live Project"
+.TH LIVE\-TOOLS 7 2012\-02\-06 3.0~a6 "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 13bf469..980ac8f 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: 2011-06-11 13:20+0300\n"
+"POT-Creation-Date: 2012-02-06 23:36+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,13 +24,14 @@ msgstr "LIVE-TOOLS"
 #. type: TH
 #: en/live-tools.7:9
 #, no-wrap
-msgid "2011-06-11"
-msgstr "11.06.2011"
+msgid "2012-02-06"
+msgstr ""
 
 #. type: TH
 #: en/live-tools.7:9
-#, no-wrap
-msgid "3.0~a5"
+#, fuzzy, no-wrap
+#| msgid "3.0~a5"
+msgid "3.0~a6"
 msgstr "3.0~a5"
 
 #. type: TH
diff --git a/manpages/pot/live-tools.7.pot b/manpages/pot/live-tools.7.pot
index 4ebf09e..8351cf0 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-06-11 13:20+0300\n"
+"POT-Creation-Date: 2012-02-06 23:36+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 "2011-06-11"
+msgid "2012-02-06"
 msgstr ""
 
 #. type: TH
 #: en/live-tools.7:9
 #, no-wrap
-msgid "3.0~a5"
+msgid "3.0~a6"
 msgstr ""
 
 #. type: TH
diff --git a/scripts/live-system b/scripts/live-system
index bcae199..6f0e0c0 100755
--- a/scripts/live-system
+++ b/scripts/live-system
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-tools(7) - System Support Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel at debian.org>
+## 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
diff --git a/scripts/live-toram b/scripts/live-toram
index 507e5cb..f1ec8b8 100755
--- a/scripts/live-toram
+++ b/scripts/live-toram
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## live-tools(7) - System Support Scripts
-## Copyright (C) 2006-2011 Daniel Baumann <daniel at debian.org>
+## 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

-- 
live-tools

