location-service

Merge lp:~thomas-voss/location-service/fix-1478750 into lp:location-service/trunk

  1. fix-1478750
  2. Merge into trunk
Proposed by Thomas Voß
Status: Approved
Approved by: Alberto Mardegan
Approved revision: 211
Proposed branch: lp:~thomas-voss/location-service/fix-1478750
Merge into: lp:location-service/trunk
Diff against target: 144 lines (+25/-11)
5 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+13/-0)
debian/control (+6/-5)
debian/libubuntu-location-service-dev.install (+1/-1)
tests/position_test.cpp (+4/-4)
To merge this branch: bzr merge lp:~thomas-voss/location-service/fix-1478750
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+266360@code.launchpad.net

Commit message

Fix LP:#1478750

Description of the change

Fix LP:#1478750

To post a comment you must log in.
lp:~thomas-voss/location-service/fix-1478750 updated
210. By Thomas Voß

Bump major revision and fix LP:#1478750 to account for toolchain update.

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

PASSED: Continuous integration, rev:209
http://jenkins.qa.ubuntu.com/job/location-service-ci/400/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/72
        deb: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/72/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/72

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

review: Approve (continuous-integration)
Reply
lp:~thomas-voss/location-service/fix-1478750 updated
211. By Thomas Voß

libubuntu-location-service3: Replaces libubuntu-location-service2,
config file /etc/gps.conf in both packages.

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

PASSED: Continuous integration, rev:210
http://jenkins.qa.ubuntu.com/job/location-service-ci/401/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/73
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/73
        deb: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/73/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/73

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

review: Approve (continuous-integration)
Reply
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:211
http://jenkins.qa.ubuntu.com/job/location-service-ci/402/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/74
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/74
        deb: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/74/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/74

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

review: Approve (continuous-integration)
Reply
Revision history for this message
Alberto Mardegan (mardy) wrote :

Just a small inline comment about the tests, but feel free to keep the code as it is now if you prefer so.

review: Approve
Reply
Revision history for this message
Thomas Voß (thomas-voss) :
Reply

Unmerged revisions

211. By Thomas Voß

libubuntu-location-service3: Replaces libubuntu-location-service2,
config file /etc/gps.conf in both packages.

210. By Thomas Voß

Bump major revision and fix LP:#1478750 to account for toolchain update.

209. By Thomas Voß

