Merge lp:~thomas-voss/location-service/to-gcc-4.8 into lp:location-service/trunk

[Thomas Voß]

Patch version bump reflecting the toolchain switch.

Patch version bump reflecting the toolchain switch.

Are there any related MPs required for this MP to build/function as expected?
  * https://code.launchpad.net/~thomas-voss/dbus-cpp/to-gcc-4.8/+merge/218259

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes): Yes
Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?: Yes
Did you successfully run all tests found in your component's Test Plan: (https://wiki.ubuntu.com/Process/Merges/TestPlan/location-service) on device or emulator? Yes
If you changed the UI, was the change specified/approved by design? N/A
If you changed the packaging (debian), did you subscribe a core-dev to this MP? Yes

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:61
http://jenkins.qa.ubuntu.com/job/location-service-ci/93/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-amd64-ci/48/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-armhf-ci/47/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-trusty-i386-ci/47/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/93/rebuild

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/location-service/to-gcc-4.8]

62. By Thomas Voß on 2014-05-06

Version build deps on platform API hardware portions.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:62
http://jenkins.qa.ubuntu.com/job/location-service-ci/94/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-utopic-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-utopic-i386-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/94/rebuild

review: Needs Fixing (continuous-integration)

[Sergio Schvezov (sergiusens)]

18 +location-service (0.0.3) UNRELEASED; urgency=medium

this is missing the -0ubuntu1 part of the version (aka the packaging part of the version)

review: Needs Fixing

[Sergio Schvezov (sergiusens)]

You will also need to merge trunk back in

[Sergio Schvezov (sergiusens)]

we are using this MP instead https://code.launchpad.net/~ricmm/location-service/to-gcc-4.8/+merge/218576

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-10-14 06:11:15 +0000
+++ CMakeLists.txt	2014-05-06 14:39:31 +0000
@@ -4,7 +4,7 @@
 
 set(UBUNTU_LOCATION_SERVICE_VERSION_MAJOR 0)
 set(UBUNTU_LOCATION_SERVICE_VERSION_MINOR 0)
-set(UBUNTU_LOCATION_SERVICE_VERSION_PATCH 2)
+set(UBUNTU_LOCATION_SERVICE_VERSION_PATCH 3)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pedantic -Wextra -fPIC -pthread")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -fno-strict-aliasing -pedantic -Wextra -fPIC -pthread")

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-07 12:42:42 +0000
+++ debian/changelog	2014-05-06 14:39:31 +0000
@@ -1,7 +1,13 @@
+location-service (0.0.3) UNRELEASED; urgency=medium
+
+  * Patch version bump reflecting the toolchain switch.
+
+ -- Thomas Voß <[e-mail]>  Mon, 05 May 2014 11:13:33 +0200
+
 location-service (0.0.2+14.04.20140307-0ubuntu1) trusty; urgency=low
 
   [ thomas-voss ]
-  * Reenable onSessionDied().
+  * Re-enable onSessionDied().
 
   [ Łukasz 'sil2100' Zemczak ]
   * Bump the build-dependency on dbus-cpp due to the ABI change

=== modified file 'debian/control'
--- debian/control	2014-02-25 17:24:21 +0000
+++ debian/control	2014-05-06 14:39:31 +0000
@@ -1,5 +1,3 @@
-# Using g{cc,++} 4.7 as the platform-api consumes it and the platform
-# api is stuck with android's 4.7 toolchain.
 Source: location-service
 Section: utils
 Priority: optional
@@ -7,12 +5,10 @@
 XSBC-Original-Maintainer: Thomas Voß <[e-mail]>
 Build-Depends: cmake,
                curl,
-               libdbus-cpp-dev (>= 2.0.0),
+               libdbus-cpp-dev (>= 3.0.0),
                dbus-test-runner,
                debhelper (>= 9),
                doxygen,
-               gcc-4.7,
-               g++-4.7,
                geoclue-ubuntu-geoip,
                google-mock (>= 1.6.0+svn437),
                graphviz,
@@ -22,8 +18,8 @@
                libgoogle-glog-dev,
                libgtest-dev,
                libiw-dev,
-               libplatform-hardware-api-headers,
-               libplatform-hardware-api1-dev,
+               libplatform-hardware-api-headers (>=0.21),
+               libplatform-hardware-api1-dev (>=0.21),
                libproperties-cpp-dev,
 Standards-Version: 3.9.4
 Homepage: http://launchpad.net/location-service

=== modified file 'debian/rules'
--- debian/rules	2014-02-05 13:25:11 +0000
+++ debian/rules	2014-05-06 14:39:31 +0000
@@ -11,9 +11,6 @@
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-export CC=gcc-4.7
-export CXX=g++-4.7
-
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
 %: