Merge branch 'master' into newreponewrepo

Use the new repo.l.o repository, but include main/debug suite.

Conflicts:
	raring-armhf-alip/customization/archives/linaro-overlay-ppa.list.chroot
	raring-armhf-developer/customization/archives/linaro-overlay-ppa.list.chroot
	raring-armhf-nano-lava/customization/archives/linaro-overlay-ppa.list.chroot
	raring-armhf-server/customization/archives/linaro-overlay-ppa.list.chroot
	raring-armhf-ubuntu-desktop/customization/archives/linaro-overlay-ppa.list.chroot

28 files changed, 5 insertions, 6 deletions

diff --git a/raring-armhf-alip/customization/archives/linaro-overlay-ppa.list.chroot b/raring-armhf-alip/customization/archives/linaro-overlay-ppa.list.chroot
index 6de2340..752248c 100644
--- a/raring-armhf-alip/customization/archives/linaro-overlay-ppa.list.chroot
+++ b/raring-armhf-alip/customization/archives/linaro-overlay-ppa.list.chroot
@@ -1,3 +1,3 @@
 # Linaro Overlay PPA
-deb http://repo.linaro.org/ubuntu/linaro-overlay @DISTRIBUTION@ main
+deb http://repo.linaro.org/ubuntu/linaro-overlay @DISTRIBUTION@ main main/debug
 deb-src http://repo.linaro.net/ubuntu/linaro-overlay @DISTRIBUTION@ main
diff --git a/raring-armhf-alip/customization/includes/raring/common/boot/filesystem.dir/etc/default/apport b/raring-armhf-alip/customization/includes.chroot/etc/default/apport
index eddc830..eddc830 100644
--- a/raring-armhf-alip/customization/includes/raring/common/boot/filesystem.dir/etc/default/apport
+++ b/raring-armhf-alip/customization/includes.chroot/etc/default/apport
diff --git a/raring-armhf-alip/customization/includes/raring/common/boot/filesystem.dir/etc/default/locale b/raring-armhf-alip/customization/includes.chroot/etc/default/locale
index f9c983c..f9c983c 100644
--- a/raring-armhf-alip/customization/includes/raring/common/boot/filesystem.dir/etc/default/locale
+++ b/raring-armhf-alip/customization/includes.chroot/etc/default/locale
diff --git a/raring-armhf-alip/customization/includes/raring/common/boot/filesystem.dir/etc/hostname b/raring-armhf-alip/customization/includes.chroot/etc/hostname
index b18833f..b18833f 100644
--- a/raring-armhf-alip/customization/includes/raring/common/boot/filesystem.dir/etc/hostname
+++ b/raring-armhf-alip/customization/includes.chroot/etc/hostname
diff --git a/raring-armhf-alip/customization/includes/raring/common/boot/filesystem.dir/etc/hosts b/raring-armhf-alip/customization/includes.chroot/etc/hosts
index 7dcb363..7dcb363 100644
--- a/raring-armhf-alip/customization/includes/raring/common/boot/filesystem.dir/etc/hosts
+++ b/raring-armhf-alip/customization/includes.chroot/etc/hosts
diff --git a/raring-armhf-alip/customization/includes/raring/common/boot/filesystem.dir/etc/lightdm/lightdm.conf b/raring-armhf-alip/customization/includes.chroot/etc/lightdm/lightdm.conf
index 9d37518..9d37518 100644
--- a/raring-armhf-alip/customization/includes/raring/common/boot/filesystem.dir/etc/lightdm/lightdm.conf
+++ b/raring-armhf-alip/customization/includes.chroot/etc/lightdm/lightdm.conf
diff --git a/raring-armhf-developer/customization/archives/linaro-overlay-ppa.list.chroot b/raring-armhf-developer/customization/archives/linaro-overlay-ppa.list.chroot
index 6de2340..752248c 100644
--- a/raring-armhf-developer/customization/archives/linaro-overlay-ppa.list.chroot
+++ b/raring-armhf-developer/customization/archives/linaro-overlay-ppa.list.chroot
@@ -1,3 +1,3 @@
 # Linaro Overlay PPA
-deb http://repo.linaro.org/ubuntu/linaro-overlay @DISTRIBUTION@ main
+deb http://repo.linaro.org/ubuntu/linaro-overlay @DISTRIBUTION@ main main/debug
 deb-src http://repo.linaro.net/ubuntu/linaro-overlay @DISTRIBUTION@ main
