Merge lp:~mardy/ubuntu-system-settings-online-accounts/stop_depending_on_transitional_packages into lp:ubuntu-system-settings-online-accounts

Proposed by Alberto Mardegan
Status: Merged
Approved by: David Barth
Approved revision: 355
Merged at revision: 357
Proposed branch: lp:~mardy/ubuntu-system-settings-online-accounts/stop_depending_on_transitional_packages
Merge into: lp:ubuntu-system-settings-online-accounts
Diff against target: 38 lines (+7/-7)
1 file modified
debian/control (+7/-7)
To merge this branch: bzr merge lp:~mardy/ubuntu-system-settings-online-accounts/stop_depending_on_transitional_packages
Reviewer Review Type Date Requested Status
Alberto Mardegan Pending
PS Jenkins bot continuous-integration Pending
Review via email: mp+295562@code.launchpad.net

This proposal supersedes a proposal from 2016-05-18.

Commit message

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

Description of the change

Don't depend on transitional packages

To post a comment you must log in.
Revision history for this message
Alberto Mardegan (mardy) wrote : Posted in a previous version of this proposal

LGTM, thanks!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
--- debian/control 2016-02-16 07:54:56 +0000
+++ debian/control 2016-05-24 09:26:48 +0000
@@ -17,10 +17,10 @@
17 qt5-default,17 qt5-default,
18 qtbase5-dev (>= 5.4),18 qtbase5-dev (>= 5.4),
19 qtdeclarative5-dev,19 qtdeclarative5-dev,
20 qtdeclarative5-accounts-plugin,20 qml-module-ubuntu-onlineaccounts,
21 qtdeclarative5-qtquick2-plugin,21 qml-module-qtquick2,
22 qtdeclarative5-test-plugin,22 qml-module-ubuntu-components,
23 qtdeclarative5-ubuntu-ui-toolkit-plugin,23 qml-module-ubuntu-test,
24 signon-plugins-dev (>= 8.58),24 signon-plugins-dev (>= 8.58),
25 dbus-test-runner,25 dbus-test-runner,
26 xmldiff,26 xmldiff,
@@ -42,8 +42,8 @@
42 libonline-accounts-daemon1,42 libonline-accounts-daemon1,
43 liboxideqt-qmlplugin (>= 1.2.0) [!arm64 !powerpc !ppc64el !s390x],43 liboxideqt-qmlplugin (>= 1.2.0) [!arm64 !powerpc !ppc64el !s390x],
44 qml-module-ubuntu-onlineaccounts2,44 qml-module-ubuntu-onlineaccounts2,
45 qtdeclarative5-accounts-plugin (>= 0.6),45 qml-module-ubuntu-onlineaccounts (>= 0.6),
46 qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,46 qml-module-ubuntu-components | qml-module-ubuntu-components-gles,
47 signon-ui-service,47 signon-ui-service,
48 ubuntu-system-settings48 ubuntu-system-settings
49Conflicts: account-plugin-windows-live, online-accounts-daemon49Conflicts: account-plugin-windows-live, online-accounts-daemon
@@ -89,7 +89,7 @@
89Architecture: any89Architecture: any
90Depends: ${misc:Depends},90Depends: ${misc:Depends},
91 ${shlibs:Depends},91 ${shlibs:Depends},
92 qtdeclarative5-qtquick2-plugin,92 qml-module-qtquick2,
93Breaks: qtdeclarative5-online-accounts-client0.1 (<< 0.5)93Breaks: qtdeclarative5-online-accounts-client0.1 (<< 0.5)
94Replaces: qtdeclarative5-online-accounts-client0.1 (<< 0.5)94Replaces: qtdeclarative5-online-accounts-client0.1 (<< 0.5)
95Description: Online Accounts panel library for QML applications95Description: Online Accounts panel library for QML applications

Subscribers

People subscribed via source and target branches