From fc96613035bc499877d7d56bc5244ba0b2d14c77 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel@debian.org>
Date: Sun, 18 Apr 2010 20:41:46 +0200
Subject: [PATCH] Adding upstream version 1.110.6.

---
 Makefile            | 17 +++++++++++++----
 bin/live-snapshot   |  6 +++---
 docs/parameters.txt |  2 +-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index ab5403f..dd60498 100644
--- a/Makefile
+++ b/Makefile
@@ -5,11 +5,20 @@ TRANSLATIONS="it"
 all: build
 
 test:
+	# Checking for syntax errors
 	set -e; for SCRIPT in bin/* hooks/* scripts/live scripts/live-functions scripts/live-helpers scripts/*/*; \
 	do \
 		sh -n $$SCRIPT; \
 	done
 
+	# Checking for bashisms (temporary not failing, but only listing)
+	if [ -x /usr/bin/checkbashisms ]; \
+	then \
+		checkbashisms bin/* hooks/* scripts/live scripts/live-functions scripts/live-helpers scripts/*/* || true; \
+	else \
+		echo "bashism test skipped - you need to install devscripts."; \
+	fi
+
 build:
 
 install: test build
@@ -104,10 +113,10 @@ uninstall:
 update:
 	set -e; for FILE in docs/parameters.txt; \
 	do \
-		sed -i	-e 's/2007\\-11\\-05/2007\\-11\\-12/' \
-			-e 's/2007-11-05/2007-11-12/' \
-			-e 's/05.11.2007/12.11.2007/' \
-			-e 's/1.110.5/1.110.6/' \
+		sed -i	-e 's/2007\\-11\\-12/2007\\-11\\-19/' \
+			-e 's/2007-11-12/2007-11-19/' \
+			-e 's/12.11.2007/19.11.2007/' \
+			-e 's/1.110.6/1.110.7/' \
 		$$FILE; \
 	done
 
diff --git a/bin/live-snapshot b/bin/live-snapshot
index a6b4154..3d0183d 100755
--- a/bin/live-snapshot
+++ b/bin/live-snapshot
@@ -83,7 +83,7 @@ Usage ()
 
 	if [ ! -z "${MESSAGE}" ]
 	then
-		echo -e "${MESSAGE}"
+		/bin/echo -e "${MESSAGE}"
 		exit 1
 	else
 		exit 0
@@ -99,9 +99,9 @@ Help ()
 	echo "  -c, --cow: specifies the copy on write directory (default: /live/cow)."
 	echo "  -d, --device: specifies the output snapshot device (default: none)."
 	echo "  -o, --output: specifies the output image file (default: ${type} dependent)."
-    echo "  -r, --resync-string: internally used to resync previous made snapshots."
+	echo "  -r, --resync-string: internally used to resync previous made snapshots."
 	echo "  -t, --type: specifies the snapshot type between \"squashfs\", \"ext2\", \"ext3\" or \"cpio\".gz archive (default: cpio)"
-    echo -e "\nLook at live-snapshot(1) man page for more information."
+	/bin/echo -e "\nLook at live-snapshot(1) man page for more information."
 
 	exit 0
 }
diff --git a/docs/parameters.txt b/docs/parameters.txt
index f8bb2f4..20dd366 100644
--- a/docs/parameters.txt
+++ b/docs/parameters.txt
@@ -1,7 +1,7 @@
 Boot Parameters for Debian Live
 -------------------------------
 
-Updated for live-initramfs 1.110.3-1 on 2007-10-22.
+Updated for live-initramfs 1.110.6-1 on 2007-11-12.
 
 These options (can be combined) work from the bootloader prompt:
 
-- 
2.1.4