qtubuntu-media

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

  1. fix-1452340
  2. Merge into trunk
Proposed by Jim Hodapp on 2015-06-02
Status: Merged
Approved by: Steve Langasek on 2015-06-02
Approved revision: 79
Merged at revision: 78
Proposed branch: lp:~phablet-team/qtubuntu-media/fix-1452340
Merge into: lp:qtubuntu-media
Diff against target: 26 lines (+0/-6)
2 files modified
debian/control (+0/-1)
debian/rules (+0/-5)
To merge this branch: bzr merge lp:~phablet-team/qtubuntu-media/fix-1452340
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-06-02
Steve Langasek 2015-06-02 Approve on 2015-06-02
Review via email: mp+260850@code.launchpad.net

Commit Message

Get rid of the gcc-4.9 build dependency.

Description of the Change

Get rid of the gcc-4.9 build dependency.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Steve Langasek (vorlon) wrote :

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) wrote :

> 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 updated on 2015-06-02
79. By Jim Hodapp on 2015-06-02

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

Steve Langasek (vorlon) wrote :

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) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2015-04-10 16:19:34 +0000
3+++ debian/control 2015-06-02 16:55:15 +0000
4@@ -6,7 +6,6 @@
5 # We rely on C++11 features, and to prevent from ABI breaks
6 # in libstdc++ causing us issues, we explicitly select a G++
7 # version.
8- g++-4.9,
9 libgl1-mesa-dev | libgl-dev,
10 libgles2-mesa-dev,
11 libhybris-dev (>= 0.1.0+git20131207+e452e83-0ubuntu13),
12
13=== modified file 'debian/rules'
14--- debian/rules 2015-02-24 16:44:06 +0000
15+++ debian/rules 2015-06-02 16:55:15 +0000
16@@ -6,11 +6,6 @@
17 export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
18 export QT_QPA_PLATFORM = minimal
19
20-# Explicitly selecting a G{CC,++}-version here to avoid accidental
21-# ABI breaks introduced by toolchain updates.
22-export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
23-export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
24-
25 %:
26 dh $@ --parallel --buildsystem=qmake
27

Subscribers

People subscribed via source and target branches

to all changes: