Merge lp:~sil2100/cupstream2distro-config/clean_up_packages_lists into lp:cupstream2distro-config

Proposed by Łukasz Zemczak on 2013-07-08
Status: Merged
Approved by: Didier Roche on 2013-07-12
Approved revision: 499
Merged at revision: 505
Proposed branch: lp:~sil2100/cupstream2distro-config/clean_up_packages_lists
Merge into: lp:cupstream2distro-config
Diff against target: 116 lines (+9/-9)
9 files modified
stacks/head/apps.cfg (+1/-1)
stacks/head/hud.cfg (+1/-1)
stacks/head/indicators.cfg (+1/-1)
stacks/head/media.cfg (+1/-1)
stacks/head/phone.cfg (+1/-1)
stacks/head/platform.cfg (+1/-1)
stacks/head/qa.cfg (+1/-1)
stacks/head/sdk.cfg (+1/-1)
stacks/head/unity.cfg (+1/-1)
To merge this branch: bzr merge lp:~sil2100/cupstream2distro-config/clean_up_packages_lists
Reviewer Review Type Date Requested Status
Didier Roche 2013-07-08 Approve on 2013-07-12
PS Jenkins bot continuous-integration Approve on 2013-07-12
Review via email: mp+173539@code.launchpad.net

Commit message

Remove all unneeded packages in the packages lists for tests in stack configurations

Description of the change

The packages: lists of stacks have left-overs from the times when most packages weren't in main yet (like Qt5), so we had to list them in those. Let's get rid of all that we don't need.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
497. By Łukasz Zemczak on 2013-07-11

Re-merge trunk

PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
498. By Łukasz Zemczak on 2013-07-12

Fix packages list after testing

PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
499. By Łukasz Zemczak on 2013-07-12

Missed share app from the merge

Didier Roche (didrocks) wrote :

