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

[David Barth]

click packages built without deb
icon local to the package

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:31
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-take-three/+merge/185460/+edit-commit-message

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

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

review: Needs Fixing (continuous-integration)

=== modified file 'README'
--- README	2013-09-09 17:48:39 +0000
+++ README	2013-09-13 10:36:46 +0000
@@ -4,3 +4,6 @@
 - 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)
 
+To generate the click packages directly, ie without the debian package:
+
+./build.sh

=== added file 'build.sh'
--- build.sh	1970-01-01 00:00:00 +0000
+++ build.sh	2013-09-13 10:36:46 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+
+rm -rf build
+mkdir -p build
+cd build
+
+for i in `ls -d ../webapp-*`; do
+  click build $i
+done

=== removed directory 'desktopFiles'
=== removed file 'desktopFiles/qmlscene.desktop'
--- desktopFiles/qmlscene.desktop	2013-04-02 13:09:42 +0000
+++ desktopFiles/qmlscene.desktop	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Exec=/usr/bin/qmlscene
-Name=QML runner
-GenericName=QML runner
-Icon=ubuntu-qmlrunner
-NoDisplay=true

=== renamed file 'icons/128/amazon.png' => 'webapp-amazon/amazon.png'
=== modified file 'webapp-amazon/webapp-amazon.desktop'
--- webapp-amazon/webapp-amazon.desktop	2013-09-09 17:48:39 +0000
+++ webapp-amazon/webapp-amazon.desktop	2013-09-13 10:36:46 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Terminal=false
-Exec=webbrowser-app --chromeless http://m.amazon.com
+Exec=webbrowser-app --chromeless --enable-back-forward --webapp --webappUrlPatterns=http://m.amazon.com* http://m.amazon.com
 Name=Amazon
-Icon=amazon
+Icon=./amazon.png
 X-Ubuntu-Touch=true

