[Debian-live-changes] r1310 - in dists/trunk/live-initramfs: . conf debian doc

[Daniel Baumann]

Author: daniel
Date: 2007-05-06 11:12:29 +0000 (Sun, 06 May 2007)
New Revision: 1310

Added:
   dists/trunk/live-initramfs/conf/
   dists/trunk/live-initramfs/conf/live.conf
Removed:
   dists/trunk/live-initramfs/live.conf
Modified:
   dists/trunk/live-initramfs/debian/examples
   dists/trunk/live-initramfs/debian/rules
   dists/trunk/live-initramfs/doc/ChangeLog
Log:


Copied: dists/trunk/live-initramfs/conf/live.conf (from rev 1309, dists/trunk/live-initramfs/live.conf)

Modified: dists/trunk/live-initramfs/debian/examples
===================================================================
--- dists/trunk/live-initramfs/debian/examples	2007-05-06 10:40:10 UTC (rev 1309)
+++ dists/trunk/live-initramfs/debian/examples	2007-05-06 11:12:29 UTC (rev 1310)
@@ -1 +1 @@
-live.conf
+conf/live.conf

Modified: dists/trunk/live-initramfs/debian/rules
===================================================================
--- dists/trunk/live-initramfs/debian/rules	2007-05-06 10:40:10 UTC (rev 1309)
+++ dists/trunk/live-initramfs/debian/rules	2007-05-06 11:12:29 UTC (rev 1310)
@@ -30,7 +30,7 @@
 	done
 
 	# Setting BUILD_SYSTEM in the binary package
-	sed -i -e 's/\(BUILD_SYSTEM="\).*"/\1'$(BUILD_SYSTEM)'"/g' live.conf
+	sed -e 's/\(BUILD_SYSTEM="\).*"/\1'$(BUILD_SYSTEM)'"/g' conf/live.conf > live.conf
 
 	# Building package
 	CFLAGS="$(CFLAGS)" $(MAKE) -C live-md5check
@@ -44,6 +44,7 @@
 
 	# Cleaning package
 	$(MAKE) -C live-md5check clean
+	rm -f live.conf
 
 	dh_clean
 

Modified: dists/trunk/live-initramfs/doc/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/doc/ChangeLog	2007-05-06 10:40:10 UTC (rev 1309)
+++ dists/trunk/live-initramfs/doc/ChangeLog	2007-05-06 11:12:29 UTC (rev 1310)
@@ -11,6 +11,9 @@
 	  casper-premount:
 	  - Renamed to live-*.
 
+	* Reorganised sources:
+	  - live.conf to conf/live.conf.
+
 	* bin/live-getty, live-login:
 	  - Reformated.
 	* debian/init:

Deleted: dists/trunk/live-initramfs/live.conf
===================================================================
--- dists/trunk/live-initramfs/live.conf	2007-05-06 10:40:10 UTC (rev 1309)
+++ dists/trunk/live-initramfs/live.conf	2007-05-06 11:12:29 UTC (rev 1310)
@@ -1,8 +0,0 @@
-# This file should go in /etc/live.conf
-# Supported variables are:
-# USERNAME, USERFULLNAME, HOST, BUILD_SYSTEM
-
-export USERNAME="ubuntu"
-export USERFULLNAME="Live session user"
-export HOST="ubuntu"
-export BUILD_SYSTEM="Ubuntu"