Merge lp:~robru/cupstream2distro-config/drop-amazon-webapp into lp:cupstream2distro-config

[Robert Bruce Park]

Drop unity-webapps-amazon due to conflict with unity-webapps-common.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:740
http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/494/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-saucy-amd64-ci/292

Click here to trigger a rebuild:
http://s-jenkins:8080/job/cupstream2distro-config-ci/494/rebuild

review: Approve (continuous-integration)

Unmerged revisions

740. By Robert Bruce Park on 2013-09-04

Drop unity-webapps-amazon due to conflict with unity-webapps-common.

=== modified file 'stacks/head/webapp.cfg'
--- stacks/head/webapp.cfg	2013-09-03 16:55:14 +0000
+++ stacks/head/webapp.cfg	2013-09-04 18:57:26 +0000
@@ -6,7 +6,7 @@
   extracheck: autopilot-saucy-daily_release
   test_parameters:
     apmachines: autopilot-intel qa-nvidia-gtx660
-    packages: libpackagekit-glib2-16 hud libunity-action-qt1 qtdeclarative5-unity-action-plugin libhud-qt1 libhud2 libqt5webkit5-qmlwebkitplugin qtdeclarative5-hud1.0 qtdeclarative5-qtquick2-plugin qtdeclarative5-window-plugin chromium-browser chromium-browser-l10n chromium-codecs-ffmpeg libxss1 unity-webapps-qml libunity-webapps0 unity-webapps-service unity-chromium-extension xul-ext-unity libufe-xidgetter0 xul-ext-websites-integration unity-webapps-amazon unity-webapps-amazoncloudreader unity-webapps-bbcnews unity-webapps-cnn-news unity-webapps-deezer unity-webapps-deviantart unity-webapps-facebookmessenger unity-webapps-gmail unity-webapps-googlecalendar unity-webapps-googledocs unity-webapps-googlenews unity-webapps-googleplus unity-webapps-googleplusgames unity-webapps-grooveshark unity-webapps-hulu-player unity-webapps-lastfm-radio unity-webapps-launchpad unity-webapps-librefm unity-webapps-linkedin unity-webapps-livemail unity-webapps-mail-ru unity-webapps-newsblur unity-webapps-pandora unity-webapps-qq-mail unity-webapps-reddit unity-webapps-tumblr unity-webapps-twitter unity-webapps-vkcom unity-webapps-wordpress unity-webapps-yahoomail unity-webapps-yahoonews unity-webapps-yandexmail unity-webapps-yandexmusic unity-webapps-yandexnews unity-webapps-youtube
+    packages: libpackagekit-glib2-16 hud libunity-action-qt1 qtdeclarative5-unity-action-plugin libhud-qt1 libhud2 libqt5webkit5-qmlwebkitplugin qtdeclarative5-hud1.0 qtdeclarative5-qtquick2-plugin qtdeclarative5-window-plugin chromium-browser chromium-browser-l10n chromium-codecs-ffmpeg libxss1 unity-webapps-qml libunity-webapps0 unity-webapps-service unity-chromium-extension xul-ext-unity libufe-xidgetter0 xul-ext-websites-integration unity-webapps-amazoncloudreader unity-webapps-bbcnews unity-webapps-cnn-news unity-webapps-deezer unity-webapps-deviantart unity-webapps-facebookmessenger unity-webapps-gmail unity-webapps-googlecalendar unity-webapps-googledocs unity-webapps-googlenews unity-webapps-googleplus unity-webapps-googleplusgames unity-webapps-grooveshark unity-webapps-hulu-player unity-webapps-lastfm-radio unity-webapps-launchpad unity-webapps-librefm unity-webapps-linkedin unity-webapps-livemail unity-webapps-mail-ru unity-webapps-newsblur unity-webapps-pandora unity-webapps-qq-mail unity-webapps-reddit unity-webapps-tumblr unity-webapps-twitter unity-webapps-vkcom unity-webapps-wordpress unity-webapps-yahoomail unity-webapps-yahoonews unity-webapps-yandexmail unity-webapps-yandexmusic unity-webapps-yandexnews unity-webapps-youtube
     testpackages: unity-webapps-qml-autopilot
     tests: unity_webapps_qml
   ci_default: