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

[David Callé]

Add module and moduletype

Add module and moduletype

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[James Henstridge (jamesh)]

Looks good.

review: Approve

=== modified file 'data/calculator.scope.in'
--- data/calculator.scope.in	2013-05-02 16:27:21 +0000
+++ data/calculator.scope.in	2013-07-08 07:50:48 +0000
@@ -7,6 +7,8 @@
 RequiredMetadata=
 OptionalMetadata=
 Loader=/usr/share/unity-scopes/calculator/unity_calculator_daemon.py
+Module=calculator.unity_calculator_daemon
+ModuleType=python3
 RemoteContent=false
 Type=info
 _Name=Calculator
 
=== modified file 'data/unity-scope-calculator.service'
--- data/unity-scope-calculator.service	2013-03-14 12:27:19 +0000
+++ data/unity-scope-calculator.service	2013-07-08 07:50:48 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=com.canonical.Unity.Scope.Info.Calculator
-Exec=/usr/bin/python3 /usr/share/unity-scopes/scope-runner-dbus.py /usr/share/unity-scopes/calculator/unity_calculator_daemon.py
+Exec=/usr/bin/python3 /usr/share/unity-scopes/scope-runner-dbus.py -s info/calculator.scope