[SCM] debian-live branch, master, updated. 1.0_a48-1-98-gea96223

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 8269facabdf3cb859104d422a48cc17275d4cdd4
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Aug 12 22:25:32 2008 +0200

    Moving live-helper defaults file for cron autobuilder from /etc/default/live-helper to /etc/default/live-helper_autobuild in order to not conflict with the system-wide default file for helper configuration.

diff --git a/debian/cron.daily b/debian/cron.daily
index c26168a..ddee567 100644
--- a/debian/cron.daily
+++ b/debian/cron.daily
@@ -11,11 +11,11 @@ then
 fi
 
 # Checking for live-helper defaults
-if [ -r /etc/default/live-helper ]
+if [ -r /etc/default/live-helper_autobuild ]
 then
-	. /etc/default/live-helper
+	. /etc/default/live-helper_autobuild
 else
-	echo "E: /etc/default/live-helper missing."
+	echo "E: /etc/default/live-helper_autobuild missing."
 	exit 1
 fi
 
diff --git a/debian/default b/debian/default
index d92aae4..8b17d5a 100644
--- a/debian/default
+++ b/debian/default
@@ -1,4 +1,4 @@
-# Defaults for /etc/cron.daily/live-helper
+# Defaults for /etc/cron.daily/live-helper_autobuild
 
 AUTOBUILD="disabled"
 
diff --git a/debian/rules b/debian/rules
index 50d5bb7..d1f9a44 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,7 +29,7 @@ install: build
 	# Installing message catalogs
 	$(MAKE) -C po install DESTDIR=$(CURDIR)/debian/live-helper
 
-	install -D -m 0644 debian/default debian/live-helper/etc/default/live-helper
+	install -D -m 0644 debian/default debian/live-helper/etc/default/live-helper_autobuild
 
 	# Preparing alternatives
 	mv debian/live-helper/usr/share/live-helper/includes debian/live-helper/usr/share/live-helper/includes.debian

-- 
debian-live