address-book-app

Merge lp:~timo-jyrinki/address-book-app/stop_depending_on_transitional_packages into lp:address-book-app

  1. stop_depending_on_transitional_packages
  2. Merge into trunk
Proposed by Timo Jyrinki
Status: Approved
Approved by: Renato Araujo Oliveira Filho
Approved revision: 584
Proposed branch: lp:~timo-jyrinki/address-book-app/stop_depending_on_transitional_packages
Merge into: lp:address-book-app
Diff against target: 57 lines (+10/-10)
1 file modified
debian/control (+10/-10)
To merge this branch: bzr merge lp:~timo-jyrinki/address-book-app/stop_depending_on_transitional_packages
Reviewer Review Type Date Requested Status
Renato Araujo Oliveira Filho (community) Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+295035@code.launchpad.net

Commit message

Stop depending on transitional packages. (LP: #1583079)

To post a comment you must log in.
lp:~timo-jyrinki/address-book-app/stop_depending_on_transitional_packages updated
584. By Timo Jyrinki

fix typo

Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

looks good.

review: Approve
Reply

Unmerged revisions

584. By Timo Jyrinki

fix typo

583. By Timo Jyrinki

Stop depending on transitional packages. (LP: #1583079)

582. By Timo Jyrinki

Stop depending on transitional packages. (LP: #1583079)

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-01-05 13:54:23 +0000
3+++ debian/control 2016-05-18 12:54:52 +0000
4@@ -14,13 +14,13 @@
5 qtdeclarative5-dev-tools [i386 amd64 armhf],
6 qtdeclarative5-gsettings1.0 [i386 amd64 armhf],
7 qtdeclarative5-ofono0.2 [i386 amd64 armhf],
8- qtdeclarative5-qtcontacts-plugin [i386 amd64 armhf],
9+ qml-module-qtcontacts [i386 amd64 armhf],
10 qtdeclarative5-ubuntu-content1 [i386 amd64 armhf],
11 qtdeclarative5-ubuntu-history0.1 [i386 amd64 armhf],
12 qtdeclarative5-ubuntu-keyboard-extensions0.1 [i386 amd64 armhf],
13 qtdeclarative5-buteo-syncfw0.1 [i386 amd64 armhf],
14 qtdeclarative5-ubuntu-telephony-phonenumber0.1 [i386 amd64 armhf],
15- qtdeclarative5-ubuntu-ui-toolkit-plugin [i386 amd64 armhf],
16+ qml-module-ubuntu-components [i386 amd64 armhf],
17 qt5-default,
18 qtbase5-dev,
19 qtdeclarative5-dev,
20@@ -45,8 +45,8 @@
21 qmlscene,
22 qtcontact5-galera,
23 qtdeclarative5-gsettings1.0,
24- qtdeclarative5-qtcontacts-plugin,
25- qtdeclarative5-qtquick2-plugin,
26+ qml-module-qtcontacts,
27+ qml-module-qtquick2,
28 qtdeclarative5-ofono0.2,
29 qtdeclarative5-ubuntu-addressbook0.1 (= ${binary:Version}),
30 qtdeclarative5-ubuntu-history0.1,
31@@ -60,12 +60,12 @@
32
33 Package: qtdeclarative5-ubuntu-contacts0.1
34 Architecture: any
35-Depends: qtdeclarative5-accounts-plugin,
36- qtdeclarative5-online-accounts-client0.1,
37- qtdeclarative5-qtquick2-plugin,
38+Depends: qml-module-ubuntu-onlineaccounts,
39+ qml-module-ubuntu-onlineaccounts-client,
40+ qml-module-qtquick2,
41 qtdeclarative5-buteo-syncfw0.1,
42- qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.46+14.10.20140527) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
43- qtdeclarative5-qtcontacts-plugin,
44+ qml-module-ubuntu-components (>= 0.1.46+14.10.20140527) | qml-module-ubuntu-components-gles,
45+ qml-module-qtcontacts,
46 suru-icon-theme,
47 ${misc:Depends},
48 ${shlibs:Depends},
49@@ -108,7 +108,7 @@
50 libqt5widgets5,
51 ofono-phonesim-autostart,
52 python-testscenarios,
53- qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.49+14.10.20140707) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
54+ qml-module-ubuntu-components (>= 0.1.49+14.10.20140707) | qml-module-ubuntu-components-gles,
55 ubuntu-ui-toolkit-autopilot (>= 0.1.46+14.10.20140527),
56 address-book-app (>= ${binary:Version}),
57 ubuntu-mobile-icons,

Subscribers

People subscribed via source and target branches