Merge lp:~thomas-voss/qtubuntu-sensors/explicit-gcc-version into lp:qtubuntu-sensors

[Thomas Voß]

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

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:69
http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-ci/55/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-utopic-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-utopic-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-utopic-armhf-ci/17/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-utopic-i386-ci/17

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-sensors-ci/55/rebuild

review: Approve (continuous-integration)

[Colin Watson (cjwatson)]

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

review: Approve

Unmerged revisions

69. By Thomas Voß on 2014-06-27

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

68. By Thomas Voß on 2014-06-27

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

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-24 23:20:39 +0000
+++ debian/changelog	2014-06-27 08:42:05 +0000
@@ -1,3 +1,9 @@
+qtubuntu-sensors (0.6+14.10.20140624.3-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Explicitly select g++-4.9 to prevent from ABI breaks.
+
+ -- Thomas Voß <[e-mail]>  Fri, 27 Jun 2014 10:40:48 +0200
+
 qtubuntu-sensors (0.6+14.10.20140624.3-0ubuntu1) utopic; urgency=low
 
   [ Ricardo Mendoza ]

=== modified file 'debian/control'
--- debian/control	2014-06-20 12:29:17 +0000
+++ debian/control	2014-06-27 08:42:05 +0000
@@ -4,6 +4,10 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: debhelper (>= 9),
                cmake,
+# 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,
                libgtest-dev,
                libubuntu-application-api-dev (>= 2.1.0),
                libprocess-cpp-dev (>= 0.0.1+14.04.20131212),

=== modified file 'debian/rules'
--- debian/rules	2014-06-23 13:43:58 +0000
+++ debian/rules	2014-06-27 08:42:05 +0000
@@ -7,9 +7,19 @@
 export DH_OPTIONS
 export QT_QPA_PLATFORM = minimal
 
+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
 
+override_dh_auto_configure:
+	dh_auto_configure -- -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX)
+
 override_dh_install:
 	dh_install --fail-missing