Merge lp:~sergiusens/ubuntu-weather-app/click-in into lp:ubuntu-weather-app/obsolete.trunk

[Sergio Schvezov]

add the click data into the package instead of parsing it from debian/ and add apparmor rules so upstream can manage themselves

[Alan Pope 🍺🐧🐱 🦄 (popey)]

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-weather-app-autolanding/37/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/685
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-precise-amd64-autolanding/37
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-autolanding/37
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-autolanding/37
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-autolanding/37

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-weather-app-autolanding/39/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/692
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-precise-amd64-autolanding/39
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-quantal-amd64-autolanding/39
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-raring-amd64-autolanding/39
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-weather-app-saucy-amd64-autolanding/39

review: Needs Fixing (continuous-integration)

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

review: Approve (continuous-integration)

=== added directory 'apparmor'
=== added file 'apparmor/weather.json'
--- apparmor/weather.json	1970-01-01 00:00:00 +0000
+++ apparmor/weather.json	2013-10-04 17:22:45 +0000
@@ -0,0 +1,5 @@
+{
+    "policy_groups": ["networking"
+                      ], 
+    "policy_version": 1.0
+}

=== added file 'manifest.json'
--- manifest.json	1970-01-01 00:00:00 +0000
+++ manifest.json	2013-10-04 17:22:45 +0000
@@ -0,0 +1,15 @@
+{
+    "description": "Weather application", 
+    "framework": "ubuntu-sdk-13.10", 
+    "hooks": {
+        "weather": {
+            "apparmor": "apparmor/weather.json", 
+            "desktop": "ubuntu-weather-app.desktop"
+        }
+    }, 
+    "icon": "weather64.png", 
+    "maintainer": "Ubuntu App Cats <[e-mail]>", 
+    "name": "com.ubuntu.weather", 
+    "title": "weather", 
+    "version": "0.3"
+}

=== modified file 'tests/autopilot/ubuntu_weather_app/tests/__init__.py'
--- tests/autopilot/ubuntu_weather_app/tests/__init__.py	2013-10-01 20:57:27 +0000
+++ tests/autopilot/ubuntu_weather_app/tests/__init__.py	2013-10-04 17:22:45 +0000
@@ -69,7 +69,7 @@
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def launch_test_click(self):
-        self.app = self.launch_click_package("com.ubuntu.ubuntu-weather-app", emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
+        self.app = self.launch_click_package("com.ubuntu.weather", emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def launch_and_quit_app(self):
         self.launch_app()