Merge lp:~sil2100/cupstream2distro-config/rename_libhud-qt into lp:cupstream2distro-config

Proposed by Łukasz Zemczak
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 228
Merged at revision: 229
Proposed branch: lp:~sil2100/cupstream2distro-config/rename_libhud-qt
Merge into: lp:cupstream2distro-config
Diff against target: 51 lines (+4/-4)
4 files modified
stacks/head/apps.cfg (+1/-1)
stacks/head/hud.cfg (+1/-1)
stacks/head/media.cfg (+1/-1)
stacks/head/phone.cfg (+1/-1)
To merge this branch: bzr merge lp:~sil2100/cupstream2distro-config/rename_libhud-qt
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+160380@code.launchpad.net

Commit message

Rename libhud-qt and libhud-qt-qml to the new, proper naming

Description of the change

- Problem:

https://code.launchpad.net/~ken-vandine/libhud-qt/versioned/+merge/160363
Once this merge gets in, libhud-qt will be renamed to libhud-qt1 and libhud-qt-qml to qtdeclarative5-hud1.0. This will break the packages in the packages list.

- Fix:

Rename libhud-qt and libhud-qt-qml.

- Tests:

N/A

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

excellent! will redeploy :)

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-04-23 13:19:02 +0000
3+++ stacks/head/apps.cfg 2013-04-23 14:23:29 +0000
4@@ -10,7 +10,7 @@
5 - sdk
6 - hud
7 test_parameters:
8- packages: libqt5sql5-sqlite julius julius-voxforge libhud-client2 libhud-qt libhud-qt-qml libhud1 libpocketsphinx1 libqt53d5 libqt5dbus5 libqt5graphicaleffects5 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 pocketsphinx-utils qtdeclarative5-qtquick2-plugin qtdeclarative5-ubuntu-ui-toolkit-plugin qtdeclarative5-window-plugin ubuntu-ui-toolkit-theme libqt5core5 gallery-app webbrowser-app
9+ packages: libqt5sql5-sqlite julius julius-voxforge libhud-client2 libhud-qt1 qtdeclarative5-hud1.0 libhud1 libpocketsphinx1 libqt53d5 libqt5dbus5 libqt5graphicaleffects5 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 pocketsphinx-utils qtdeclarative5-qtquick2-plugin qtdeclarative5-ubuntu-ui-toolkit-plugin qtdeclarative5-window-plugin ubuntu-ui-toolkit-theme libqt5core5 gallery-app webbrowser-app
10 testpackages: gallery-app-autopilot webbrowser-app-autopilot
11 tests: gallery_app webbrowser_app
12 ci_default:
13
14=== modified file 'stacks/head/hud.cfg'
15--- stacks/head/hud.cfg 2013-04-16 08:43:38 +0000
16+++ stacks/head/hud.cfg 2013-04-23 14:23:29 +0000
17@@ -20,7 +20,7 @@
18 contact_email: allan.lesage@canonical.com
19 use_description_for_commit: True
20 test_parameters:
21- packages: julius julius-voxforge libhud-client2 libhud1 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-qt libhud-qt-qml
22+ packages: julius julius-voxforge libhud-client2 libhud1 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
23 testpackages: 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/media.cfg'
28--- stacks/head/media.cfg 2013-04-23 13:19:02 +0000
29+++ stacks/head/media.cfg 2013-04-23 14:23:29 +0000
30@@ -11,7 +11,7 @@
31 - qa
32 - sdk
33 test_parameters:
34- packages: camera-app cameraplugin-aal cameraplugin-fake gstreamer0.10-ffmpeg hud julius julius-voxforge libavcodec53 libavformat53 libavutil51 libgsm1 libhud-client2 libhud-qt libhud-qt-qml libhud1 libpocketsphinx1 libpostproc52 libqgsttools-p1 libqt5core5 libqt5dbus5 libqt5graphicaleffects5 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
35+ packages: camera-app cameraplugin-aal cameraplugin-fake gstreamer0.10-ffmpeg hud julius julius-voxforge libavcodec53 libavformat53 libavutil51 libgsm1 libhud-client2 libhud-qt1 qtdeclarative5-hud1.0 libhud1 libpocketsphinx1 libpostproc52 libqgsttools-p1 libqt5core5 libqt5dbus5 libqt5graphicaleffects5 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
36 testpackages: camera-app-autopilot mediaplayer-app-autopilot
37 tests: camera_app mediaplayer_app
38 ci_default:
39
40=== modified file 'stacks/head/phone.cfg'
41--- stacks/head/phone.cfg 2013-04-23 13:19:02 +0000
42+++ stacks/head/phone.cfg 2013-04-23 14:23:29 +0000
43@@ -12,7 +12,7 @@
44 - hud
45 - sdk
46 test_parameters:
47- packages: hud julius julius-voxforge libhud-client2 libhud-qt libhud-qt-qml libhud1 libpocketsphinx1 libqgsttools-p1 libqt5contacts5 libqt5dbus5 libqt5graphicaleffects5 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
48+ packages: hud julius julius-voxforge libhud-client2 libhud-qt1 qtdeclarative5-hud1.0 libhud1 libpocketsphinx1 libqgsttools-p1 libqt5contacts5 libqt5dbus5 libqt5graphicaleffects5 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
49 testpackages: phone-app-autopilot
50 tests: phone_app
51 ci_default:

Subscribers

People subscribed via source and target branches

to all changes: