Merge lp:~vanvugt/mir/fix-1287600-trunk-0.1.6 into lp:~mir-team/mir/trunk-0.1.6

[Daniel van Vugt]

Don't pass a parameter to bash's popd command. It doesn't expect one and will
return an error from cross-compile-chroot.sh. (LP: #1287600)

[kevin gunn (kgunn72)]

this was reviewed and approved on lp:mir/devel
approving/merging as a cherry pick here

review: Approve

=== modified file 'cross-compile-chroot.sh'
--- cross-compile-chroot.sh	2014-02-18 02:12:21 +0000
+++ cross-compile-chroot.sh	2014-03-04 08:43:46 +0000
@@ -80,4 +80,4 @@
 
     make -j${NUM_JOBS}
 
-popd ${BUILD_DIR} > /dev/null 
+popd > /dev/null 
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-03-04 07:52:12 +0000
+++ debian/changelog	2014-03-04 08:43:46 +0000
@@ -59,6 +59,8 @@
       . Ubuntu trusty update "glm 0.9.5.1-1" broke Mir builds. Work around the
         change. (LP: #1285955)
       . Screencast feature by compositing to offscreen buffer (LP: #1207312)
+      . Don't pass a parameter to bash's popd command. It doesn't expect one
+        and will return an error from cross-compile-chroot.sh. (LP: #1287600)
 
  -- Kevin Gunn <[e-mail]>  Thu, 27 Feb 2014 19:37:47 -0600