Merge lp:~submarine/unity-scope-yelp/module_moduletype into lp:unity-scope-yelp

[David Callé]

Add module and moduletype

Add module and moduletype

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:33
http://jenkins.qa.ubuntu.com/job/unity-scope-yelp-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-yelp-saucy-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-yelp-saucy-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-yelp-saucy-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-yelp-ci/7/rebuild

review: Approve (continuous-integration)

[James Henstridge (jamesh)]

Looks good

review: Approve

=== modified file 'data/unity-scope-yelp.service'
--- data/unity-scope-yelp.service	2013-03-14 12:29:32 +0000
+++ data/unity-scope-yelp.service	2013-07-08 07:54:54 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=com.canonical.Unity.Scope.Help.Yelp
-Exec=/usr/bin/python3 /usr/share/unity-scopes/scope-runner-dbus.py /usr/share/unity-scopes/yelp/unity_yelp_daemon.py
+Exec=/usr/bin/python3 /usr/share/unity-scopes/scope-runner-dbus.py -s help/yelp.scope
 
=== modified file 'data/yelp.scope.in'
--- data/yelp.scope.in	2013-05-14 13:15:38 +0000
+++ data/yelp.scope.in	2013-07-08 07:54:54 +0000
@@ -6,6 +6,8 @@
 RequiredMetadata=
 OptionalMetadata=manual[s];
 Loader=/usr/share/unity-scopes/yelp/unity_yelp_daemon.py
+Module=yelp.unity_yelp_daemon
+ModuleType=python3
 RemoteContent=true
 Type=help
 _Name=Yelp