Merge lp:~pete-woods/location-service/dev-packaging into lp:location-service/trunk

[Pete Woods]

Add missing dependencies to devel package

Add missing dependencies to devel package

Without this change, clients of the location service API need to build depend on libdbus-cpp and libdbus.

[lp:~pete-woods/location-service/dev-packaging]

74. By Pete Woods on 2014-07-28

Bump changelog

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Robert Bruce Park (robru)]

Seems strange to me that those -dev deps wouldn't get pulled in by ${misc:Depends}, but I guess if you need those packages without linking to them, then this lgtm.

review: Approve

[Colin Watson (cjwatson)]

This isn't something that ${misc:Depends} does for you. The things that are added there are enumerated in the debhelper documentation.

[Colin Watson (cjwatson)]

I think you may be thinking of ${shlibs:Depends}, which only covers run-time dependencies, not -dev dependencies. Dependencies on other -dev packages are typically spelled out manually.

[lp:~pete-woods/location-service/dev-packaging]

75. By Pete Woods on 2014-07-29

Don't require hardware headers on unsupported platforms

76. By Pete Woods on 2014-07-29

Only build the GPS provider on supported platforms

77. By Pete Woods on 2014-07-29

Merge trunk

78. By Pete Woods on 2014-07-29

Add info about building on other platforms

[Colin Watson (cjwatson)]

Minor point to clean up later: I think the architecture tests are done backwards here. Negative architecture tests do have their uses (for example, "facility is broken on this particular architecture"), but for something like this where you're using something that only exists on a strictly enumerated set of architectures right now, I would use positive tests. Thus, I'd write the build-dependencies as [amd64 armhf i386], and switch the order of the location-service conditional in debian/rules and write its test as "ifneq (,$(filter $(DEB_HOST_ARCH),amd64 armhf i386))".

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-28 14:01:21 +0000
+++ debian/changelog	2014-07-29 09:19:53 +0000
@@ -1,3 +1,11 @@
+location-service (2.0.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Pete Woods ]
+  * Add libdbus-cpp and libdbus as dependencies on devel package.
+  * Enable building on arm64, powerpc and ppc64el.
+
+ -- Pete Woods <[e-mail]>  Mon, 28 Jul 2014 10:48:27 +0100
+
 location-service (2.0.0+14.10.20140718.2-0ubuntu2) utopic; urgency=medium
 
   * No-change rebuild to get dbgsyms for all binaries onto

=== modified file 'debian/control'
--- debian/control	2014-07-18 15:31:14 +0000
+++ debian/control	2014-07-29 09:19:53 +0000
@@ -25,8 +25,8 @@
                libjson-c-dev,
                libnet-cpp-dev,
                libprocess-cpp-dev,
-               libubuntu-platform-hardware-api-headers,
-               libubuntu-platform-hardware-api-dev,
+               libubuntu-platform-hardware-api-headers [!arm64 !ppc64el !powerpc],
+               libubuntu-platform-hardware-api-dev [!arm64 !ppc64el !powerpc],
                libproperties-cpp-dev,
 Standards-Version: 3.9.4
 Homepage: http://launchpad.net/location-service
@@ -53,6 +53,8 @@
 Multi-Arch: foreign
 Recommends: ubuntu-location-service-doc,
 Depends: libubuntu-location-service2 (= ${binary:Version}),
+         libdbus-1-dev,
+         libdbus-cpp-dev,
          ${misc:Depends},
 Suggests: ubuntu-location-service-doc,
 Description: location service aggregating position/velocity/heading

=== modified file 'debian/rules'
--- debian/rules	2014-07-18 09:44:44 +0000
+++ debian/rules	2014-07-29 09:19:53 +0000
@@ -20,6 +20,12 @@
 export CC=$(DEB_HOST_GNU_TYPE)-gcc-4.9
 export CXX=$(DEB_HOST_GNU_TYPE)-g++-4.9
 
+ifneq (,$(filter $(DEB_HOST_ARCH),ppc64el powerpc arm64))
+        LOCATION_SERVICE_ENABLE_GPS_PROVIDER = OFF
+else
+        LOCATION_SERVICE_ENABLE_GPS_PROVIDER = ON
+endif
+
 %:
 	dh $@ --parallel --fail-missing
 
@@ -30,4 +36,4 @@
 	dh_strip --dbg-package=libubuntu-location-service-dbg
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/ubuntu-location-service -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX)
+	dh_auto_configure -- -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/ubuntu-location-service -DCMAKE_C_COMPILER=$(CC) -DCMAKE_CXX_COMPILER=$(CXX) -DLOCATION_SERVICE_ENABLE_GPS_PROVIDER=$(LOCATION_SERVICE_ENABLE_GPS_PROVIDER)