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

[David Callé]

Add module and moduletype

Add module and moduletype

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[James Henstridge (jamesh)]

Looks good.

review: Approve

=== modified file 'data/openweathermap.scope.in'
--- data/openweathermap.scope.in	2013-04-26 14:38:04 +0000
+++ data/openweathermap.scope.in	2013-07-08 07:54:46 +0000
@@ -6,6 +6,8 @@
 RequiredMetadata=
 OptionalMetadata=min_temp[s];max_temp[s];pressure[s];humidity[s];wind_speed[s];wind_direction[s];latitude[s];longitude[s];photo_hint[i];
 Loader=/usr/share/unity-scopes/openweathermap/unity_openweathermap_daemon.py
+Module=openweathermap.unity_openweathermap_daemon
+ModuleType=python3
 RemoteContent=true
 Type=info
 _Name=OpenWeatherMap
 
=== modified file 'data/unity-scope-openweathermap.service'
--- data/unity-scope-openweathermap.service	2013-03-14 12:29:02 +0000
+++ data/unity-scope-openweathermap.service	2013-07-08 07:54:46 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=com.canonical.Unity.Scope.Info.Openweathermap
-Exec=/usr/bin/python3 /usr/share/unity-scopes/scope-runner-dbus.py /usr/share/unity-scopes/openweathermap/unity_openweathermap_daemon.py
+Exec=/usr/bin/python3 /usr/share/unity-scopes/scope-runner-dbus.py -s info/openweathermap.scope