Merge lp:~nskaggs/ubuntu-clock-app/tweak-manifest into lp:ubuntu-clock-app/saucy

[Nicholas Skaggs]

Standardize manifest for cmake

Add manifest tweak that was missed during cmake merge :-)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:341
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/238/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1283
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/238
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/238
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/156

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/238/rebuild

review: Approve (continuous-integration)

=== modified file 'click/manifest.json.in'
--- click/manifest.json.in	2014-02-10 22:41:51 +0000
+++ click/manifest.json.in	2014-02-13 01:51:57 +0000
@@ -2,15 +2,22 @@
     "description": "Clock application",
     "framework": "ubuntu-sdk-13.10",
     "hooks": {
-        "clock": {
-            "apparmor": "apparmor/clock.json",
-            "desktop": "ubuntu-clock-app.desktop",
-            "urls": "ubuntu-clock-app.url-dispatcher"
+        "@APP_NAME@": {
+            "apparmor": "apparmor.json",
+            "desktop": "@DESKTOP_FILE@",
+            "urls": "@URLS_FILE@"
         }
     },
-    "icon": "clock64.png",
+    "icon": "@ICON@",
     "maintainer": "Ubuntu App Cats <[e-mail]>",
-    "name": "com.ubuntu.clock",
+    "name": "@PROJECT_NAME@",
     "title": "clock",
-    "version": "1.0"
+    "version": "1.0.@BZR_REVNO@",
+    "x-source": {
+        "vcs-bzr": "@BZR_SOURCE@",
+        "vcs-bzr-revno": "@BZR_REVNO@"
+    },
+    "x-test": {
+        "autopilot": "@AUTOPILOT_DIR@"
+    }
 }