Merge lp:~thomas-voss/unity-mir/explicit-gcc-version into lp:unity-mir

[Thomas Voß]

Explicitly select g++-4.9 to prevent from ABI breaks.

Explicitly select g++-4.9 to prevent from ABI breaks.

* Are there any related MPs required for this MP to build/function as expected? Please list. Yes, multiple of them, all ligned up together in a silo.
 * Did you perform an exploratory manual test run of your code change and any related functionality? Yes.
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP? Yes.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:238
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/384/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/48
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/48/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/48

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/384/rebuild

review: Approve (continuous-integration)

[Colin Watson (cjwatson)]

I'd suggest versioning the build-dependency on libprocess-cpp-dev, but otherwise fine.

review: Approve

[Gerry Boland (gerboland)]

Checklist please: https://wiki.ubuntu.com/Process/Merges/Checklists/Unity-Mir

review: Needs Fixing

[lp:~thomas-voss/unity-mir/explicit-gcc-version]

239. By Thomas Voß on 2014-07-18

[ Kevin Gunn ]
* this is a fix for bug 1343639 (LP: #1343639)
[ Nick Dedekind ]
* Added mir prompt session support
[ Cemil Azizoglu ]
* Mir display server 0.5.0 release.
[ Robert Carr ]
* Mir display server 0.5.0 release.
[ Alexandros Frantzis ]
* Use surface relative coordinates when setting the input region for
  the input area Mir changed at some point to use surface relative
  coordinates for input regions. (LP: #1332624)
[ Gerry Boland ]
* Bump Mir dependencies to 0.4.0.
[ Cemil Azizoglu ]
* Bump Mir dependencies to 0.4.0.
[ Alberto Aguirre ]
* Bump Mir dependencies to 0.4.0.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:239
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/399/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/63
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/63
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/63/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/63

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/399/rebuild

review: Approve (continuous-integration)

[lp:~thomas-voss/unity-mir/explicit-gcc-version]

240. By Thomas Voß on 2014-07-18

Remove spurious changelog entry.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:240
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/401/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-amd64-ci/65
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/65
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-armhf-ci/65/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-utopic-i386-ci/65

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/401/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Y - I tried the silo, was ok
 * Did CI run pass? If not, please explain why.
fine

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-07-17 07:53:54 +0000
+++ debian/control	2014-07-18 12:05:33 +0000
@@ -5,6 +5,10 @@
 Build-Depends: debhelper (>= 9),
                cmake,
                google-mock (>= 1.6.0+svn437),
+# We rely on C++11 features, and to prevent from ABI breaks
+# in libstdc++ causing us issues, we explicitly select a G++
+# version.
+               g++-4.9,
                pkg-config,
                libboost-dev,
                libboost-system-dev,

=== modified file 'debian/rules'
--- debian/rules	2014-01-09 09:04:50 +0000
+++ debian/rules	2014-07-18 12:05:33 +0000
@@ -3,6 +3,15 @@
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
+include /usr/share/dpkg/default.mk
+
+# Explicitly selecting a G{CC,++}-version here to avoid accidental
+# ABI breaks introduced by toolchain updates.
+export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
+export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
+
 %:
 	dh $@ --parallel --fail-missing
 
+override_dh_auto_configure:
+	dh_auto_configure -- -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX)