Merge lp:~timo-jyrinki/ubuntuone-credentials/stop_depending_on_transitional_packages into lp:ubuntuone-credentials

[Timo Jyrinki]

Stop depending on transitional packages. (LP: #1583079) Run wrap-and-sort -a -t -s on the packaging.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:242
http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-ci/158/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-wily-amd64-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-wily-armhf-ci/35/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntuone-credentials-wily-i386-ci/35/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntuone-credentials-ci/158/rebuild

review: Needs Fixing (continuous-integration)

[dobey (dobey)]

Please move the changed dependencies to their appropriate place for alphabetical sorting.

review: Needs Fixing

[lp:~timo-jyrinki/ubuntuone-credentials/stop_depending_on_transitional_packages]

243. By Timo Jyrinki on 2016-05-19

Run wrap-and-sort.

[Timo Jyrinki (timo-jyrinki)]

Done, with automation (wrap-and-sort tool).

[dobey (dobey)]

Please re-run wrap-and-sort with -s if you're going to run that, to avoid changing all the dependency lines.

[lp:~timo-jyrinki/ubuntuone-credentials/stop_depending_on_transitional_packages]

244. By Timo Jyrinki on 2016-05-19

-s instead

[dobey (dobey)]

review: Approve

=== modified file 'debian/control'
--- debian/control	2016-04-27 14:07:35 +0000
+++ debian/control	2016-05-19 17:41:53 +0000
@@ -10,11 +10,11 @@
  liboauth-dev,
  libsignon-qt5-dev,
  pkg-config,
+ python3-all:native,
+ qml-module-ubuntu-components,
  qtbase5-dev,
  qtdeclarative5-dev,
  qtdeclarative5-dev-tools,
- qtdeclarative5-ubuntu-ui-toolkit-plugin,
- python3-all:native,
  signon-plugins-dev (>= 8.58),
  ubuntu-ui-toolkit-autopilot:native,
  xvfb,
@@ -52,9 +52,9 @@
  python3-testtools,
  qml-module-qtquick2,
  qml-module-qttest,
+ qml-module-ubuntu-components | qml-module-ubuntu-components-gles,
+ qml-module-ubuntu-onlineaccounts,
  qml-module-ubuntuone,
- qml-module-ubuntu-onlineaccounts,
- qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
  qttestability-autopilot | libautopilot-qt,
  ubuntu-keyboard-autopilot,
  ubuntu-ui-toolkit-autopilot,
@@ -118,7 +118,7 @@
  ${misc:Pre-Depends},
 Depends:
  libubuntuoneauth-2.0-0 (= ${binary:Version}),
- qtdeclarative5-ubuntu-ui-toolkit-plugin,
+ qml-module-ubuntu-components,
  ${misc:Depends},
  ${shlibs:Depends},
 Breaks: