Merge lp:~dbarth/webapps-demo/click-packages into lp:webapps-demo

[David Barth]

Migrate webapps definitions to click packages

This migrates webapps definitions to click packages.

I didn't take the qmlscene.desktop for now, but it should be resolved which package should contain it moving forward.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:25
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~dbarth/webapps-demo/click-packages/+merge/184639/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/webapps-demo-ci/14/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/webapps-demo-raring-armhf-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webapps-demo-raring-i386-ci/14/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webapps-demo-ci/14/rebuild

review: Needs Fixing (continuous-integration)

[lp:~dbarth/webapps-demo/click-packages]

25. By Ugo Riboni on 2013-09-10

Remove dependency on the hud as the package will be removed. Fixes: https://bugs.launchpad.net/bugs/1221344.

Approved by Günter Schwann, PS Jenkins bot.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:25
http://jenkins.qa.ubuntu.com/job/webapps-demo-ci/15/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/webapps-demo-raring-armhf-ci/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webapps-demo-raring-i386-ci/15/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webapps-demo-ci/15/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:26
http://jenkins.qa.ubuntu.com/job/webapps-demo-ci/16/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/webapps-demo-raring-armhf-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webapps-demo-raring-i386-ci/16/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webapps-demo-ci/16/rebuild

review: Needs Fixing (continuous-integration)

[lp:~dbarth/webapps-demo/click-packages]

26. By David Barth on 2013-09-10

re-merge click packages changes and resolve a conflict in debian/control

27. By David Barth on 2013-09-10

add click as build dependency as well

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:27
http://jenkins.qa.ubuntu.com/job/webapps-demo-ci/17/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/webapps-demo-raring-armhf-ci/17/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webapps-demo-raring-i386-ci/17/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webapps-demo-ci/17/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:27
http://jenkins.qa.ubuntu.com/job/webapps-demo-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-saucy-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-saucy-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webapps-demo-ci/18/rebuild

review: Approve (continuous-integration)

=== added file 'README'
--- README	1970-01-01 00:00:00 +0000
+++ README	2013-09-10 12:19:29 +0000
@@ -0,0 +1,6 @@
+This package provides a set of default web application versions for popular web services.
+
+The debian package itself serves 2 purposes:
+- generate click packages in a clean environment, that can be integrated with the rest of our toolchain
+- package a set of icons for the webapps, while click doesn't support icons directly (temporary)
+

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-10 21:13:25 +0000
+++ debian/changelog	2013-09-10 12:19:29 +0000
@@ -1,3 +1,12 @@
+webapps-demo (0.18) saucy; urgency=low
+
+  * Switch to building click packages from the debian packaging shell
+  * Migrate apps in a click package, using the new webapp containment system
+  * Keep the icon set in the main package (temporary)
+  * Add sub-package to pre-install click packages in the base system image
+
+ -- David Barth <[e-mail]>  Mon, 09 Sep 2013 12:41:02 +0200
+
 webapps-demo (0.17) saucy; urgency=low
 
   * Remove all qml mocks. (LP: #1198850)

=== modified file 'debian/control'
--- debian/control	2013-09-10 08:17:10 +0000
+++ debian/control	2013-09-10 12:19:29 +0000
@@ -3,14 +3,30 @@
 Priority: extra
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Ricardo Mendoza <[e-mail]>
-Build-Depends: debhelper (>= 9.0.0)
+Build-Depends: debhelper (>= 9.0.0),
+               click
 Standards-Version: 3.9.3
 Vcs-Bzr: lp:webapps-demo
 
+Package: webapps-demo-click
+Architecture: all
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         webapps-demo,
+         webbrowser-app,
+         qtdeclarative5-hud1.0,
+         click,
+Description: Default web applications set (as click packages)
+ Default web applications set, to demonstrate the integration
+ of popuplar web services on Ubuntu.
+ This package contains click packages that will are pre-installed
+ in the base image.
+
 Package: webapps-demo
 Architecture: all
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         webbrowser-app,
-Description: WebApps assets for demo
- Facebook and Twitter assets for standalone launcher
+Description: Icon set for the default web applications set
+ This pacakge contains a temporary icon set for use with the default
+ set of web applications.
+

=== added file 'debian/postinst'
--- debian/postinst	1970-01-01 00:00:00 +0000
+++ debian/postinst	2013-09-10 12:19:29 +0000
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+echo "Setting up click packages"
+
+click_db=/usr/share/click/preinstalled
+tmpdir=/tmp/webapps-demo
+
+mkdir -p -m 755 "$click_db"
+chown clickpkg:clickpkg "$click_db"
+
+for package in $(ls "$tmpdir")
+do
+    echo "Setting up $package"
+    # WARNING: install for user phablet, as --all-users doesn't install
+    #          the aa-exec frontend to enable the containment of webapps
+    click install --force-missing-framework --root="$click_db" \
+        --user=phablet \
+        "$tmpdir/$package"
+done

=== modified file 'debian/rules'
--- debian/rules	2012-11-19 15:43:52 +0000
+++ debian/rules	2013-09-10 12:19:29 +0000
@@ -10,12 +10,35 @@
 # Modified to make a template file for a multi-binary package with separated
 # build-arch and build-indep targets  by Bill Allombert 2001
 
+include /usr/share/dpkg/default.mk
+
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
-
 %:
 	dh $@ 
+
+build_click = make -f debian/rules click APP=$(1) 
+
+click:
+	mkdir -p build
+	cd build; click build ../$(APP)
+
+override_dh_auto_conf:
+	rm -rf build
+	mkdir -p build
+
+override_dh_auto_build:
+	$(call build_click,webapp-twitter)
+	$(call build_click,webapp-ebay)
+	$(call build_click,webapp-amazon)
+	$(call build_click,webapp-facebook)
+	$(call build_click,webapp-ubuntuone)
+	$(call build_click,webapp-gmail)
+
+override_dh_clean:
+	rm -rf build
+	dh_clean

=== renamed file 'debian/webapps-demo.install' => 'debian/webapps-demo-click.install'
--- debian/webapps-demo.install	2013-07-10 19:40:11 +0000
+++ debian/webapps-demo-click.install	2013-09-10 12:19:29 +0000
@@ -1,2 +1,1 @@
-desktopFiles/*.desktop /usr/share/applications/
-icons/* /usr/share/icons/hicolor/
+build/* /tmp/webapps-demo/

=== added file 'debian/webapps-demo.install'
--- debian/webapps-demo.install	1970-01-01 00:00:00 +0000
+++ debian/webapps-demo.install	2013-09-10 12:19:29 +0000
@@ -0,0 +1,2 @@
+icons/* /usr/share/icons/hicolor/
+desktopFiles/* /usr/share/applications/

=== added directory 'webapp-amazon'
=== added file 'webapp-amazon/manifest.json'
--- webapp-amazon/manifest.json	1970-01-01 00:00:00 +0000
+++ webapp-amazon/manifest.json	2013-09-10 12:19:29 +0000
@@ -0,0 +1,15 @@
+{
+    "description": "Amazon (webapp version)",
+    "framework": "ubuntu-sdk-13.10",
+    "hooks": {
+        "webapp-amazon": {
+            "apparmor": "webapp-amazon.json",
+            "desktop": "webapp-amazon.desktop"
+        }
+    },
+    "maintainer": "Webapps Team <[e-mail]>",
+    "name": "com.ubuntu.developer.webapps.webapp-amazon",
+    "title": "webapp-amazon",
+    "version": "1.0"
+}
+

=== renamed file 'desktopFiles/amazon-webapp.desktop' => 'webapp-amazon/webapp-amazon.desktop'
=== added file 'webapp-amazon/webapp-amazon.json'
--- webapp-amazon/webapp-amazon.json	1970-01-01 00:00:00 +0000
+++ webapp-amazon/webapp-amazon.json	2013-09-10 12:19:29 +0000
@@ -0,0 +1,7 @@
+{
+  "template": "ubuntu-webapp-experimental",
+  "policy_groups": [
+    "networking"
+  ],
+  "policy_version": 1.0
+}

=== added directory 'webapp-ebay'
=== added file 'webapp-ebay/manifest.json'
--- webapp-ebay/manifest.json	1970-01-01 00:00:00 +0000
+++ webapp-ebay/manifest.json	2013-09-10 12:19:29 +0000
@@ -0,0 +1,15 @@
+{
+    "description": "eBay (webapp version)",
+    "framework": "ubuntu-sdk-13.10",
+    "hooks": {
+        "webapp-ebay": {
+            "apparmor": "webapp-ebay.json",
+            "desktop": "webapp-ebay.desktop"
+        }
+    },
+    "maintainer": "Webapps Team <[e-mail]>",
+    "name": "com.ubuntu.developer.webapps.webapp-ebay",
+    "title": "webapp-ebay",
+    "version": "1.0"
+}
+

=== renamed file 'desktopFiles/ebay-webapp.desktop' => 'webapp-ebay/webapp-ebay.desktop'
=== added file 'webapp-ebay/webapp-ebay.json'
--- webapp-ebay/webapp-ebay.json	1970-01-01 00:00:00 +0000
+++ webapp-ebay/webapp-ebay.json	2013-09-10 12:19:29 +0000
@@ -0,0 +1,7 @@
+{
+  "template": "ubuntu-webapp-experimental",
+  "policy_groups": [
+    "networking"
+  ],
+  "policy_version": 1.0
+}

=== added directory 'webapp-facebook'
=== added file 'webapp-facebook/manifest.json'
--- webapp-facebook/manifest.json	1970-01-01 00:00:00 +0000
+++ webapp-facebook/manifest.json	2013-09-10 12:19:29 +0000
@@ -0,0 +1,15 @@
+{
+    "description": "Facebook (webapp version)",
+    "framework": "ubuntu-sdk-13.10",
+    "hooks": {
+        "webapp-facebook": {
+            "apparmor": "webapp-facebook.json",
+            "desktop": "webapp-facebook.desktop"
+        }
+    },
+    "maintainer": "Webapps Team <[e-mail]>",
+    "name": "com.ubuntu.developer.webapps.webapp-facebook",
+    "title": "webapp-facebook",
+    "version": "1.0"
+}
+

=== renamed file 'desktopFiles/facebook-webapp.desktop' => 'webapp-facebook/webapp-facebook.desktop'
=== added file 'webapp-facebook/webapp-facebook.json'
--- webapp-facebook/webapp-facebook.json	1970-01-01 00:00:00 +0000
+++ webapp-facebook/webapp-facebook.json	2013-09-10 12:19:29 +0000
@@ -0,0 +1,7 @@
+{
+  "template": "ubuntu-webapp-experimental",
+  "policy_groups": [
+    "networking"
+  ],
+  "policy_version": 1.0
+}

=== added directory 'webapp-gmail'
=== added file 'webapp-gmail/manifest.json'
--- webapp-gmail/manifest.json	1970-01-01 00:00:00 +0000
+++ webapp-gmail/manifest.json	2013-09-10 12:19:29 +0000
@@ -0,0 +1,15 @@
+{
+    "description": "GMail (webapp version)",
+    "framework": "ubuntu-sdk-13.10",
+    "hooks": {
+        "webapp-gmail": {
+            "apparmor": "webapp-gmail.json",
+            "desktop": "webapp-gmail.desktop"
+        }
+    },
+    "maintainer": "Webapps Team <[e-mail]>",
+    "name": "com.ubuntu.developer.webapps.webapp-gmail",
+    "title": "webapp-gmail",
+    "version": "1.0"
+}
+

=== renamed file 'desktopFiles/gmail-webapp.desktop' => 'webapp-gmail/webapp-gmail.desktop'
=== added file 'webapp-gmail/webapp-gmail.json'
--- webapp-gmail/webapp-gmail.json	1970-01-01 00:00:00 +0000
+++ webapp-gmail/webapp-gmail.json	2013-09-10 12:19:29 +0000
@@ -0,0 +1,7 @@
+{
+  "template": "ubuntu-webapp-experimental",
+  "policy_groups": [
+    "networking"
+  ],
+  "policy_version": 1.0
+}

=== added directory 'webapp-twitter'
=== added file 'webapp-twitter/manifest.json'
--- webapp-twitter/manifest.json	1970-01-01 00:00:00 +0000
+++ webapp-twitter/manifest.json	2013-09-10 12:19:29 +0000
@@ -0,0 +1,15 @@
+{
+    "description": "Twitter (webapp version)",
+    "framework": "ubuntu-sdk-13.10",
+    "hooks": {
+        "webapp-twitter": {
+            "apparmor": "webapp-twitter.json",
+            "desktop": "webapp-twitter.desktop"
+        }
+    },
+    "maintainer": "Webapps Team <[e-mail]>",
+    "name": "com.ubuntu.developer.webapps.webapp-twitter",
+    "title": "webapp-twitter",
+    "version": "1.0"
+}
+

=== renamed file 'desktopFiles/twitter-webapp.desktop' => 'webapp-twitter/webapp-twitter.desktop'
--- desktopFiles/twitter-webapp.desktop	2013-04-02 12:55:05 +0000
+++ webapp-twitter/webapp-twitter.desktop	2013-09-10 12:19:29 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Terminal=false
-Exec=webbrowser-app --chromeless http://mobile.twitter.com
+Exec=webbrowser-app --chromeless --webapp http://mobile.twitter.com
 Name=Twitter
 Icon=twitter
 X-Ubuntu-Touch=true

=== added file 'webapp-twitter/webapp-twitter.json'
--- webapp-twitter/webapp-twitter.json	1970-01-01 00:00:00 +0000
+++ webapp-twitter/webapp-twitter.json	2013-09-10 12:19:29 +0000
@@ -0,0 +1,7 @@
+{
+  "template": "ubuntu-webapp-experimental",
+  "policy_groups": [
+    "networking"
+  ],
+  "policy_version": 1.0
+}

=== added directory 'webapp-ubuntuone'
=== added file 'webapp-ubuntuone/manifest.json'
--- webapp-ubuntuone/manifest.json	1970-01-01 00:00:00 +0000
+++ webapp-ubuntuone/manifest.json	2013-09-10 12:19:29 +0000
@@ -0,0 +1,15 @@
+{
+    "description": "Ubuntu One (webapp version)",
+    "framework": "ubuntu-sdk-13.10",
+    "hooks": {
+        "webapp-ubuntuone": {
+            "apparmor": "webapp-ubuntuone.json",
+            "desktop": "webapp-ubuntuone.desktop"
+        }
+    },
+    "maintainer": "Webapps Team <[e-mail]>",
+    "name": "com.ubuntu.developer.webapps.webapp-ubuntuone",
+    "title": "webapp-ubuntuone",
+    "version": "1.0"
+}
+

=== renamed file 'desktopFiles/ubuntuone-webapp.desktop' => 'webapp-ubuntuone/webapp-ubuntuone.desktop'
=== added file 'webapp-ubuntuone/webapp-ubuntuone.json'
--- webapp-ubuntuone/webapp-ubuntuone.json	1970-01-01 00:00:00 +0000
+++ webapp-ubuntuone/webapp-ubuntuone.json	2013-09-10 12:19:29 +0000
@@ -0,0 +1,7 @@
+{
+  "template": "ubuntu-webapp-experimental",
+  "policy_groups": [
+    "networking"
+  ],
+  "policy_version": 1.0
+}