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

[Ken VanDine]

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.

=== added file 'MANIFEST.in'
--- MANIFEST.in	1970-01-01 00:00:00 +0000
+++ MANIFEST.in	2012-10-17 19:39:22 +0000
@@ -0,0 +1,1 @@
+include data/*
 
=== added directory 'data'
=== added file 'data/com.canonical.Friends.Connection.service'
--- data/com.canonical.Friends.Connection.service	1970-01-01 00:00:00 +0000
+++ data/com.canonical.Friends.Connection.service	2012-10-17 19:39:22 +0000
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=com.canonical.Friends.Connection
+Exec=/usr/bin/friends-service
 
=== added file 'data/com.canonical.Friends.Service.service'
--- data/com.canonical.Friends.Service.service	1970-01-01 00:00:00 +0000
+++ data/com.canonical.Friends.Service.service	2012-10-17 19:39:22 +0000
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=com.canonical.Friends.Service
+Exec=/usr/bin/friends-service
 
=== added file 'data/com.canonical.Friends.URLShorten.service'
--- data/com.canonical.Friends.URLShorten.service	1970-01-01 00:00:00 +0000
+++ data/com.canonical.Friends.URLShorten.service	2012-10-17 19:39:22 +0000
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=com.canonical.Friends.URLShorten
+Exec=/usr/bin/friends-service
 
=== modified file 'setup.py'
--- setup.py	2012-10-13 01:27:15 +0000
+++ setup.py	2012-10-17 19:39:22 +0000
@@ -18,6 +18,7 @@
 
 import sys
 from setuptools import setup, find_packages
+from glob import glob
 
 if sys.version_info[:2] < (3, 2):
     raise RuntimeError('Python 3.2 or newer required')
@@ -28,6 +29,10 @@
     version='0.1',
     packages=find_packages(),
     include_package_data=True,
+    data_files = [
+        (
+            sys.prefix + '/share/dbus-1/services', glob('data/*.service')
+        )],
     entry_points = {
         'console_scripts': ['friends-service = friends.main:main'],
         },