Trusting you on this one, please deploy! :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stacks/head/apps.cfg'
2--- stacks/head/apps.cfg 2013-07-11 09:59:10 +0000
3+++ stacks/head/apps.cfg 2013-07-12 14:27:28 +0000
4@@ -12,7 +12,7 @@
5 - webcred
6 test_parameters:
7 apmachines: ati intel
8- packages: hud libhud2 libaccounts-qt5-1 libsignon-qt5-1 qtdeclarative5-accounts-plugin qmlscene qtdeclarative5-localstorage-plugin libqt5sql5-sqlite libqt5xml5 libhud-client2 libhud-qt1 qtdeclarative5-hud1.0 libpocketsphinx1 libqt53d5 libqt5dbus5 libqt5qml-graphicaleffects libqt5gui5 libqt5location5 libqt5network5 libqt5opengl5 libqt5printsupport5 libqt5qml5 libqt5quick5 libqt5sensors5 libqt5sql5 libqt5svg5 libqt5v8-5 libqt5webkit5 libqt5webkit5-qmlwebkitplugin libqt5widgets5 libsphinxbase1 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-sync0 pocketsphinx-hmm-en-hub4wsj pocketsphinx-lm-en-hub4 sphinx-voxforge-hmm-en sphinx-voxforge-lm-en pocketsphinx-utils qtdeclarative5-qtquick2-plugin qtdeclarative5-ubuntu-ui-toolkit-plugin qtdeclarative5-window-plugin ubuntu-ui-toolkit-theme libqt5multimedia5 libqt5multimediaquick-p5 qtdeclarative5-qtmultimedia-plugin libqt5core5 gallery-app notes-app share-app webbrowser-app webbrowser-app-assets
9+ packages: hud libhud2 libaccounts-qt5-1 libsignon-qt5-1 qtdeclarative5-accounts-plugin qmlscene qtdeclarative5-localstorage-plugin libqt5qml-graphicaleffects libqt5svg5 libhud-client2 libhud-qt1 qtdeclarative5-hud1.0 qtdeclarative5-ubuntu-ui-toolkit-plugin ubuntu-ui-toolkit-theme libqt5multimedia5 libqt5multimediaquick-p5 qtdeclarative5-qtmultimedia-plugin libqt5webkit5-qmlwebkitplugin qtdeclarative5-qtquick2-plugin qtdeclarative5-ubuntu-ui-extras-browser-plugin qtdeclarative5-window-plugin gallery-app notes-app webbrowser-app webbrowser-app-assets share-app
10 testpackages: gallery-app-autopilot notes-app-autopilot share-app-autopilot webbrowser-app-autopilot
11 tests: gallery_app notes_app share_app webbrowser_app
12 ci_default:
13
14=== modified file 'stacks/head/hud.cfg'
15--- stacks/head/hud.cfg 2013-06-25 12:25:34 +0000
16+++ stacks/head/hud.cfg 2013-07-12 14:27:28 +0000
17@@ -21,7 +21,7 @@
18 use_description_for_commit: True
19 test_parameters:
20 apmachines: ati intel
21- packages: libhud-client2 libhud2 libpocketsphinx1 libqt5dbus5 libqt5gui5 libqt5network5 libqt5qml5 libqt5v8-5 libsphinxbase1 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-sync0 pocketsphinx-hmm-en-hub4wsj pocketsphinx-lm-en-hub4 pocketsphinx-utils libqt5core5 hud libhud-qt1 qtdeclarative5-hud1.0 libhud2 sphinx-voxforge-hmm-en sphinx-voxforge-lm-en
22+ packages: libhud-client2 libhud2 hud libhud-qt1 qtdeclarative5-hud1.0 libhud2
23 testpackages: python-autopilot autopilot-desktop recordmydesktop unity-autopilot
24 tests: unity.tests.test_hud unity.tests.test_search.HudSearchTests unity.tests.test_search.HudFuzzySearchTests
25 projects:
26
27=== modified file 'stacks/head/indicators.cfg'
28--- stacks/head/indicators.cfg 2013-07-02 22:12:55 +0000
29+++ stacks/head/indicators.cfg 2013-07-12 14:27:28 +0000
30@@ -19,7 +19,7 @@
31 test_parameters:
32 apmachines: ati intel
33 # remove indicator-netwok from the packages to tests, it's making the whole panel segfaulting
34- packages: gir1.2-dbusmenu-glib-0.4 libqt5core5 bamfdaemon indicator-datetime indicator-messages indicator-application libindicator7 indicator-sound libmessaging-menu0 indicator-printers indicator-power appmenu-qt gir1.2-messagingmenu-1.0 indicator-appmenu libindicator3-7 libbamf3-1 libsync-menu1 libido3-0.1-0 gir1.2-syncmenu-0.1 libido3-0.1-0 libdbusmenu-glib4 indicator-bluetooth telepathy-indicator python-appindicator libappindicator3-1 libappindicator1 gir1.2-appindicator3-0.1 libdbusmenu-qt5 appmenu-qt5 libqmenumodel0 unity-gtk3-module unity-gtk-module-common libunity-gtk3-parser0 unity-gtk2-module libunity-gtk2-parser0
35+ packages: gir1.2-dbusmenu-glib-0.4 bamfdaemon indicator-datetime indicator-messages indicator-application libindicator7 indicator-sound libmessaging-menu0 indicator-printers indicator-power appmenu-qt gir1.2-messagingmenu-1.0 indicator-appmenu libindicator3-7 libbamf3-1 libsync-menu1 libido3-0.1-0 gir1.2-syncmenu-0.1 libido3-0.1-0 libdbusmenu-glib4 indicator-bluetooth telepathy-indicator python-appindicator libappindicator3-1 libappindicator1 gir1.2-appindicator3-0.1 libdbusmenu-qt5 appmenu-qt5 libqmenumodel0 unity-gtk3-module unity-gtk-module-common libunity-gtk3-parser0 unity-gtk2-module libunity-gtk2-parser0
36 testpackages: python-autopilot autopilot-desktop recordmydesktop unity-autopilot unity-gtk-module-autopilot
37 tests: unity.tests.test_panel.PanelCrossMonitorsTests.test_hovering_indicators_on_multiple_monitors unity.tests.test_panel.PanelHoverTests.test_hovering_indicators_open_menus unity.tests.test_panel.PanelHoverTests.test_hovering_over_indicators_does_not_show_app_menus unity.tests.test_panel.PanelHoverTests.test_menus_and_btns_hidden_with_mouse_over_indicators unity.tests.test_panel.PanelIndicatorEntryTests.test_menu_closes_on_click_outside unity.tests.test_panel.PanelIndicatorEntryTests.test_menu_opens_closes_on_click unity.tests.test_panel.PanelIndicatorEntryTests.test_menu_opens_on_click unity.tests.test_panel.PanelKeyNavigationTests.test_panel_indicators_key_navigation_next_works unity.tests.test_panel.PanelKeyNavigationTests.test_panel_indicators_key_navigation_prev_works unity.tests.test_panel.PanelWindowButtonsTests.test_window_buttons_show_when_indicator_active_and_mouse_over_panel unity.tests.test_gobject_introspection unity_gtk_module chewie_client
38 projects:
39
40=== modified file 'stacks/head/media.cfg'
41--- stacks/head/media.cfg 2013-07-05 11:20:58 +0000
42+++ stacks/head/media.cfg 2013-07-12 14:27:28 +0000
43@@ -12,7 +12,7 @@
44 - sdk
45 test_parameters:
46 apmachines: ati intel
47- packages: libqt5multimedia5-plugins sphinx-voxforge-hmm-en sphinx-voxforge-lm-en camera-app cameraplugin-fake gstreamer0.10-ffmpeg hud libavcodec53 libavformat53 libavutil51 libgsm1 libhud-client2 libhud-qt1 qtdeclarative5-hud1.0 libhud2 libpocketsphinx1 libpostproc52 libqgsttools-p1 libqt5core5 libqt5dbus5 libqt5qml-graphicaleffects libqt5gui5 libqt5multimedia5 libqt5multimediaquick-p5 libqt5network5 libqt5qml5 libqt5quick5 libqt5svg5 libqt5v8-5 libqt5widgets5 libqt5xmlpatterns5 libschroedinger-1.0-0 libsphinxbase1 libswscale2 libva1 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-sync0 mediaplayer-app pocketsphinx-hmm-en-hub4wsj pocketsphinx-lm-en-hub4 pocketsphinx-utils qtdeclarative5-qtmultimedia-plugin qtdeclarative5-qtquick2-plugin qtdeclarative5-ubuntu-ui-toolkit-plugin qtdeclarative5-window-plugin qtdeclarative5-xmllistmodel-plugin ubuntu-ui-toolkit-theme
48+ packages: libqt5multimedia5-plugins camera-app cameraplugin-fake hud gstreamer0.10-ffmpeg libhud-client2 libhud-qt1 qtdeclarative5-hud1.0 libhud2 libqgsttools-p1 libqt5qml-graphicaleffects libqt5multimedia5 libqt5multimediaquick-p5 libqt5svg5 qtdeclarative5-qtmultimedia-plugin qtdeclarative5-qtquick2-plugin mediaplayer-app qtdeclarative5-ubuntu-ui-toolkit-plugin ubuntu-ui-toolkit-theme qtdeclarative5-xmllistmodel-plugin libavcodec53 libavformat53 libavutil51 libgsm1 libpostproc52 libqdjango-db0 libqt5xmlpatterns5 libschroedinger-1.0-0 libswscale2 libusermetricsinput1 libva1 qtdeclarative5-window-plugin sqlite3 usermetricsservice
49 testpackages: camera-app-autopilot mediaplayer-app-autopilot
50 tests: camera_app mediaplayer_app
51 ci_default:
52
53=== modified file 'stacks/head/phone.cfg'
54--- stacks/head/phone.cfg 2013-06-27 21:58:49 +0000
55+++ stacks/head/phone.cfg 2013-07-12 14:27:28 +0000
56@@ -13,7 +13,7 @@
57 - sdk
58 test_parameters:
59 apmachines: ati intel
60- packages: hud libhud-client2 libhud-qt1 qtdeclarative5-hud1.0 libhud2 libpocketsphinx1 libqgsttools-p1 libqt5contacts5 libqt5dbus5 libqt5qml-graphicaleffects libqt5gui5 libqt5multimedia5 libqt5network5 libqt5qml5 libqt5quick5 libqt5svg5 libqt5v8-5 libqt5versit5 libqt5widgets5 libqt5xml5 libqtglib-2.0-0 libsphinxbase1 libtelepathy-logger-qt5-0 libtelepathy-qt5-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-sync0 ofono pocketsphinx-hmm-en-hub4wsj pocketsphinx-lm-en-hub4 pocketsphinx-utils python-telepathy qtdeclarative5-qtquick2-plugin qtdeclarative5-ubuntu-ui-toolkit-plugin telepathy-ofono ubuntu-ui-toolkit-theme libqt5core5 phone-app
61+ packages: hud libhud-client2 libhud-qt1 qtdeclarative5-hud1.0 libhud2 libqgsttools-p1 libqt5contacts5 libqt5qml-graphicaleffects libqt5multimedia5 libqt5svg5 libqt5versit5 libqtglib-2.0-0 libtelepathy-logger-qt5-0 libtelepathy-qt5-0 pocketsphinx-utils ofono python-telepathy telepathy-ofono ubuntu-ui-toolkit-theme phone-app
62 testpackages: phone-app-autopilot
63 tests: phone_app
64 ci_default:
65
66=== modified file 'stacks/head/platform.cfg'
67--- stacks/head/platform.cfg 2013-07-02 21:01:35 +0000
68+++ stacks/head/platform.cfg 2013-07-12 14:27:28 +0000
69@@ -7,7 +7,7 @@
70 schedule: 0 2 * * 1-7
71 test_parameters:
72 apmachines: ati intel
73- packages: libdee-1.0-4 libubuntu-location-service0 libplatform-api1-hybris qthybris qtubuntu qtubuntu-sensors libgflags2 libgoogle-glog0 libhybris libqt5gui5 libqt5qml5 libqt5quick5 libqt5sensors5 libqt5v8-5 libunwind8 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-sync0
74+ packages: libdee-1.0-4 libubuntu-location-service0 libplatform-api1-hybris qthybris qtubuntu qtubuntu-sensors libgflags2 libgoogle-glog0 libhybris libandroid-properties1 libunwind8 qtubuntu-android
75 testpackages: python-autopilot autopilot-desktop recordmydesktop unity-autopilot
76 tests: unity.tests.test_home_lens unity.tests.test_dash.DashScopeResultsTests
77 dependencies:
78
79=== modified file 'stacks/head/qa.cfg'
80--- stacks/head/qa.cfg 2013-06-25 12:25:34 +0000
81+++ stacks/head/qa.cfg 2013-07-12 14:27:28 +0000
82@@ -9,7 +9,7 @@
83 test_parameters:
84 apmachines: ati intel
85 # note: had to remove python-ubuntu-platform-api (armhf only)
86- packages: libjs-jquery libjs-underscore python-extras gir1.2-gconf-2.0 gir1.2-gtk-2.0 gir1.2-ibus-1.0 liblttng-ust0 libqt5core5 libqt5dbus5 libqt5gui5 libqt5network5 libqt5qml5 libqt5quick5 libqt5v8-5 libqt5widgets5 liburcu1 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-sync0 python-evdev python-fixtures python-junitxml python-libxslt1 python-support python-testscenarios python-testtools python-xlib recordmydesktop python-autopilot python-autopilot-trace autopilot-desktop python-autopilot-vis libautopilot-gtk libautopilot-qt libautopilot-qt-autopilot dbus-test-runner libdbustest1 gtester2xunit python-pyruntest python-windowmocker libxpathselect1.3 python-mimeparse
87+ packages: liblttng-ust0 liburcu1 python-evdev python-support python-xlib recordmydesktop python-autopilot python-autopilot-trace autopilot-desktop python-autopilot-vis libautopilot-gtk libautopilot-qt libautopilot-qt-autopilot gtester2xunit python-pyruntest python-windowmocker libxpathselect1.3 python-testtools python-testscenarios python-mimeparse python-libxslt1 python-junitxml python-fixtures python-extras libjs-underscore gir1.2-ibus-1.0 gir1.2-gtk-2.0 gir1.2-gconf-2.0
88 testpackages: python-autopilot-tests
89 tests: autopilot
90 ci_default:
91
92=== modified file 'stacks/head/sdk.cfg'
93--- stacks/head/sdk.cfg 2013-07-09 14:41:25 +0000
94+++ stacks/head/sdk.cfg 2013-07-12 14:27:28 +0000
95@@ -27,7 +27,7 @@
96 use_description_for_commit: True
97 test_parameters:
98 apmachines: ati intel
99- packages: libqgsttools-p1 libqt5multimedia5 libqt5multimedia5-plugins libqt5multimediaquick-p5 libqt5network5 libqt5v8-5 libqt5xmlpatterns5 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-sync0 qmlscene qtdeclarative5-qtmultimedia-plugin qtdeclarative5-xmllistmodel-plugin libqt5svg5 libqt5dbus5 libqt5gui5 libqt5qml5 libqt5quick5 libqt5test5 libqt5qml-graphicaleffects libqt5svg5 qtdeclarative5-qtquick2-plugin qtdeclarative5-window-plugin libqt5widgets5 libqt5core5 qtdeclarative5-ubuntu-ui-toolkit-plugin ubuntu-html5-theme ubuntu-html5-theme-examples ubuntu-ui-toolkit-doc ubuntu-ui-toolkit-examples ubuntu-ui-toolkit-theme
100+ packages: libqt5multimedia5 libqt5multimedia5-plugins libqt5multimediaquick-p5 libqt5xmlpatterns5 libqgsttools-p1 qmlscene qtdeclarative5-qtmultimedia-plugin qtdeclarative5-xmllistmodel-plugin qtdeclarative5-qtquick2-plugin libqt5svg5 libqt5qml-graphicaleffects libqt5svg5 qtdeclarative5-window-plugin qtdeclarative5-ubuntu-ui-toolkit-plugin ubuntu-html5-theme ubuntu-html5-theme-examples ubuntu-ui-toolkit-doc ubuntu-ui-toolkit-examples ubuntu-ui-toolkit-theme
101 testpackages: ubuntu-html5-theme-autopilot ubuntu-ui-toolkit-autopilot
102 tests: ubuntu_html5_theme UbuntuUiToolkit
103 projects:
104
105=== modified file 'stacks/head/unity.cfg'
106--- stacks/head/unity.cfg 2013-07-02 14:03:30 +0000
107+++ stacks/head/unity.cfg 2013-07-12 14:27:28 +0000
108@@ -31,7 +31,7 @@
109 local_archive_pocket: saucy
110 test_parameters:
111 apmachines: ati intel
112- packages: libjs-jquery python-keyring python-launchpadlib python-lazr.restfulclient python-lazr.uri python-oauth python-paramiko python-simplejson python-wadllib python3-feedparser unity-scopes-runner libnux-4.0-0 libdecoration0 libunity-misc4 libdee-1.0-4 compiz unity-lens-photos compiz-gnome unity-lens-video unity-lens-files compiz-core unity nux-tools unity-scope-musicstores gir1.2-dee-1.0 libnux-4.0-common unity-common libunity-scopes-json-def-desktop gir1.2-unity-5.0 unity-lens-friends unity-lens-applications unity-lens-music unity-services libunity-core-6.0-7 unity-asset-pool libunity-protocol-private0 libunity9 unity-scope-video-remote unity-scope-gdrive compiz-plugins-default libcompizconfig0 python-secretstorage unity-scope-audacious unity-scope-chromiumbookmarks unity-scope-calculator unity-scope-clementine unity-scope-colourlovers unity-scope-devhelp unity-scope-deviantart unity-scope-firefoxbookmarks unity-scope-gallica unity-scope-github unity-scope-gmusicbrowser unity-scope-googlenews unity-scope-gourmet unity-scope-guayadeque unity-scope-home unity-scope-launchpad unity-scope-manpages unity-scope-musique unity-scope-openclipart unity-scope-openweathermap unity-scope-soundcloud unity-scope-sshsearch unity-scope-texdoc unity-scope-tomboy unity-scope-virtualbox unity-scope-yahoostock unity-scope-yelp unity-scope-zotero unity-scopes-master-default
113+ packages: python-wadllib python-simplejson python-secretstorage python-paramiko python-oauth python-lazr.uri python-lazr.restfulclient python-launchpadlib python-keyring libjs-jquery unity-scopes-runner libnux-4.0-0 libdecoration0 libunity-misc4 libdee-1.0-4 compiz unity-lens-photos compiz-gnome unity-lens-video unity-lens-files compiz-core unity nux-tools unity-scope-musicstores gir1.2-dee-1.0 libnux-4.0-common unity-common libunity-scopes-json-def-desktop gir1.2-unity-5.0 unity-lens-friends unity-lens-applications unity-lens-music unity-services libunity-core-6.0-7 unity-asset-pool libunity-protocol-private0 libunity9 unity-scope-video-remote unity-scope-gdrive compiz-plugins-default libcompizconfig0 unity-scope-audacious unity-scope-chromiumbookmarks unity-scope-calculator unity-scope-clementine unity-scope-colourlovers unity-scope-devhelp unity-scope-deviantart unity-scope-firefoxbookmarks unity-scope-gallica unity-scope-github unity-scope-gmusicbrowser unity-scope-googlenews unity-scope-gourmet unity-scope-guayadeque unity-scope-home unity-scope-launchpad unity-scope-manpages unity-scope-musique unity-scope-openclipart unity-scope-openweathermap unity-scope-soundcloud unity-scope-sshsearch unity-scope-texdoc unity-scope-tomboy unity-scope-virtualbox unity-scope-yahoostock unity-scope-yelp unity-scope-zotero unity-scopes-master-default
114 testpackages: python-autopilot autopilot-desktop recordmydesktop unity-autopilot
115 tests: unity
116 dependencies:

Subscribers

People subscribed via source and target branches

to all changes: