Indicator Location

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

  1. lp-1452324-drop-g++-4.9-build-dep
  2. Merge into trunk.15.10
Proposed by Charles Kerr
Status: Merged
Approved by: dobey
Approved revision: 148
Merged at revision: 147
Proposed branch: lp:~charlesk/indicator-location/lp-1452324-drop-g++-4.9-build-dep
Merge into: lp:indicator-location/15.10
Diff against target: 37 lines (+1/-8)
3 files modified
debian/control (+0/-2)
debian/rules (+0/-5)
src/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~charlesk/indicator-location/lp-1452324-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+264903@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.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:148
http://jenkins.qa.ubuntu.com/job/indicator-location-ci/66/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-wily-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-location-wily-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/indicator-location-wily-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-location-ci/66/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 2015-04-15 21:37:31 +0000
3+++ debian/control 2015-07-15 18:56:52 +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 debhelper (>= 9),
11 dh-translations,
12 intltool (>= 0.35.0),
13
14=== modified file 'debian/rules'
15--- debian/rules 2014-06-25 15:43:18 +0000
16+++ debian/rules 2015-07-15 18:56:52 +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 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
26
27 %:
28
29=== modified file 'src/CMakeLists.txt'
30--- src/CMakeLists.txt 2015-04-16 01:54:48 +0000
31+++ src/CMakeLists.txt 2015-07-15 18:56:52 +0000
32@@ -37,5 +37,5 @@
33 set_property (SOURCE main.cc
34 APPEND PROPERTY COMPILE_DEFINITIONS
35 GETTEXT_PACKAGE="${GETTEXT_PACKAGE}"
36- GNOMELOCALEDIR="@CMAKE_INSTALL_FULL_LOCALEDIR@")
37+ GNOMELOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
38

Subscribers

People subscribed via source and target branches