location-service

Merge lp:~thomas-voss/location-service/install-dbus-introspection-files into lp:location-service

  1. install-dbus-introspection-files
  2. Merge into next
Proposed by Thomas Voß
Status: Merged
Approved by: Thomas Voß
Approved revision: 301
Merged at revision: 301
Proposed branch: lp:~thomas-voss/location-service/install-dbus-introspection-files
Merge into: lp:location-service
Diff against target: 21 lines (+9/-1)
1 file modified
data/CMakeLists.txt (+9/-1)
To merge this branch: bzr merge lp:~thomas-voss/location-service/install-dbus-introspection-files
Reviewer Review Type Date Requested Status
Simon Fels (community) Approve
Thomas Voß Pending
Review via email: mp+322051@code.launchpad.net

Commit message

Install dbus introspection files.

Description of the change

Install dbus introspection files.

To post a comment you must log in.
Revision history for this message
Simon Fels (morphis) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/CMakeLists.txt'
2--- data/CMakeLists.txt 2014-07-30 14:20:43 +0000
3+++ data/CMakeLists.txt 2017-04-05 20:14:49 +0000
4@@ -1,4 +1,4 @@
5-# Copyright © 2013 Canonical Ltd.
6+# Copyright © 2017 Canonical Ltd.
7 #
8 # This program is free software: you can redistribute it and/or modify
9 # it under the terms of the GNU General Public License version 3 as
10@@ -54,3 +54,11 @@
11 FILES ${CMAKE_CURRENT_BINARY_DIR}/ubuntu-location-service-trust-stored.conf
12 DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/upstart/sessions/
13 )
14+
15+install(
16+ FILES
17+ ${CMAKE_CURRENT_SOURCE_DIR}/location/dbus/provider.xml
18+ ${CMAKE_CURRENT_SOURCE_DIR}/location/dbus/service.xml
19+ ${CMAKE_CURRENT_SOURCE_DIR}/location/dbus/session.xml
20+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/ubuntu-location-service/dbus/
21+)

Subscribers

People subscribed via source and target branches

to all changes: