[SCM] live-tools branch, debian-next, updated. debian/3.0.3-1-2-gd40c351

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 4c1dc2cb30d48ec3851e36de111aad18ef6795f5
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jul 21 00:28:37 2012 +0200

    Using common source tree layout for all live packages.

diff --git a/Makefile b/Makefile
index 44a2a1d..9d279a5 100644
--- a/Makefile
+++ b/Makefile
@@ -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)/usr/bin
+	cp -r bin/* $(DESTDIR)/usr/bin
 
 	# Installing docs
 	mkdir -p $(DESTDIR)/usr/share/doc/live-tools
@@ -74,7 +74,7 @@ install:
 
 uninstall:
 	# Uninstalling scripts
-	for SCRIPT in scripts/*; \
+	for SCRIPT in bin/*; \
 	do \
 		rm -f $(DESTDIR)/usr/$$(basename $${SCRIPT}); \
 	done
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 100%
rename from scripts/live-toram
rename to bin/live-toram
diff --git a/scripts/live-uptime b/bin/live-uptime
similarity index 100%
rename from scripts/live-uptime
rename to bin/live-uptime

-- 
live-tools