Fix LP:#1478750

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2014-09-18 23:06:08 +0000
+++ CMakeLists.txt 2015-07-30 08:17:25 +0000
@@ -2,7 +2,7 @@
22
3project(ubuntu-location-service)3project(ubuntu-location-service)
44
5set(UBUNTU_LOCATION_SERVICE_VERSION_MAJOR 2)5set(UBUNTU_LOCATION_SERVICE_VERSION_MAJOR 3)
6set(UBUNTU_LOCATION_SERVICE_VERSION_MINOR 0)6set(UBUNTU_LOCATION_SERVICE_VERSION_MINOR 0)
7set(UBUNTU_LOCATION_SERVICE_VERSION_PATCH 0)7set(UBUNTU_LOCATION_SERVICE_VERSION_PATCH 0)
88
99
=== modified file 'debian/changelog'
--- debian/changelog 2015-07-27 18:07:37 +0000
+++ debian/changelog 2015-07-30 08:17:25 +0000
@@ -1,3 +1,16 @@
1location-service (3.0.0-0ubuntu2) wily; urgency=medium
2
3 * libubuntu-location-service3: Replaces libubuntu-location-service2,
4 config file /etc/gps.conf in both packages.
5
6 -- Matthias Klose <doko@ubuntu.com> Thu, 30 Jul 2015 09:57:50 +0200
7
8location-service (3.0.0) wily; urgency=medium
9
10 * Bump major revision and fix LP:#1478750 to account for toolchain update.
11
12 -- Thomas Voß <thomas.voss@canonical.com> Thu, 30 Jul 2015 08:33:13 +0200
13
1location-service (2.1+15.10.20150727-0ubuntu1) wily; urgency=medium14location-service (2.1+15.10.20150727-0ubuntu1) wily; urgency=medium
215
3 [ CI Train Bot ]16 [ CI Train Bot ]
417
=== modified file 'debian/control'
--- debian/control 2015-07-15 19:04:43 +0000
+++ debian/control 2015-07-30 08:17:25 +0000
@@ -35,13 +35,14 @@
35Vcs-Bzr: https://code.launchpad.net/~phablet-team/location-service/trunk35Vcs-Bzr: https://code.launchpad.net/~phablet-team/location-service/trunk
36Vcs-Browser: http://bazaar.launchpad.net/~phablet-team/location-service/trunk/files36Vcs-Browser: http://bazaar.launchpad.net/~phablet-team/location-service/trunk/files
3737
38Package: libubuntu-location-service238Package: libubuntu-location-service3
39Section: libs39Section: libs
40Architecture: any40Architecture: any
41Multi-Arch: same41Multi-Arch: same
42Pre-Depends: ${misc:Pre-Depends}42Pre-Depends: ${misc:Pre-Depends}
43Depends: ${misc:Depends},43Depends: ${misc:Depends},
44 ${shlibs:Depends},44 ${shlibs:Depends},
45Replaces: libubuntu-location-service2
45Description: location service aggregating position/velocity/heading46Description: location service aggregating position/velocity/heading
46 updates and exporting them over dbus.47 updates and exporting them over dbus.
47 .48 .
@@ -52,7 +53,7 @@
52Architecture: any53Architecture: any
53Multi-Arch: foreign54Multi-Arch: foreign
54Recommends: ubuntu-location-service-doc,55Recommends: ubuntu-location-service-doc,
55Depends: libubuntu-location-service2 (= ${binary:Version}),56Depends: libubuntu-location-service3 (= ${binary:Version}),
56 libdbus-1-dev,57 libdbus-1-dev,
57 libdbus-cpp-dev,58 libdbus-cpp-dev,
58 libboost-dev,59 libboost-dev,
@@ -68,7 +69,7 @@
68Section: debug69Section: debug
69Architecture: any70Architecture: any
70Multi-Arch: foreign71Multi-Arch: foreign
71Depends: libubuntu-location-service2 (= ${binary:Version}),72Depends: libubuntu-location-service3 (= ${binary:Version}),
72 ${misc:Depends},73 ${misc:Depends},
73Description: location service aggregating position/velocity/heading74Description: location service aggregating position/velocity/heading
74 updates and exporting them over dbus.75 updates and exporting them over dbus.
@@ -86,7 +87,7 @@
8687
87Package: ubuntu-location-service-bin88Package: ubuntu-location-service-bin
88Architecture: any89Architecture: any
89Depends: libubuntu-location-service2 (= ${binary:Version}),90Depends: libubuntu-location-service3 (= ${binary:Version}),
90 ${misc:Depends},91 ${misc:Depends},
91 ${shlibs:Depends},92 ${shlibs:Depends},
92 trust-store-bin,93 trust-store-bin,
@@ -100,7 +101,7 @@
100Package: ubuntu-location-service-examples101Package: ubuntu-location-service-examples
101Architecture: any102Architecture: any
102Multi-Arch: same103Multi-Arch: same
103Depends: libubuntu-location-service2 (= ${binary:Version}),104Depends: libubuntu-location-service3 (= ${binary:Version}),
104 ${misc:Depends},105 ${misc:Depends},
105 ${shlibs:Depends},106 ${shlibs:Depends},
106 ubuntu-location-service-doc,107 ubuntu-location-service-doc,
107108
=== modified file 'debian/libubuntu-location-service-dev.install'
--- debian/libubuntu-location-service-dev.install 2014-07-18 14:42:10 +0000
+++ debian/libubuntu-location-service-dev.install 2015-07-30 08:17:25 +0000
@@ -1,4 +1,4 @@
1usr/include/ubuntu-location-service-21usr/include/ubuntu-location-service-3
2usr/lib/*/libubuntu-location-service.so2usr/lib/*/libubuntu-location-service.so
3usr/lib/*/libubuntu-location-service-connectivity.so3usr/lib/*/libubuntu-location-service-connectivity.so
4usr/lib/*/pkgconfig/ubuntu-location-service.pc4usr/lib/*/pkgconfig/ubuntu-location-service.pc
55
=== removed symlink 'debian/libubuntu-location-service2.install.amd64'
=== target was u'libubuntu-location-service2.install.with-gps'
=== removed symlink 'debian/libubuntu-location-service2.install.armhf'
=== target was u'libubuntu-location-service2.install.with-gps'
=== removed symlink 'debian/libubuntu-location-service2.install.i386'
=== target was u'libubuntu-location-service2.install.with-gps'
=== renamed file 'debian/libubuntu-location-service2.install' => 'debian/libubuntu-location-service3.install'
=== added symlink 'debian/libubuntu-location-service3.install.amd64'
=== target is u'libubuntu-location-service3.install.with-gps'
=== added symlink 'debian/libubuntu-location-service3.install.armhf'
=== target is u'libubuntu-location-service3.install.with-gps'
=== added symlink 'debian/libubuntu-location-service3.install.i386'
=== target is u'libubuntu-location-service3.install.with-gps'
=== renamed file 'debian/libubuntu-location-service2.install.with-gps' => 'debian/libubuntu-location-service3.install.with-gps'
=== modified file 'tests/position_test.cpp'
--- tests/position_test.cpp 2014-06-20 07:40:34 +0000
+++ tests/position_test.cpp 2015-07-30 08:17:25 +0000
@@ -24,14 +24,14 @@
24TEST(Position, AllFieldsAreInvalidForDefaultConstructor)24TEST(Position, AllFieldsAreInvalidForDefaultConstructor)
25{25{
26 cul::Position p;26 cul::Position p;
27 EXPECT_FALSE(p.altitude);27 EXPECT_FALSE(static_cast<bool>(p.altitude));
28 EXPECT_FALSE(p.accuracy.vertical);28 EXPECT_FALSE(static_cast<bool>(p.accuracy.vertical));
29}29}
3030
31TEST(Position, InitWithLatLonGivesValidFieldsForLatLon)31TEST(Position, InitWithLatLonGivesValidFieldsForLatLon)
32{32{
33 cul::Position p{cul::wgs84::Latitude{}, cul::wgs84::Longitude{}};33 cul::Position p{cul::wgs84::Latitude{}, cul::wgs84::Longitude{}};
34 EXPECT_FALSE(p.altitude);34 EXPECT_FALSE(static_cast<bool>(p.altitude));
35}35}
3636
37TEST(Position, InitWithLatLonAltGivesValidFieldsForLatLonAlt)37TEST(Position, InitWithLatLonAltGivesValidFieldsForLatLonAlt)
@@ -40,7 +40,7 @@
40 cul::wgs84::Latitude{},40 cul::wgs84::Latitude{},
41 cul::wgs84::Longitude{},41 cul::wgs84::Longitude{},
42 cul::wgs84::Altitude{}};42 cul::wgs84::Altitude{}};
43 EXPECT_TRUE(p.altitude);43 EXPECT_TRUE(static_cast<bool>(p.altitude));
44}44}
4545
46#include <com/ubuntu/location/codec.h>46#include <com/ubuntu/location/codec.h>

Subscribers

People subscribed via source and target branches