Merge lp:~thomas-voss/location-service/remove-dep-on-ruby-ronn into lp:location-service/trunk

[Thomas Voß]

Remove ruby-ronn from the build-dependencies.

Remove ruby-ronn from the build-dependencies.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Łukasz Zemczak (sil2100)]

Looks rather good.

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-08-20 10:12:08 +0000
+++ debian/control	2013-08-29 09:26:02 +0000
@@ -23,7 +23,6 @@
                libiw-dev,
                libplatform-hardware-api-headers,
                libplatform-hardware-api1-dev,
-               ruby-ronn,
 Standards-Version: 3.9.4
 Homepage: http://launchpad.net/location-service
 # If you aren't a member of ~phablet-team but need to upload packaging changes,
 
=== modified file 'examples/service/CMakeLists.txt'
--- examples/service/CMakeLists.txt	2013-08-19 05:51:55 +0000
+++ examples/service/CMakeLists.txt	2013-08-29 09:26:02 +0000
@@ -51,8 +51,8 @@
 )
 
 add_custom_target(
-    ubuntu-location-service-man-page ALL
-    DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/ubuntu-location-service.1"
+    ubuntu-location-service-man-page
+    DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/ubuntu-location-service.1"
 )
 
 install(
@@ -61,6 +61,6 @@
 )
 
 install(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/ubuntu-location-service.1
+    FILES ${CMAKE_CURRENT_SOURCE_DIR}/ubuntu-location-service.1
     DESTINATION share/doc/${CMAKE_PROJECT_NAME}/man
 )
 
=== renamed file 'examples/service/service.1' => 'examples/service/ubuntu-location-service.1'