Merge lp:~abreu-alexandre/webapps-demo/update-to-webapp-container into lp:webapps-demo

[Alexandre Abreu]

Update the webapp launcher to the new webapp container (merged "upstream" & to be released)

Update the webapp launcher to the new webapp container (merged "upstream" & to be released)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Olivier Tilloy (osomon)]

Looks good to me.

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-10-17 14:12:55 +0000
+++ debian/control	2014-01-08 15:45:26 +0000
@@ -13,7 +13,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          webapps-demo,
-         webbrowser-app,
+         webapp-container,
          qtdeclarative5-hud1.0,
          click,
 Description: Default web applications set (as click packages)
 
=== modified file 'tests/autopilot/webapps_click_packages_autopilot/tests/__init__.py'
--- tests/autopilot/webapps_click_packages_autopilot/tests/__init__.py	2013-10-11 18:38:34 +0000
+++ tests/autopilot/webapps_click_packages_autopilot/tests/__init__.py	2014-01-08 15:45:26 +0000
@@ -33,7 +33,7 @@
     output, errors = subprocess.Popen(["-c", command], stderr=subprocess.STDOUT, stdout=subprocess.PIPE, shell=True).communicate()
     pid = ""
     if output and len(output) != 0:
-        click_webapp_re = re.compile('.*webbrowser-app.*--webapp\s+.*{0}.*'.format(app_id))
+        click_webapp_re = re.compile('.*webapp-container.*--webapp\s+.*{0}.*'.format(app_id))
         pids = [process for process in output.split('\n') if click_webapp_re.match(process)]
         if len(pids) != 0:
             pid = pids[0].split()[1]
 
=== modified file 'webapp-amazon/webapp-amazon.desktop'
--- webapp-amazon/webapp-amazon.desktop	2013-09-26 14:15:07 +0000
+++ webapp-amazon/webapp-amazon.desktop	2014-01-08 15:45:26 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Terminal=false
-Exec=webbrowser-app --enable-back-forward --webapp --webappUrlPatterns=https?://www.amazon.com/*,https?://s.amazon-adsystem.com/* http://www.amazon.com/gp/aw
+Exec=webapp-container --enable-back-forward --webapp --webappUrlPatterns=https?://www.amazon.com/*,https?://s.amazon-adsystem.com/* http://www.amazon.com/gp/aw
 Name=Amazon
 Icon=./amazon.png
 X-Ubuntu-Touch=true
 
=== modified file 'webapp-ebay/webapp-ebay.desktop'
--- webapp-ebay/webapp-ebay.desktop	2013-10-16 16:36:55 +0000
+++ webapp-ebay/webapp-ebay.desktop	2014-01-08 15:45:26 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Terminal=false
-Exec=webbrowser-app --enable-back-forward --webappUrlPatterns=https?://*.ebay.com/* --webapp http://m.ebay.com/
+Exec=webapp-container --enable-back-forward --webappUrlPatterns=https?://*.ebay.com/* --webapp http://m.ebay.com/
 Name=eBay
 Icon=./ebay.png
 X-Ubuntu-Touch=true
 
=== modified file 'webapp-facebook/webapp-facebook.desktop'
--- webapp-facebook/webapp-facebook.desktop	2013-09-26 16:17:53 +0000
+++ webapp-facebook/webapp-facebook.desktop	2014-01-08 15:45:26 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Terminal=false
-Exec=webbrowser-app --enable-back-forward --webapp --webappUrlPatterns=https?://m.facebook.com/* https://m.facebook.com/
+Exec=webapp-container --enable-back-forward --webapp --webappUrlPatterns=https?://m.facebook.com/* https://m.facebook.com/
 Name=Facebook
 Icon=./facebook.png
 X-Ubuntu-Touch=true
 
=== modified file 'webapp-gmail/webapp-gmail.desktop'
--- webapp-gmail/webapp-gmail.desktop	2013-10-11 16:04:22 +0000
+++ webapp-gmail/webapp-gmail.desktop	2014-01-08 15:45:26 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Terminal=false
-Exec=webbrowser-app --enable-back-forward --webappModelSearchPath=. --webapp='R01haWwNCg==' https://mail.google.com/
+Exec=webapp-container --enable-back-forward --webappModelSearchPath=. --webapp='R01haWwNCg==' https://mail.google.com/
 Name=Gmail
 Icon=./gmail.png
 X-Ubuntu-Touch=true
 
=== modified file 'webapp-twitter/webapp-twitter.desktop'
--- webapp-twitter/webapp-twitter.desktop	2013-10-10 19:46:34 +0000
+++ webapp-twitter/webapp-twitter.desktop	2014-01-08 15:45:26 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Terminal=false
-Exec=webbrowser-app --enable-back-forward --webapp --webappUrlPatterns=https?://mobile.twitter.com/* https://mobile.twitter.com/session/new?bypass_interstitial=true
+Exec=webapp-container --enable-back-forward --webapp --webappUrlPatterns=https?://mobile.twitter.com/* https://mobile.twitter.com/session/new?bypass_interstitial=true
 Name=Twitter
 Icon=./twitter.png
 X-Ubuntu-Touch=true
 
=== modified file 'webapp-ubuntuone/webapp-ubuntuone.desktop'
--- webapp-ubuntuone/webapp-ubuntuone.desktop	2013-09-26 16:17:53 +0000
+++ webapp-ubuntuone/webapp-ubuntuone.desktop	2014-01-08 15:45:26 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Terminal=false
-Exec=webbrowser-app --enable-back-forward --webappUrlPatterns=https?://one.ubuntu.com/*,https?://login.ubuntu.com/* --webapp https://one.ubuntu.com/
+Exec=webapp-container --enable-back-forward --webappUrlPatterns=https?://one.ubuntu.com/*,https?://login.ubuntu.com/* --webapp https://one.ubuntu.com/
 Name=Ubuntu One
 Icon=./ubuntuone.png
 X-Ubuntu-Touch=true