Merge lp:~savilerow-team/savilerow/unity-scope-tourism-shanghai-mockweather-lp1322337 into lp:~savilerow-team/savilerow/unity-scope-tourism-shanghai-mockweather

[Scott Sweeny]

Two changes:

1. Populate the "link" fields of results with a non-empty string since the API seems to have become more strict lately.

2. Use the SCOPE_INSTALL_DIR CMake variable in the image paths so they are always in sync with where the scope is installed.

Tested by cwayne on his phone.

[Chris Wayne (cwayne)]

LGTM

review: Approve

=== modified file 'data/tourism-mockweather.json.in'
--- data/tourism-mockweather.json.in	2014-05-01 04:58:15 +0000
+++ data/tourism-mockweather.json.in	2014-06-03 21:26:01 +0000
@@ -2,22 +2,22 @@
     {
         "title": "Shanghai, CN Today",
         "subtitle": "10°C",
-        "link": "",
-        "image": "file:///custom/usr/lib/arm-linux-gnueabihf/unity/scopes/scope-tourism-mockweather/images/overcast.png",
+        "link": "http://www.weather.com",
+        "image": "file://@SCOPE_INSTALL_DIR@/images/overcast.png",
         "description": "Minimum temperature: 9°\nMaximum temperature: 14°\nChance of rain: 10%\n Wind: WSW at 16 km/h\nHumidity: 76%\nUV index: 3"
     },
     {
         "title": "Tomorrow",
         "subtitle": "14°C",
-        "link": "",
-        "image": "file:///custom/usr/lib/arm-linux-gnueabihf/unity/scopes/scope-tourism-mockweather/images/overcast.png",
+        "link": "http://www.weather.com",
+        "image": "file://@SCOPE_INSTALL_DIR@/images/overcast.png",
         "description": "Minimum temperature: 8°\nMaximum temperature: 14°\nChance of rain: 0%\n Wind: WSW at 16 km/h\nHumidity: 73%\nUV index: 3"
     },
     {
         "title": "Tomorrow night",
         "subtitle": "7°C",
-        "link": "",
-        "image": "file:///custom/usr/lib/arm-linux-gnueabihf/unity/scopes/scope-tourism-mockweather/images/few-clouds-night.png",
+        "link": "http://www.weather.com",
+        "image": "file://@SCOPE_INSTALL_DIR@/images/few-clouds-night.png",
         "description": "Minimum temperature: 8°\nMaximum temperature: 14°\nChance of rain: 0%\n Wind: W at 14 km/h\nHumidity: 76%\nUV index: 0"
     }
 ]

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-13 21:09:26 +0000
+++ debian/changelog	2014-06-03 21:26:01 +0000
@@ -1,3 +1,10 @@
+unity-scope-tourism-shanghai-mockweather (0.7) UNRELEASED; urgency=medium
+
+  * Add fake links to results to cope with API requirements (LP: #1322337) 
+  * Use install path CMake variable to populate image paths 
+
+ -- Scott Sweeny <[e-mail]>  Tue, 03 Jun 2014 16:38:24 -0400
+
 unity-scope-tourism-shanghai-mockweather (0.6) utopic; urgency=medium
 
   * i18n fixes