From 92db4fa1efb3c12b4954b3a3e100b4896c0c3a1d Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 17 Jul 2014 12:50:09 +0100
Subject: [PATCH] Import patches-unapplied version 2.225 to
 ubuntu/utopic-proposed

Imported using git-ubuntu import.

Changelog parent: 33e2ad65cd1dff0789acc82f625e9252cad929c1

New changelog entries:
  * Use the soon-to-exist ubuntu-rtm archive for ubuntu-touch builds if
    SUBPROJECT is ubuntu-rtm (or ubuntu-rtm/dogfood for the dogfood
    version).
---
 debian/changelog       |  8 ++++++++
 live-build/auto/config | 13 +++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 10e18cb6..8f461ca6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.225) utopic; urgency=medium
+
+  * Use the soon-to-exist ubuntu-rtm archive for ubuntu-touch builds if
+    SUBPROJECT is ubuntu-rtm (or ubuntu-rtm/dogfood for the dogfood
+    version).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Thu, 17 Jul 2014 12:50:09 +0100
+
 livecd-rootfs (2.224) utopic; urgency=medium
 
   * drop extra space in DEFGROUPS variable
diff --git a/live-build/auto/config b/live-build/auto/config
index 185693b9..85f685ea 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -336,6 +336,19 @@ case $PROJECT in
 		OPTS="${OPTS:+$OPTS }--compression gzip"
 		OPTS="${OPTS:+$OPTS }--system normal"
 		OPTS="${OPTS:+$OPTS }--zsync false"
+
+		# TODO cjwatson 2014-07-17: This is a bit of an abuse of
+		# SUBPROJECT, but it's a handy thing that launchpad-buildd
+		# already passes through to us that we weren't otherwise
+		# using here.
+		case $SUBPROJECT in
+		    ubuntu-rtm/dogfood)
+			MIRROR=http://derived-archive.dogfood.content.paddev.net/ubuntu-rtm/
+			;;
+		    ubuntu-rtm)
+			MIRROR=http://derived.archive.canonical.com/ubuntu-rtm/
+			;;
+		esac
 		;;
 
 	*)