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

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

Commit message

drop build-dependency on g++-4.9

Description of the change

drop build-dependency on g++-4.9

To post a comment you must log in.
Pete Woods (pete-woods) wrote :

Happrove!

review: Approve
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-08 19:22:49 +0000
3+++ debian/control 2015-07-15 18:46:39 +0000
4@@ -4,8 +4,6 @@
5 Maintainer: Charles Kerr <charles.kerr@canonical.com>
6 Build-Depends: cmake,
7 dbus,
8-# make g++ version explicit for ABI safety <https://wiki.ubuntu.com/cpp-11>
9- g++-4.9,
10 libglib2.0-dev (>= 2.36),
11 libproperties-cpp-dev,
12 # for coverage reports
13
14=== modified file 'debian/rules'
15--- debian/rules 2014-08-20 01:25:55 +0000
16+++ debian/rules 2015-07-15 18:46:39 +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 %:
26 dh $@ --with translations
27
28
29=== modified file 'src/exporter.cpp'
30--- src/exporter.cpp 2014-10-06 20:57:13 +0000
31+++ src/exporter.cpp 2015-07-15 18:46:39 +0000
32@@ -23,7 +23,7 @@
33 {
34 public:
35
36- Impl(const std::shared_ptr<Indicator>& indicator):
37+ explicit Impl(const std::shared_ptr<Indicator>& indicator):
38 m_indicator(indicator)
39 {
40 auto bus_name = g_strdup_printf("com.canonical.indicator.%s", indicator->name());

Subscribers

People subscribed via source and target branches