Merge lp:~jibel/ubuntu/trusty/sbuild/lp1247420_add_universe into lp:ubuntu/trusty/sbuild

[Jean-Baptiste Lallement]

Add universe on Ubuntu to make procenv buildable (LP:1247420)

[Martin Pitt (pitti)]

Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-03 09:04:59 +0000
+++ debian/changelog	2013-11-02 22:05:33 +0000
@@ -1,3 +1,10 @@
+sbuild (0.64.0-1ubuntu2) trusty; urgency=low
+
+  * debian/tests/build_procenv: Add component universe for Ubuntu to make
+    procenv buildable (LP: #1247420)
+
+ -- Jean-Baptiste Lallement <[e-mail]>  Sat, 02 Nov 2013 22:45:08 +0100
+
 sbuild (0.64.0-1ubuntu1) saucy; urgency=low
 
   * Merge from Debian unstable. Remaining changes:

=== modified file 'debian/tests/build_procenv'
--- debian/tests/build_procenv	2013-09-03 09:04:59 +0000
+++ debian/tests/build_procenv	2013-11-02 22:05:33 +0000
@@ -1,10 +1,11 @@
-#!/bin/sh -e
+#!/bin/sh
 #---------------------------------------------------------------------
 # DEP-8 test for sbuild.
 #
 # Creates a sbuild chroot, builds a package, installs the resulting
 # .deb, then runs the command provided by the .deb.
 #---------------------------------------------------------------------
+set -e
 
 die()
 {
@@ -21,17 +22,19 @@
 # exposing the full sbuild environment to those perusing the autopkgtest
 # logs.
 pkg=procenv
+components=""
 
-distro=$(lsb_release --id|cut -d: -f2-|awk '{print $1}'|tr '[A-Z]' '[a-z]')
+distro=$(lsb_release -is|tr '[A-Z]' '[a-z]')
 [ -z "$distro" ] && die "cannot establish distribution"
 
-host_release=$(lsb_release --codename|cut -d: -f2-|awk '{print $1}')
+host_release=$(lsb_release -cs)
 [ -z "$host_release" ] && die "cannot establish release running on host"
 
 if [ "$distro" = ubuntu ]
 then
     # Build chroot for latest release.
     release=$(distro-info --devel)
+    components=main,universe
 
     url=http://archive.ubuntu.com/ubuntu
 elif [ "$distro" = debian ]
@@ -88,7 +91,8 @@
 dsc=$(ls ${pkg}*.dsc)
 
 echo "INFO: Creating sbuild chroot '$chroot' for release '$release' in directory '$dir' from url '$url'"
-sbuild-createchroot "$release" "$dir" "$url"
+[ -n "$components" ] && components="--components=$components"
+sbuild-createchroot $components "$release" "$dir" "$url"
 
 echo "INFO: Checking chroot '$chroot' is known"
 schroot --list --all-chroots|grep "^chroot:${chroot}$"