=== modified file 'webapp-amazon/webapp-amazon.json'
--- webapp-amazon/webapp-amazon.json	2013-09-09 17:48:39 +0000
+++ webapp-amazon/webapp-amazon.json	2013-09-13 10:36:46 +0000
@@ -1,5 +1,5 @@
 {
-  "template": "ubuntu-webapp-experimental",
+  "template": "ubuntu-webapp",
   "policy_groups": [
     "networking"
   ],

=== renamed file 'icons/128/ebay.png' => 'webapp-ebay/ebay.png'
=== modified file 'webapp-ebay/webapp-ebay.desktop'
--- webapp-ebay/webapp-ebay.desktop	2013-09-09 17:48:39 +0000
+++ webapp-ebay/webapp-ebay.desktop	2013-09-13 10:36:46 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Terminal=false
-Exec=webbrowser-app --chromeless http://ebay.com
+Exec=webbrowser-app --chromeless --enable-back-forward --webapp --webappUrlPatterns=http://ebay.com* http://ebay.com
 Name=eBay
-Icon=ebay
+Icon=./ebay.png
 X-Ubuntu-Touch=true

=== modified file 'webapp-ebay/webapp-ebay.json'
--- webapp-ebay/webapp-ebay.json	2013-09-09 17:48:39 +0000
+++ webapp-ebay/webapp-ebay.json	2013-09-13 10:36:46 +0000
@@ -1,5 +1,5 @@
 {
-  "template": "ubuntu-webapp-experimental",
+  "template": "ubuntu-webapp",
   "policy_groups": [
     "networking"
   ],

=== renamed file 'icons/128/facebook.png' => 'webapp-facebook/facebook.png'
=== modified file 'webapp-facebook/webapp-facebook.desktop'
--- webapp-facebook/webapp-facebook.desktop	2013-09-09 17:48:39 +0000
+++ webapp-facebook/webapp-facebook.desktop	2013-09-13 10:36:46 +0000
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Type=Application
 Terminal=false
-Exec=webbrowser-app --chromeless http://m.facebook.com
+Exec=webbrowser-app --chromeless --enable-back-forward --webapp --webappUrlPatterns=http://m.facebook.com* http://m.facebook.com
 Name=Facebook
-Icon=facebook
+Icon=./facebook.png
 X-Ubuntu-Touch=true
 X-Ubuntu-StageHint=SideStage

=== modified file 'webapp-facebook/webapp-facebook.json'
--- webapp-facebook/webapp-facebook.json	2013-09-09 17:48:39 +0000
+++ webapp-facebook/webapp-facebook.json	2013-09-13 10:36:46 +0000
@@ -1,5 +1,5 @@
 {
-  "template": "ubuntu-webapp-experimental",
+  "template": "ubuntu-webapp",
   "policy_groups": [
     "networking"
   ],

=== renamed file 'icons/128/gmail.png' => 'webapp-gmail/gmail.png'
=== modified file 'webapp-gmail/webapp-gmail.desktop'
--- webapp-gmail/webapp-gmail.desktop	2013-09-09 17:48:39 +0000
+++ webapp-gmail/webapp-gmail.desktop	2013-09-13 10:36:46 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Terminal=false
-Exec=webbrowser-app --chromeless https://gmail.com
+Exec=webbrowser-app --chromeless --enable-back-forward --webapp --webappUrlPatterns=https://gmail.com* https://gmail.com
 Name=Gmail
-Icon=gmail
+Icon=./gmail.png
 X-Ubuntu-Touch=true

=== modified file 'webapp-gmail/webapp-gmail.json'
--- webapp-gmail/webapp-gmail.json	2013-09-09 17:48:39 +0000
+++ webapp-gmail/webapp-gmail.json	2013-09-13 10:36:46 +0000
@@ -1,5 +1,5 @@
 {
-  "template": "ubuntu-webapp-experimental",
+  "template": "ubuntu-webapp",
   "policy_groups": [
     "networking"
   ],

=== renamed file 'icons/128/twitter.png' => 'webapp-twitter/twitter.png'
Binary files icons/128/twitter.png	2012-11-19 15:43:52 +0000 and webapp-twitter/twitter.png	2013-09-13 10:36:46 +0000 differ
=== modified file 'webapp-twitter/webapp-twitter.desktop'
--- webapp-twitter/webapp-twitter.desktop	2013-09-09 17:48:39 +0000
+++ webapp-twitter/webapp-twitter.desktop	2013-09-13 10:36:46 +0000
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Type=Application
 Terminal=false
-Exec=webbrowser-app --chromeless --webapp http://mobile.twitter.com
+Exec=webbrowser-app --chromeless --enable-back-forward --webapp --webappUrlPatterns=http://mobile.twitter.com* http://mobile.twitter.com
 Name=Twitter
-Icon=twitter
+Icon=./twitter.png
 X-Ubuntu-Touch=true
 X-Ubuntu-StageHint=SideStage

=== modified file 'webapp-twitter/webapp-twitter.json'
--- webapp-twitter/webapp-twitter.json	2013-09-09 17:48:39 +0000
+++ webapp-twitter/webapp-twitter.json	2013-09-13 10:36:46 +0000
@@ -1,5 +1,5 @@
 {
-  "template": "ubuntu-webapp-experimental",
+  "template": "ubuntu-webapp",
   "policy_groups": [
     "networking"
   ],

=== renamed file 'icons/128/ubuntuone.png' => 'webapp-ubuntuone/ubuntuone.png'
=== modified file 'webapp-ubuntuone/webapp-ubuntuone.desktop'
--- webapp-ubuntuone/webapp-ubuntuone.desktop	2013-09-09 17:48:39 +0000
+++ webapp-ubuntuone/webapp-ubuntuone.desktop	2013-09-13 10:36:46 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Terminal=false
-Exec=webbrowser-app --chromeless http://one.ubuntu.com
+Exec=webbrowser-app --chromeless --enable-back-forward --webapp --webappUrlPatterns=http://one.ubuntu.com* http://one.ubuntu.com
 Name=Ubuntu One
-Icon=ubuntuone
+Icon=./ubuntuone.png
 X-Ubuntu-Touch=true

=== modified file 'webapp-ubuntuone/webapp-ubuntuone.json'
--- webapp-ubuntuone/webapp-ubuntuone.json	2013-09-09 17:48:39 +0000
+++ webapp-ubuntuone/webapp-ubuntuone.json	2013-09-13 10:36:46 +0000
@@ -1,5 +1,5 @@
 {
-  "template": "ubuntu-webapp-experimental",
+  "template": "ubuntu-webapp",
   "policy_groups": [
     "networking"
   ],