Merge lp:~jr/ubuntu-cdimage/kubuntu-quantal into lp:~cjwatson/ubuntu-cdimage/mainline

[Jonathan Riddell]

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'bin/publish-daily'
--- bin/publish-daily	2012-05-18 15:57:03 +0000
+++ bin/publish-daily	2012-06-11 11:33:28 +0000
@@ -127,6 +127,11 @@
 		SIZELIMIT=4700372992
 	fi
 
+	# Kubuntu limit of 1GB [quantal]
+	if [ "$PROJECT" = kubuntu ]; then
+		SIZELIMIT=1000000000
+	fi
+
 	if [ -e "$CDOUT/$arch/$DIST-$TYPE-$arch.raw" ]; then
 		echo "Publishing $arch ..."
 		mkdir -p "$PUBLISH"
 
=== modified file 'etc/crontab'
--- etc/crontab	2011-04-27 10:51:58 +0000
+++ etc/crontab	2012-06-11 11:33:28 +0000
@@ -5,7 +5,6 @@
 31 7 * * *	for-project ubuntu cron.daily; for-project ubuntu cron.daily-live
 17 12 * * 2,6	for-project ubuntu cron.dvd
 14 5 * * *	for-project kubuntu cron.daily; for-project kubuntu cron.daily-live
-47 20 * * 1,5	for-project kubuntu cron.dvd
 44 0 * * *	for-project edubuntu cron.dvd
 55 9 * * *	for-project xubuntu cron.daily; for-project xubuntu cron.daily-live
 29 6 * * *	for-project ubuntu-server cron.daily