DIFF

=== modified file 'config'
--- config	2015-03-27 00:10:30 +0000
+++ config	2015-03-30 16:53:12 +0000
@@ -1,7 +1,7 @@
 [global]
 base_path = /home/ubuntu/kubuntu/system-image/
 #channels = trusty, trusty-proposed, trusty-customized
-channels = kubuntu-phone/devel-proposed, kubuntu-phone/devel-proposed2
+channels = kubuntu-phone/devel, kubuntu-phone/devel-proposed
 gpg_key_path = secret/gpg/keys/
 gpg_keyring_path = secret/gpg/keyrings/
 publish_path = /home/ubuntu/kubuntu/system-image/www
@@ -11,33 +11,22 @@
 public_http_port = 80
 public_https_port = 443
 
-#[channel_kubuntu-phone/devel-proposed]
-#type = auto
-#versionbase = 1
-#fullcount = 15
-#files = ubuntu, device, custom-kubuntu, keyring, version
-#file_ubuntu = remote-system-image;http://system-image.tasemnice.eu/;devel-proposed;ubuntu
-#file_device = remote-system-image;http://system-image.tasemnice.eu/;devel-proposed;device;keyring=archive-master
-#file_custom-kubuntu = http;http://custom-image.kubuntu.co.uk/custom.tar.xz;name=kubuntu,monitor=http://custom-image.kubuntu.co.uk/VERSION
-#file_keyring = keyring;archive-master
-#file_version = version
+[channel_kubuntu-phone/devel]
+type = auto
+versionbase = 1
+fullcount = 15
+files = ubuntu, device, keyring, version
+file_ubuntu = cdimage-ubuntu;/home/ubuntu/kubuntu/remaster/remaster/daily-preinstalled/;vivid;import=any
+file_device = remote-system-image;http://system-image.tasemnice.eu/;devel-proposed;device;keyring=archive-master
+file_keyring = keyring;archive-master
+file_version = version
 
 [channel_kubuntu-phone/devel-proposed]
 type = auto
 versionbase = 1
 fullcount = 15
 files = ubuntu, device, keyring, version
-file_ubuntu = cdimage-ubuntu;/home/ubuntu/kubuntu/remaster/remaster/daily-preinstalled/;vivid;import=any
-file_device = remote-system-image;http://system-image.tasemnice.eu/;devel-proposed;device;keyring=archive-master
-file_keyring = keyring;archive-master
-file_version = version
-
-[channel_kubuntu-phone/devel-proposed2]
-type = auto
-versionbase = 1
-fullcount = 15
-files = ubuntu, device, keyring, version
-file_ubuntu = cdimage-ubuntu;/home/ubuntu/kubuntu/remaster/remaster/daily-preinstalled/;vivid;import=any
+file_ubuntu = cdimage-ubuntu;/home/ubuntu/kubuntu/remaster/remaster-proposed/daily-preinstalled/;vivid;import=any
 file_device = remote-system-image;http://system-image.tasemnice.eu/;devel-proposed;device;keyring=archive-master
 file_keyring = keyring;archive-master
 file_version = version

=== modified file 'remaster-ubuntu-touch'
--- remaster-ubuntu-touch	2015-03-27 10:46:45 +0000
+++ remaster-ubuntu-touch	2015-03-30 16:34:09 +0000
@@ -23,17 +23,12 @@
 ssh ${SERVER} chroot ubuntu-touch-remaster/extract /chroot-remaster
 echo === making a new tar - this takes an age
 ssh ${SERVER} "cd /root/ubuntu-touch-remaster/extract; tar zcf vivid-preinstalled-touch-armhf.tar.gz *"
+cd ..
 echo === downloading tar
-cd ..
-mkdir -p remaster
-rsync -CvzapP --stats ${SERVER}:ubuntu-touch-remaster/extract/vivid-preinstalled-touch-armhf.tar.gz remaster/
+DATE=`date --rfc-3339='seconds' | sed "s, ,.," | sed s,\+.*,, | sed s,-,, | sed s,-,, | sed s,:,, | sed s,:,,`
+mkdir -p remaster-proposed/daily-preinstalled/${DATE}
+rsync -CvzapP --stats ${SERVER}:ubuntu-touch-remaster/extract/vivid-preinstalled-touch-armhf.tar.gz remaster-proposed/daily-preinstalled/${DATE}
 echo === running shasum
-cd remaster
+cd remaster-proposed/daily-preinstalled/${DATE}
 sha256sum vivid-preinstalled-touch-armhf.tar.gz > SHA256SUMS
-cd ..
-
-DATE=`date --rfc-3339='seconds' | sed "s, ,.," | sed s,\+.*,, | sed s,-,, | sed s,-,, | sed s,:,, | sed s,:,,`
-echo === moving new image into remaster/daily-preinstalled/${DATE}
-mkdir -p remaster/daily-preinstalled/${DATE}
-mv remaster/vivid-preinstalled-touch-armhf.tar.gz remaster/daily-preinstalled/${DATE}
-mv remaster/SHA256SUMS remaster/daily-preinstalled/${DATE}
+cd -