Merge lp:~ken-vandine/friends/dbus_services into lp:friends

Proposed by Ken VanDine
Status: Merged
Merged at revision: 9
Proposed branch: lp:~ken-vandine/friends/dbus_services
Merge into: lp:friends
Diff against target: 53 lines (+15/-0)
5 files modified
MANIFEST.in (+1/-0)
data/com.canonical.Friends.Connection.service (+3/-0)
data/com.canonical.Friends.Service.service (+3/-0)
data/com.canonical.Friends.URLShorten.service (+3/-0)
setup.py (+5/-0)
To merge this branch: bzr merge lp:~ken-vandine/friends/dbus_services
Reviewer Review Type Date Requested Status
Super Friends Pending
Review via email: mp+130203@code.launchpad.net

Description of the change

include the dbus activation files and install them

I used absolute paths for Exec, ideally they should be set to BINDIR at build time, but I didn't see how.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'MANIFEST.in'
2--- MANIFEST.in 1970-01-01 00:00:00 +0000
3+++ MANIFEST.in 2012-10-17 19:39:22 +0000
4@@ -0,0 +1,1 @@
5+include data/*
6
7=== added directory 'data'
8=== added file 'data/com.canonical.Friends.Connection.service'
9--- data/com.canonical.Friends.Connection.service 1970-01-01 00:00:00 +0000
10+++ data/com.canonical.Friends.Connection.service 2012-10-17 19:39:22 +0000
11@@ -0,0 +1,3 @@
12+[D-BUS Service]
13+Name=com.canonical.Friends.Connection
14+Exec=/usr/bin/friends-service
15
16=== added file 'data/com.canonical.Friends.Service.service'
17--- data/com.canonical.Friends.Service.service 1970-01-01 00:00:00 +0000
18+++ data/com.canonical.Friends.Service.service 2012-10-17 19:39:22 +0000
19@@ -0,0 +1,3 @@
20+[D-BUS Service]
21+Name=com.canonical.Friends.Service
22+Exec=/usr/bin/friends-service
23
24=== added file 'data/com.canonical.Friends.URLShorten.service'
25--- data/com.canonical.Friends.URLShorten.service 1970-01-01 00:00:00 +0000
26+++ data/com.canonical.Friends.URLShorten.service 2012-10-17 19:39:22 +0000
27@@ -0,0 +1,3 @@
28+[D-BUS Service]
29+Name=com.canonical.Friends.URLShorten
30+Exec=/usr/bin/friends-service
31
32=== modified file 'setup.py'
33--- setup.py 2012-10-13 01:27:15 +0000
34+++ setup.py 2012-10-17 19:39:22 +0000
35@@ -18,6 +18,7 @@
36
37 import sys
38 from setuptools import setup, find_packages
39+from glob import glob
40
41 if sys.version_info[:2] < (3, 2):
42 raise RuntimeError('Python 3.2 or newer required')
43@@ -28,6 +29,10 @@
44 version='0.1',
45 packages=find_packages(),
46 include_package_data=True,
47+ data_files = [
48+ (
49+ sys.prefix + '/share/dbus-1/services', glob('data/*.service')
50+ )],
51 entry_points = {
52 'console_scripts': ['friends-service = friends.main:main'],
53 },

Subscribers

People subscribed via source and target branches

to all changes: