location-service

Merge lp:~sil2100/location-service/fix_ftbfs_and_others into lp:location-service/trunk

  1. fix_ftbfs_and_others
  2. Merge into trunk
Proposed by Łukasz Zemczak
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 13
Merged at revision: 10
Proposed branch: lp:~sil2100/location-service/fix_ftbfs_and_others
Merge into: lp:location-service/trunk
Diff against target: 145 lines (+28/-11)
9 files modified
CMakeLists.txt (+7/-0)
debian/control (+9/-5)
debian/libubuntu-location-service-dev.install (+1/-1)
debian/libubuntu-location-service0.install (+1/-1)
debian/rules (+5/-0)
debian/ubuntu-location-service-examples.install (+2/-2)
examples/service/CMakeLists.txt (+1/-1)
examples/service/program_options.h (+1/-0)
src/location_service/com/ubuntu/location/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~sil2100/location-service/fix_ftbfs_and_others
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Didier Roche-Tolomelli Approve
Review via email: mp+169215@code.launchpad.net

Commit message

Fix the FTBFS due to the new saucy toolchain. Add multi-arch support, fix the binary paths (libexec). Fix some lintian issues

Description of the change

Fix the FTBFS due to the new saucy toolchain. Add multi-arch support, fix the binary paths (libexec). Fix some lintian issues

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Looking good, please top approve after grabbing that branch to fix a lintian error: lp:~didrocks/location-service/fix_weak_dep.

Then, there is just a binNMU issue that we don't support in ubuntu :)

review: Approve
lp:~sil2100/location-service/fix_ftbfs_and_others updated
13. By Łukasz Zemczak

Fix dep

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

PASSED: Continuous integration, rev:12
http://jenkins.qa.ubuntu.com/job/location-service-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-saucy-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-saucy-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/location-service-saucy-armhf-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-saucy-i386-ci/6

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

