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

Proposed by Thomas Voß on 2015-07-30
Status: Approved
Approved by: Alberto Mardegan on 2015-11-11
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) 2015-07-30 Approve on 2015-10-17
PS Jenkins bot continuous-integration Approve on 2015-07-30
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.
210. By Thomas Voß on 2015-07-30

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

211. By Thomas Voß on 2015-07-30

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

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

Unmerged revisions

211. By Thomas Voß on 2015-07-30

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

210. By Thomas Voß on 2015-07-30

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

209. By Thomas Voß on 2015-07-30

Fix LP:#1478750

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-09-18 23:06:08 +0000
3+++ CMakeLists.txt 2015-07-30 08:17:25 +0000
4@@ -2,7 +2,7 @@
5
6 project(ubuntu-location-service)
7
8-set(UBUNTU_LOCATION_SERVICE_VERSION_MAJOR 2)
9+set(UBUNTU_LOCATION_SERVICE_VERSION_MAJOR 3)
10 set(UBUNTU_LOCATION_SERVICE_VERSION_MINOR 0)
11 set(UBUNTU_LOCATION_SERVICE_VERSION_PATCH 0)
12
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2015-07-27 18:07:37 +0000
16+++ debian/changelog 2015-07-30 08:17:25 +0000
17@@ -1,3 +1,16 @@
18+location-service (3.0.0-0ubuntu2) wily; urgency=medium
19+
20+ * libubuntu-location-service3: Replaces libubuntu-location-service2,
21+ config file /etc/gps.conf in both packages.
22+
23+ -- Matthias Klose <doko@ubuntu.com> Thu, 30 Jul 2015 09:57:50 +0200
24+
25+location-service (3.0.0) wily; urgency=medium
26+
27+ * Bump major revision and fix LP:#1478750 to account for toolchain update.
28+
29+ -- Thomas Voß <thomas.voss@canonical.com> Thu, 30 Jul 2015 08:33:13 +0200
30+
31 location-service (2.1+15.10.20150727-0ubuntu1) wily; urgency=medium
32
33 [ CI Train Bot ]
34
35=== modified file 'debian/control'
36--- debian/control 2015-07-15 19:04:43 +0000
37+++ debian/control 2015-07-30 08:17:25 +0000
38@@ -35,13 +35,14 @@
39 Vcs-Bzr: https://code.launchpad.net/~phablet-team/location-service/trunk
40 Vcs-Browser: http://bazaar.launchpad.net/~phablet-team/location-service/trunk/files
41
42-Package: libubuntu-location-service2
43+Package: libubuntu-location-service3
44 Section: libs
45 Architecture: any
46 Multi-Arch: same
47 Pre-Depends: ${misc:Pre-Depends}
48 Depends: ${misc:Depends},
49 ${shlibs:Depends},
50+Replaces: libubuntu-location-service2
51 Description: location service aggregating position/velocity/heading
52 updates and exporting them over dbus.
53 .
54@@ -52,7 +53,7 @@
55 Architecture: any
56 Multi-Arch: foreign
57 Recommends: ubuntu-location-service-doc,
58-Depends: libubuntu-location-service2 (= ${binary:Version}),
59+Depends: libubuntu-location-service3 (= ${binary:Version}),
60 libdbus-1-dev,
61 libdbus-cpp-dev,
62 libboost-dev,
63@@ -68,7 +69,7 @@
64 Section: debug
65 Architecture: any
66 Multi-Arch: foreign
67-Depends: libubuntu-location-service2 (= ${binary:Version}),
68+Depends: libubuntu-location-service3 (= ${binary:Version}),
69 ${misc:Depends},
70 Description: location service aggregating position/velocity/heading
71 updates and exporting them over dbus.
72@@ -86,7 +87,7 @@
73
74 Package: ubuntu-location-service-bin
75 Architecture: any
76-Depends: libubuntu-location-service2 (= ${binary:Version}),
77+Depends: libubuntu-location-service3 (= ${binary:Version}),
78 ${misc:Depends},
79 ${shlibs:Depends},
80 trust-store-bin,
81@@ -100,7 +101,7 @@
82 Package: ubuntu-location-service-examples
83 Architecture: any
84 Multi-Arch: same
85-Depends: libubuntu-location-service2 (= ${binary:Version}),
86+Depends: libubuntu-location-service3 (= ${binary:Version}),
87 ${misc:Depends},
88 ${shlibs:Depends},
89 ubuntu-location-service-doc,
90
91=== modified file 'debian/libubuntu-location-service-dev.install'
92--- debian/libubuntu-location-service-dev.install 2014-07-18 14:42:10 +0000
93+++ debian/libubuntu-location-service-dev.install 2015-07-30 08:17:25 +0000
94@@ -1,4 +1,4 @@
95-usr/include/ubuntu-location-service-2
96+usr/include/ubuntu-location-service-3
97 usr/lib/*/libubuntu-location-service.so
98 usr/lib/*/libubuntu-location-service-connectivity.so
99 usr/lib/*/pkgconfig/ubuntu-location-service.pc
100
101=== removed symlink 'debian/libubuntu-location-service2.install.amd64'
102=== target was u'libubuntu-location-service2.install.with-gps'
103=== removed symlink 'debian/libubuntu-location-service2.install.armhf'
104=== target was u'libubuntu-location-service2.install.with-gps'
105=== removed symlink 'debian/libubuntu-location-service2.install.i386'
106=== target was u'libubuntu-location-service2.install.with-gps'
107=== renamed file 'debian/libubuntu-location-service2.install' => 'debian/libubuntu-location-service3.install'
108=== added symlink 'debian/libubuntu-location-service3.install.amd64'
109=== target is u'libubuntu-location-service3.install.with-gps'
110=== added symlink 'debian/libubuntu-location-service3.install.armhf'
111=== target is u'libubuntu-location-service3.install.with-gps'
112=== added symlink 'debian/libubuntu-location-service3.install.i386'
113=== target is u'libubuntu-location-service3.install.with-gps'
114=== renamed file 'debian/libubuntu-location-service2.install.with-gps' => 'debian/libubuntu-location-service3.install.with-gps'
115=== modified file 'tests/position_test.cpp'
116--- tests/position_test.cpp 2014-06-20 07:40:34 +0000
117+++ tests/position_test.cpp 2015-07-30 08:17:25 +0000
118@@ -24,14 +24,14 @@
119 TEST(Position, AllFieldsAreInvalidForDefaultConstructor)
120 {
121 cul::Position p;
122- EXPECT_FALSE(p.altitude);
123- EXPECT_FALSE(p.accuracy.vertical);
124+ EXPECT_FALSE(static_cast<bool>(p.altitude));
125+ EXPECT_FALSE(static_cast<bool>(p.accuracy.vertical));
126 }
127
128 TEST(Position, InitWithLatLonGivesValidFieldsForLatLon)
129 {
130 cul::Position p{cul::wgs84::Latitude{}, cul::wgs84::Longitude{}};
131- EXPECT_FALSE(p.altitude);
132+ EXPECT_FALSE(static_cast<bool>(p.altitude));
133 }
134
135 TEST(Position, InitWithLatLonAltGivesValidFieldsForLatLonAlt)
136@@ -40,7 +40,7 @@
137 cul::wgs84::Latitude{},
138 cul::wgs84::Longitude{},
139 cul::wgs84::Altitude{}};
140- EXPECT_TRUE(p.altitude);
141+ EXPECT_TRUE(static_cast<bool>(p.altitude));
142 }
143
144 #include <com/ubuntu/location/codec.h>

Subscribers

People subscribed via source and target branches