diff --git a/raring-armhf-developer/customization/includes/raring/common/boot/filesystem.dir/etc/default/locale b/raring-armhf-developer/customization/includes.chroot/etc/default/locale
index f9c983c..f9c983c 100644
--- a/raring-armhf-developer/customization/includes/raring/common/boot/filesystem.dir/etc/default/locale
+++ b/raring-armhf-developer/customization/includes.chroot/etc/default/locale
diff --git a/raring-armhf-developer/customization/includes/raring/common/boot/filesystem.dir/etc/hostname b/raring-armhf-developer/customization/includes.chroot/etc/hostname
index bafc623..bafc623 100644
--- a/raring-armhf-developer/customization/includes/raring/common/boot/filesystem.dir/etc/hostname
+++ b/raring-armhf-developer/customization/includes.chroot/etc/hostname
diff --git a/raring-armhf-developer/customization/includes/raring/common/boot/filesystem.dir/etc/hosts b/raring-armhf-developer/customization/includes.chroot/etc/hosts
index 135dd9d..135dd9d 100644
--- a/raring-armhf-developer/customization/includes/raring/common/boot/filesystem.dir/etc/hosts
+++ b/raring-armhf-developer/customization/includes.chroot/etc/hosts
diff --git a/raring-armhf-nano-lava/customization/archives/linaro-overlay-ppa.list.chroot b/raring-armhf-nano-lava/customization/archives/linaro-overlay-ppa.list.chroot
index 6de2340..752248c 100644
--- a/raring-armhf-nano-lava/customization/archives/linaro-overlay-ppa.list.chroot
+++ b/raring-armhf-nano-lava/customization/archives/linaro-overlay-ppa.list.chroot
@@ -1,3 +1,3 @@
 # Linaro Overlay PPA
-deb http://repo.linaro.org/ubuntu/linaro-overlay @DISTRIBUTION@ main
+deb http://repo.linaro.org/ubuntu/linaro-overlay @DISTRIBUTION@ main main/debug
 deb-src http://repo.linaro.net/ubuntu/linaro-overlay @DISTRIBUTION@ main
diff --git a/raring-armhf-nano-lava/customization/includes/raring/common/boot/filesystem.dir/etc/default/locale b/raring-armhf-nano-lava/customization/includes.chroot/etc/default/locale
index f9c983c..f9c983c 100644
--- a/raring-armhf-nano-lava/customization/includes/raring/common/boot/filesystem.dir/etc/default/locale
+++ b/raring-armhf-nano-lava/customization/includes.chroot/etc/default/locale
diff --git a/raring-armhf-nano-lava/customization/includes/raring/common/boot/filesystem.dir/etc/hostname b/raring-armhf-nano-lava/customization/includes.chroot/etc/hostname
index 1d1dfdb..1d1dfdb 100644
--- a/raring-armhf-nano-lava/customization/includes/raring/common/boot/filesystem.dir/etc/hostname
+++ b/raring-armhf-nano-lava/customization/includes.chroot/etc/hostname
diff --git a/raring-armhf-nano-lava/customization/includes/raring/common/boot/filesystem.dir/etc/hosts b/raring-armhf-nano-lava/customization/includes.chroot/etc/hosts
index 5c520b5..5c520b5 100644
--- a/raring-armhf-nano-lava/customization/includes/raring/common/boot/filesystem.dir/etc/hosts
+++ b/raring-armhf-nano-lava/customization/includes.chroot/etc/hosts
diff --git a/raring-armhf-nano/customization/includes/raring/common/boot/filesystem.dir/etc/default/locale b/raring-armhf-nano/customization/includes.chroot/etc/default/locale
index f9c983c..f9c983c 100644
--- a/raring-armhf-nano/customization/includes/raring/common/boot/filesystem.dir/etc/default/locale
+++ b/raring-armhf-nano/customization/includes.chroot/etc/default/locale
diff --git a/raring-armhf-nano/customization/includes/raring/common/boot/filesystem.dir/etc/hostname b/raring-armhf-nano/customization/includes.chroot/etc/hostname
index 1d1dfdb..1d1dfdb 100644
--- a/raring-armhf-nano/customization/includes/raring/common/boot/filesystem.dir/etc/hostname
+++ b/raring-armhf-nano/customization/includes.chroot/etc/hostname
diff --git a/raring-armhf-nano/customization/includes/raring/common/boot/filesystem.dir/etc/hosts b/raring-armhf-nano/customization/includes.chroot/etc/hosts
index 5c520b5..5c520b5 100644
--- a/raring-armhf-nano/customization/includes/raring/common/boot/filesystem.dir/etc/hosts
+++ b/raring-armhf-nano/customization/includes.chroot/etc/hosts
diff --git a/raring-armhf-server/customization/archives/linaro-overlay-ppa.list.chroot b/raring-armhf-server/customization/archives/linaro-overlay-ppa.list.chroot
index 6de2340..752248c 100644
--- a/raring-armhf-server/customization/archives/linaro-overlay-ppa.list.chroot
+++ b/raring-armhf-server/customization/archives/linaro-overlay-ppa.list.chroot
@@ -1,3 +1,3 @@
 # Linaro Overlay PPA
-deb http://repo.linaro.org/ubuntu/linaro-overlay @DISTRIBUTION@ main
+deb http://repo.linaro.org/ubuntu/linaro-overlay @DISTRIBUTION@ main main/debug
 deb-src http://repo.linaro.net/ubuntu/linaro-overlay @DISTRIBUTION@ main
