address-book-app

Merge lp:~sil2100/address-book-app/no_uitk_transitional into lp:address-book-app

  1. no_uitk_transitional
  2. Merge into trunk
Proposed by Łukasz Zemczak on 2016-09-01
Status: Merged
Approved by: Timo Jyrinki on 2016-09-23
Approved revision: 625
Merged at revision: 639
Proposed branch: lp:~sil2100/address-book-app/no_uitk_transitional
Merge into: lp:address-book-app
Diff against target: 61 lines (+6/-6)
2 files modified
debian/control (+3/-3)
debian/control.in (+3/-3)
To merge this branch: bzr merge lp:~sil2100/address-book-app/no_uitk_transitional
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team 2016-09-01 Pending
Review via email: mp+304623@code.launchpad.net

Commit Message

Do not depend on the transitional UITK declarative package. This should essentially fix touch-image build issues on non-arm platforms (yakkety).

Description of the Change

Do not depend on the transitional UITK declarative package. This should essentially fix touch-image build issues on non-arm platforms (yakkety).

Testing if it helps first.

To post a comment you must log in.
Timo Jyrinki (timo-jyrinki) wrote :

Great!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2016-08-23 14:40:36 +0000
3+++ debian/control 2016-09-01 11:31:00 +0000
4@@ -27,7 +27,7 @@
5 qtdeclarative5-ubuntu-keyboard-extensions0.1 [amd64 armhf i386],
6 qtdeclarative5-buteo-syncfw0.1 [amd64 armhf i386],
7 qtdeclarative5-ubuntu-telephony-phonenumber0.1 [amd64 armhf i386],
8- qtdeclarative5-ubuntu-ui-toolkit-plugin [amd64 armhf i386],
9+ qml-module-ubuntu-components [amd64 armhf i386],
10 qt5-default,
11 qtbase5-dev,
12 qtdeclarative5-dev,
13@@ -72,7 +72,7 @@
14 qtdeclarative5-online-accounts-client0.1,
15 qtdeclarative5-qtquick2-plugin,
16 qtdeclarative5-buteo-syncfw0.1,
17- qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.46+14.10.20140527) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
18+ qml-module-ubuntu-components (>= 0.1.46+14.10.20140527) | qml-module-ubuntu-components-gles,
19 qtdeclarative5-qtcontacts-plugin,
20 suru-icon-theme,
21 ${misc:Depends},
22@@ -116,7 +116,7 @@
23 libqt5widgets5,
24 ofono-phonesim-autostart,
25 python-testscenarios,
26- qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49+14.10.20140707) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
27+ qml-module-ubuntu-components (>= 0.1.49+14.10.20140707) | qml-module-ubuntu-components-gles,
28 ubuntu-ui-toolkit-autopilot (>= 0.1.46+14.10.20140527),
29 address-book-app (>= ${binary:Version}),
30 ubuntu-mobile-icons,
31
32=== modified file 'debian/control.in'
33--- debian/control.in 2016-08-22 18:08:35 +0000
34+++ debian/control.in 2016-09-01 11:31:00 +0000
35@@ -20,7 +20,7 @@
36 qtdeclarative5-ubuntu-keyboard-extensions0.1 [@ARCHS@],
37 qtdeclarative5-buteo-syncfw0.1 [@ARCHS@],
38 qtdeclarative5-ubuntu-telephony-phonenumber0.1 [@ARCHS@],
39- qtdeclarative5-ubuntu-ui-toolkit-plugin [@ARCHS@],
40+ qml-module-ubuntu-components [@ARCHS@],
41 qt5-default,
42 qtbase5-dev,
43 qtdeclarative5-dev,
44@@ -65,7 +65,7 @@
45 qtdeclarative5-online-accounts-client0.1,
46 qtdeclarative5-qtquick2-plugin,
47 qtdeclarative5-buteo-syncfw0.1,
48- qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.46+14.10.20140527) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
49+ qml-module-ubuntu-components (>= 0.1.46+14.10.20140527) | qml-module-ubuntu-components-gles,
50 qtdeclarative5-qtcontacts-plugin,
51 suru-icon-theme,
52 ${misc:Depends},
53@@ -109,7 +109,7 @@
54 libqt5widgets5,
55 ofono-phonesim-autostart,
56 python-testscenarios,
57- qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49+14.10.20140707) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
58+ qml-module-ubuntu-components (>= 0.1.49+14.10.20140707) | qml-module-ubuntu-components-gles,
59 ubuntu-ui-toolkit-autopilot (>= 0.1.46+14.10.20140527),
60 address-book-app (>= ${binary:Version}),
61 ubuntu-mobile-icons,

Subscribers

People subscribed via source and target branches