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
=== modified file 'debian/control'
--- debian/control 2014-09-08 19:22:49 +0000
+++ debian/control 2015-07-15 18:46:39 +0000
@@ -4,8 +4,6 @@
4Maintainer: Charles Kerr <charles.kerr@canonical.com>4Maintainer: Charles Kerr <charles.kerr@canonical.com>
5Build-Depends: cmake,5Build-Depends: cmake,
6 dbus,6 dbus,
7# make g++ version explicit for ABI safety <https://wiki.ubuntu.com/cpp-11>
8 g++-4.9,
9 libglib2.0-dev (>= 2.36),7 libglib2.0-dev (>= 2.36),
10 libproperties-cpp-dev,8 libproperties-cpp-dev,
11# for coverage reports9# for coverage reports
1210
=== modified file 'debian/rules'
--- debian/rules 2014-08-20 01:25:55 +0000
+++ debian/rules 2015-07-15 18:46:39 +0000
@@ -1,10 +1,5 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
22
3# Explicitly selecting a G{CC,++}-version here to avoid ABI breaks
4# introduced by toolchain updates. <https://wiki.ubuntu.com/cpp-11>
5export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
6export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
7
8%:3%:
9 dh $@ --with translations4 dh $@ --with translations
105
116
=== modified file 'src/exporter.cpp'
--- src/exporter.cpp 2014-10-06 20:57:13 +0000
+++ src/exporter.cpp 2015-07-15 18:46:39 +0000
@@ -23,7 +23,7 @@
23{23{
24public:24public:
2525
26 Impl(const std::shared_ptr<Indicator>& indicator):26 explicit Impl(const std::shared_ptr<Indicator>& indicator):
27 m_indicator(indicator)27 m_indicator(indicator)
28 {28 {
29 auto bus_name = g_strdup_printf("com.canonical.indicator.%s", indicator->name());29 auto bus_name = g_strdup_printf("com.canonical.indicator.%s", indicator->name());

Subscribers

People subscribed via source and target branches