diff --git a/raring-armhf-server/customization/includes/raring/common/boot/filesystem.dir/etc/default/locale b/raring-armhf-server/customization/includes.chroot/etc/default/locale
index f9c983c..f9c983c 100644
--- a/raring-armhf-server/customization/includes/raring/common/boot/filesystem.dir/etc/default/locale
+++ b/raring-armhf-server/customization/includes.chroot/etc/default/locale
diff --git a/raring-armhf-server/customization/includes/raring/common/boot/filesystem.dir/etc/hostname b/raring-armhf-server/customization/includes.chroot/etc/hostname
index 9d4ad2a..9d4ad2a 100644
--- a/raring-armhf-server/customization/includes/raring/common/boot/filesystem.dir/etc/hostname
+++ b/raring-armhf-server/customization/includes.chroot/etc/hostname
diff --git a/raring-armhf-server/customization/includes/raring/common/boot/filesystem.dir/etc/hosts b/raring-armhf-server/customization/includes.chroot/etc/hosts
index d2b0602..d2b0602 100644
--- a/raring-armhf-server/customization/includes/raring/common/boot/filesystem.dir/etc/hosts
+++ b/raring-armhf-server/customization/includes.chroot/etc/hosts
diff --git a/raring-armhf-ubuntu-desktop/configure b/raring-armhf-ubuntu-desktop/configure
index 648cb8f..f6ad26b 100755
--- a/raring-armhf-ubuntu-desktop/configure
+++ b/raring-armhf-ubuntu-desktop/configure
@@ -18,7 +18,6 @@ lb config \
  --binary-filesystem ext4 \
  --binary-images tar \
  --bootappend-live "hostname=linaro-ubuntu-desktop username=linaro" \
- --bootstrap-flavour standard \
  --bootstrap-qemu-arch armhf \
  --bootstrap-qemu-static /usr/bin/qemu-arm-static \
  --cache false \
diff --git a/raring-armhf-ubuntu-desktop/customization/archives/linaro-overlay-ppa.list.chroot b/raring-armhf-ubuntu-desktop/customization/archives/linaro-overlay-ppa.list.chroot
index 6de2340..752248c 100644
--- a/raring-armhf-ubuntu-desktop/customization/archives/linaro-overlay-ppa.list.chroot
+++ b/raring-armhf-ubuntu-desktop/customization/archives/linaro-overlay-ppa.list.chroot
@@ -1,3 +1,3 @@
 # Linaro Overlay PPA
-deb http://repo.linaro.org/ubuntu/linaro-overlay @DISTRIBUTION@ main
+deb http://repo.linaro.org/ubuntu/linaro-overlay @DISTRIBUTION@ main main/debug
 deb-src http://repo.linaro.net/ubuntu/linaro-overlay @DISTRIBUTION@ main
diff --git a/raring-armhf-ubuntu-desktop/customization/includes/raring/common/boot/filesystem.dir/etc/default/apport b/raring-armhf-ubuntu-desktop/customization/includes.chroot/etc/default/apport
index eddc830..eddc830 100644
--- a/raring-armhf-ubuntu-desktop/customization/includes/raring/common/boot/filesystem.dir/etc/default/apport
+++ b/raring-armhf-ubuntu-desktop/customization/includes.chroot/etc/default/apport
diff --git a/raring-armhf-ubuntu-desktop/customization/includes/raring/common/boot/filesystem.dir/etc/default/locale b/raring-armhf-ubuntu-desktop/customization/includes.chroot/etc/default/locale
index f9c983c..f9c983c 100644
--- a/raring-armhf-ubuntu-desktop/customization/includes/raring/common/boot/filesystem.dir/etc/default/locale
+++ b/raring-armhf-ubuntu-desktop/customization/includes.chroot/etc/default/locale
diff --git a/raring-armhf-ubuntu-desktop/customization/includes/raring/common/boot/filesystem.dir/etc/hostname b/raring-armhf-ubuntu-desktop/customization/includes.chroot/etc/hostname
index e78067c..e78067c 100644
--- a/raring-armhf-ubuntu-desktop/customization/includes/raring/common/boot/filesystem.dir/etc/hostname
+++ b/raring-armhf-ubuntu-desktop/customization/includes.chroot/etc/hostname
diff --git a/raring-armhf-ubuntu-desktop/customization/includes/raring/common/boot/filesystem.dir/etc/hosts b/raring-armhf-ubuntu-desktop/customization/includes.chroot/etc/hosts
index 7d1b0f2..7d1b0f2 100644
--- a/raring-armhf-ubuntu-desktop/customization/includes/raring/common/boot/filesystem.dir/etc/hosts
+++ b/raring-armhf-ubuntu-desktop/customization/includes.chroot/etc/hosts
diff --git a/raring-armhf-ubuntu-desktop/customization/includes/raring/common/boot/filesystem.dir/etc/lightdm/lightdm.conf b/raring-armhf-ubuntu-desktop/customization/includes.chroot/etc/lightdm/lightdm.conf
index 7044832..7044832 100644
--- a/raring-armhf-ubuntu-desktop/customization/includes/raring/common/boot/filesystem.dir/etc/lightdm/lightdm.conf
+++ b/raring-armhf-ubuntu-desktop/customization/includes.chroot/etc/lightdm/lightdm.conf