Merge trunk

debian/changelog

@@ -21,12 +21,16 @@ ubuntu-dev-tools (0.146) UNRELEASED; urgency=low
       (LP: #1086342)
   * ubuntu-build: Default to DEV-proposed in batch mode. Thanks Scott
     Kitterman (LP: #1088010)
+  * seeded-in-ubuntu: Clarify that "not seeded" binary packages may not exist
+    (LP: #1029620)
+  * mk-sbuild: Name cross chroots after the build architecture and target
+    (LP: #1087194)
 
   [ Iain Lane ]
   * sponsor-patch: Allow all supported bare releases now that LP rewrites
     these to contain '-proposed' for us. 
 
- -- Julian Taylor <jtaylor@ubuntu.com>  Sat, 24 Nov 2012 21:07:01 +0100
+ -- Stefano Rivera <stefanor@ubuntu.com>  Sat, 12 Jan 2013 14:33:25 +0200
 
 ubuntu-dev-tools (0.145) experimental; urgency=low
 

mk-sbuild

@@ -314,7 +314,11 @@ if [ -z "$CHROOT_ARCH" ]; then
     CHROOT_ARCH="$HOST_ARCH"
 fi
 
-CHROOT_NAME="${name}-${CHROOT_ARCH}"
+if [ -z "$TARGET_ARCH" ]; then
+    CHROOT_NAME="${name}-${CHROOT_ARCH}"
+else
+    CHROOT_NAME="${name}-cross-${CHROOT_ARCH}-${TARGET_ARCH}"
+fi
 
 if [ -z "$synonym" ]; then
     CHROOT_SYNONYM=""

seeded-in-ubuntu

@@ -92,7 +92,7 @@ def output_binaries(index, binaries):
             print "%s is seeded in:" % binary
             print present_on(index[binary])
         else:
-            print "%s is not seeded." % binary
+            print "%s is not seeded (and may not exist)." % binary
 
 
 def output_by_source(index, by_source):