review: Approve (continuous-integration)

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 2013-05-30 07:13:57 +0000
3+++ CMakeLists.txt 2013-06-13 14:58:31 +0000
4@@ -17,6 +17,8 @@
5 include(cmake/PrePush.cmake)
6 include(CTest)
7
8+include(GNUInstallDirs)
9+
10 find_package(PkgConfig)
11 find_package(Boost 1.49 COMPONENTS system program_options)
12 find_package(GLog)
13@@ -38,6 +40,11 @@
14 SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -ftest-coverage -fprofile-arcs" )
15 ENDIF(CMAKE_BUILD_TYPE MATCHES [cC][oO][vV][eE][rR][aA][gG][eE])
16
17+option (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS "Disable errors when local typedefs are unused" ON)
18+if (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS)
19+ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-local-typedefs")
20+endif (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS)
21+
22 include_directories(
23 ${Boost_INCLUDE_DIRS}
24 ${DBUS_INCLUDE_DIRS}
25
26=== modified file 'debian/control'
27--- debian/control 2013-06-11 06:27:55 +0000
28+++ debian/control 2013-06-13 14:58:31 +0000
29@@ -30,28 +30,32 @@
30 Package: libubuntu-location-service0
31 Section: libs
32 Architecture: any
33+Multi-Arch: same
34 Depends: ${misc:Depends},
35 ${shlibs:Depends},
36-Description: A location service aggregating position/velocity/heading
37+Description: location service aggregating position/velocity/heading
38 updates and exporting them over dbus.
39 .
40 Contains the shared library needed by client applications.
41
42 Package: libubuntu-location-service-dev
43 Section: libdevel
44-Architecture: any
45+Architecture: all
46+Multi-Arch: foreign
47 Depends: libubuntu-location-service0 (= ${binary:Version}),
48 ${misc:Depends},
49-Description: A location service aggregating position/velocity/heading
50+Description: location service aggregating position/velocity/heading
51 updates and exporting them over dbus.
52 .
53- Contains header files required to develop clients talking to the ubuntu location service.
54+ Contains header files required to develop clients talking to the ubuntu
55+ location service.
56
57 Package: ubuntu-location-service-examples
58 Architecture: any
59+Multi-Arch: same
60 Depends: ${misc:Depends},
61 ${shlibs:Depends},
62-Description: A location service aggregating position/velocity/heading
63+Description: location service aggregating position/velocity/heading
64 updates and exporting them over dbus.
65 .
66 Contains example service and client.
67
68=== modified file 'debian/libubuntu-location-service-dev.install'
69--- debian/libubuntu-location-service-dev.install 2013-06-04 16:02:32 +0000
70+++ debian/libubuntu-location-service-dev.install 2013-06-13 14:58:31 +0000
71@@ -1,3 +1,3 @@
72 usr/include/ubuntu-location-service-0
73-usr/lib/libubuntu-location-service.so
74+usr/lib/*/libubuntu-location-service.so
75 usr/lib/pkgconfig/ubuntu-location-service.pc
76
77=== modified file 'debian/libubuntu-location-service0.install'
78--- debian/libubuntu-location-service0.install 2013-06-04 16:02:32 +0000
79+++ debian/libubuntu-location-service0.install 2013-06-13 14:58:31 +0000
80@@ -1,1 +1,1 @@
81-usr/lib/libubuntu-location-service.so.*
82+usr/lib/*/libubuntu-location-service.so.*
83
84=== modified file 'debian/rules'
85--- debian/rules 2013-06-04 16:02:32 +0000
86+++ debian/rules 2013-06-13 14:58:31 +0000
87@@ -9,7 +9,12 @@
88 # Uncomment this to turn on verbose mode.
89 # export DH_VERBOSE=1
90
91+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
92+
93 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
94
95 %:
96 dh $@
97+
98+override_dh_auto_configure:
99+ dh_auto_configure -- -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/ubuntu-location-service
100
101=== modified file 'debian/ubuntu-location-service-examples.install'
102--- debian/ubuntu-location-service-examples.install 2013-06-04 16:02:32 +0000
103+++ debian/ubuntu-location-service-examples.install 2013-06-13 14:58:31 +0000
104@@ -1,3 +1,3 @@
105 etc/dbus-1/system.d/
106-usr/bin/ubuntu-location-service/examples/client
107-usr/bin/ubuntu-location-service/examples/service
108+usr/lib/*/ubuntu-location-service/examples/client
109+usr/lib/*/ubuntu-location-service/examples/service
110
111=== modified file 'examples/service/CMakeLists.txt'
112--- examples/service/CMakeLists.txt 2013-05-28 14:20:45 +0000
113+++ examples/service/CMakeLists.txt 2013-06-13 14:58:31 +0000
114@@ -57,7 +57,7 @@
115
116 install(
117 TARGETS service client
118- DESTINATION bin/${CMAKE_PROJECT_NAME}/examples/
119+ DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/examples/
120 )
121
122 install(
123
124=== modified file 'examples/service/program_options.h'
125--- examples/service/program_options.h 2013-05-28 14:41:06 +0000
126+++ examples/service/program_options.h 2013-06-13 14:58:31 +0000
127@@ -20,6 +20,7 @@
128 #include <boost/program_options/variables_map.hpp>
129
130 #include <functional>
131+#include <iostream>
132
133 namespace com {
134 namespace ubuntu {
135
136=== modified file 'src/location_service/com/ubuntu/location/CMakeLists.txt'
137--- src/location_service/com/ubuntu/location/CMakeLists.txt 2013-06-10 11:10:00 +0000
138+++ src/location_service/com/ubuntu/location/CMakeLists.txt 2013-06-13 14:58:31 +0000
139@@ -48,5 +48,5 @@
140
141 install(
142 TARGETS ubuntu-location-service
143- DESTINATION lib
144+ DESTINATION ${CMAKE_INSTALL_LIBDIR}
145 )

Subscribers

People subscribed via source and target branches