Merge lp:~phablet-team/qtubuntu-media/fix-1452340 into lp:qtubuntu-media

[Jim Hodapp]

Get rid of the gcc-4.9 build dependency.

Get rid of the gcc-4.9 build dependency.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:78
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-ci/119/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-amd64-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-armhf-ci/44
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-armhf-ci/44/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-i386-ci/44

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

review: Approve (continuous-integration)

[Steve Langasek (vorlon)]

A corresponding change is required in debian/rules, which hard-codes the invocation of g++-4.9 / gcc-4.9.

review: Needs Fixing

[Jim Hodapp (jhodapp)]

> A corresponding change is required in debian/rules, which hard-codes the
> invocation of g++-4.9 / gcc-4.9.

Thanks, missed that one. Will push an update in a minute.

[lp:~phablet-team/qtubuntu-media/fix-1452340]

79. By Jim Hodapp on 2015-06-02

No longer explicitly rely on gcc-4.9 in debian/rules.

[Steve Langasek (vorlon)]

Looks good now.

Please reference this review as Ubuntu core-dev sign-off of the packaging changes for the landing.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:79
http://jenkins.qa.ubuntu.com/job/qtubuntu-media-ci/120/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-amd64-ci/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-armhf-ci/45
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-armhf-ci/45/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-media-vivid-i386-ci/45

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

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2015-04-10 16:19:34 +0000
+++ debian/control	2015-06-02 16:55:15 +0000
@@ -6,7 +6,6 @@
 # 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,
                libgl1-mesa-dev | libgl-dev,
                libgles2-mesa-dev,
                libhybris-dev (>= 0.1.0+git20131207+e452e83-0ubuntu13),

=== modified file 'debian/rules'
--- debian/rules	2015-02-24 16:44:06 +0000
+++ debian/rules	2015-06-02 16:55:15 +0000
@@ -6,11 +6,6 @@
 export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 export QT_QPA_PLATFORM = minimal
 
-# 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 --buildsystem=qmake