Transfer Indicator

Merge lp:~charlesk/indicator-transfer/lp-1452328-drop-g++-4.9-build-dep into lp:indicator-transfer/15.10

  1. lp-1452328-drop-g++-4.9-build-dep
  2. Merge into trunk.15.10
Proposed by Charles Kerr
Status: Merged
Approved by: dobey
Approved revision: 31
Merged at revision: 30
Proposed branch: lp:~charlesk/indicator-transfer/lp-1452328-drop-g++-4.9-build-dep
Merge into: lp:indicator-transfer/15.10
Diff against target: 40 lines (+1/-8)
3 files modified
debian/control (+0/-2)
debian/rules (+0/-5)
src/world-dbus.cpp (+1/-1)
To merge this branch: bzr merge lp:~charlesk/indicator-transfer/lp-1452328-drop-g++-4.9-build-dep
Reviewer Review Type Date Requested Status
dobey (community) Approve
Pete Woods (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+264857@code.launchpad.net

Commit message

Remove the g++-4.9 explicit dependency to prepare for gcc5 migration.

Description of the change

Remove the g++-4.9 explicit dependency to prepare for gcc5 migration.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:30
http://jenkins.qa.ubuntu.com/job/indicator-transfer-ci/19/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-armhf-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-transfer-ci/19/rebuild

review: Needs Fixing (continuous-integration)
lp:~charlesk/indicator-transfer/lp-1452328-drop-g++-4.9-build-dep updated
31. By Charles Kerr

fix 'make cppcheck'

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:31
http://jenkins.qa.ubuntu.com/job/indicator-transfer-ci/20/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/indicator-transfer-wily-armhf-ci/2/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-transfer-ci/20/rebuild

review: Approve (continuous-integration)
Revision history for this message
Pete Woods (pete-woods) wrote :

Happrove!

review: Approve
Revision history for this message
dobey (dobey) :
review: Approve

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 2014-09-05 09:42:18 +0000
3+++ debian/control 2015-07-15 18:19:11 +0000
4@@ -4,8 +4,6 @@
5 Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
6 Build-Depends: cmake,
7 dbus,
8-# make g++ version explicit for ABI safety, see https://wiki.ubuntu.com/cpp-11
9- g++-4.9,
10 libglib2.0-dev (>= 2.35.4),
11 libproperties-cpp-dev,
12 libclick-0.4-dev (>= 0.4.30),
13
14=== modified file 'debian/rules'
15--- debian/rules 2014-06-25 15:34:10 +0000
16+++ debian/rules 2015-07-15 18:19:11 +0000
17@@ -1,10 +1,5 @@
18 #!/usr/bin/make -f
19
20-# Explicitly selecting a G{CC,++}-version here to avoid ABI breaks
21-# introduced by toolchain updates. <https://wiki.ubuntu.com/cpp-11>
22-export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
23-export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
24-
25 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
26
27 %:
28
29=== modified file 'src/world-dbus.cpp'
30--- src/world-dbus.cpp 2014-10-22 18:47:09 +0000
31+++ src/world-dbus.cpp 2015-07-15 18:19:11 +0000
32@@ -626,7 +626,7 @@
33 {
34 public:
35
36- Impl(const std::shared_ptr<MutableModel>& model):
37+ explicit Impl(const std::shared_ptr<MutableModel>& model):
38 m_cancellable(g_cancellable_new()),
39 m_model(model)
40 {

Subscribers

People subscribed via source and target branches