[SCM] live-helper branch, debian-next, updated. debian/2.0_a8-1-12-g2341a43

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 2341a43cbf1f4a6525cda144a2ccc47c9ffddd76
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Mar 7 12:07:54 2010 +0100

    Shuffeling cgi files arround.

diff --git a/examples/cron/crontab b/cgi/crontab
similarity index 100%
rename from examples/cron/crontab
rename to cgi/crontab
diff --git a/debian/live-helper.logrotate b/cgi/logrotate
similarity index 100%
rename from debian/live-helper.logrotate
rename to cgi/logrotate
diff --git a/debian/rules b/debian/rules
index c9fd0ff..97b42fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,8 +14,6 @@ override_dh_auto_install:
 
 	$(MAKE) -C po install DESTDIR=$(CURDIR)/debian/live-helper
 
-	install -D -m 0644 debian/live-helper.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
 	mv debian/live-helper/usr/share/live-helper/templates debian/live-helper/usr/share/live-helper/templates.debian
@@ -24,7 +22,7 @@ override_dh_auto_install:
 	rm -f debian/live-helper/usr/share/doc/live-helper/COPYING
 	rm -f debian/live-helper/usr/share/doc/live-helper/ChangeLog
 	mv debian/live-helper/usr/share/doc/live-helper/ChangeLog.live-package debian/live-helper/usr/share/doc/live-helper/changelog.live-package
-
+	mv debian/live-helper/usr/share/doc/live-helper/ChangeLog.live-webhelper debian/live-helper/usr/share/doc/live-helper/changelog.live-webhelper
 
 override_dh_installchangelogs:
 	dh_installchangelogs docs/ChangeLog
diff --git a/debian/live-helper.cron.daily b/examples/cron/cron.daily
old mode 100644
new mode 100755
similarity index 100%
rename from debian/live-helper.cron.daily
rename to examples/cron/cron.daily
diff --git a/debian/live-helper.default b/examples/cron/default
similarity index 100%
rename from debian/live-helper.default
rename to examples/cron/default

-- 
live-helper