Merge lp:~osomon/ubuntu-calendar-app/deps-cleanup into lp:ubuntu-calendar-app

Proposed by Olivier Tilloy
Status: Merged
Approved by: Renato Araujo Oliveira Filho
Approved revision: 855
Merged at revision: 851
Proposed branch: lp:~osomon/ubuntu-calendar-app/deps-cleanup
Merge into: lp:ubuntu-calendar-app
Diff against target: 59 lines (+14/-16)
1 file modified
debian/control (+14/-16)
To merge this branch: bzr merge lp:~osomon/ubuntu-calendar-app/deps-cleanup
Reviewer Review Type Date Requested Status
Renato Araujo Oliveira Filho (community) Approve
Ken VanDine packaging Approve
system-apps-ci-bot continuous-integration Needs Fixing
Jenkins Bot continuous-integration Approve
Review via email: mp+298435@code.launchpad.net

Commit message

Debian package dependency cleanup:
  - depend on qml-module-* packages
  - add build dependency on qml-module-qtorganizer (for unit tests)
  - depend on autopilot-qt5
  - sort dependencies alphabetically

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:851
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-calendar-app-ci/5/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/745/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/745
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/692
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/692
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/692
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/684/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/684/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/684/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/684/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/684/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/684/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/684/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/684/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/684/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-calendar-app-ci/5/rebuild

review: Needs Fixing (continuous-integration)
852. By Olivier Tilloy

Use qml-module-ubuntu-components.

853. By Olivier Tilloy

Add missing deps.

854. By Olivier Tilloy

Remove superfluous implicit dependencies.

855. By Olivier Tilloy

Remove an unused dependency.

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:855
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-calendar-app-ci/8/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/749/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/749
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/696
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/696
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/696
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/688/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/688/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/688/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/688/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/688/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/688/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/688/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/688/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/688/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-calendar-app-ci/8/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Packaging changes look fine

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

looks good.

review: Approve

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 2014-09-19 11:35:21 +0000
3+++ debian/control 2016-06-27 18:37:12 +0000
4@@ -5,10 +5,12 @@
5 debhelper (>= 9),
6 intltool,
7 python3,
8+ qml-module-qtorganizer,
9+ qml-module-qtquick2,
10+ qml-module-qttest,
11+ qml-module-ubuntu-components,
12+ qt5-default,
13 qtdeclarative5-dev-tools,
14- qt5-default,
15- qtdeclarative5-qtquick2-plugin,
16- qtdeclarative5-test-plugin,
17 Standards-Version: 3.9.4
18 Section: misc
19 Homepage: https://launchpad.net/ubuntu-calendar-app
20@@ -18,17 +20,14 @@
21 Architecture: all
22 Depends: ${misc:Depends},
23 qmlscene,
24- qtdeclarative5-quicklayouts-plugin,
25- qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
26- ${misc:Depends},
27- libqt5organizer5,
28- qtdeclarative5-qtorganizer-plugin,
29+ qml-module-qt-labs-settings,
30+ qml-module-qtcontacts,
31+ qml-module-qtorganizer,
32+ qml-module-ubuntu-components,
33+ qtcontact5-galera,
34+ qtdeclarative5-ubuntu-syncmonitor0.1,
35 qtorganizer5-eds,
36- qtdeclarative5-ubuntu-syncmonitor0.1,
37 ubuntu-mobile-icons | suru-icon-theme,
38- libqt5contacts5,
39- qtdeclarative5-qtcontacts-plugin,
40- qtcontact5-galera,
41 Description: Calendar application for Ubuntu devices
42 The Calendar application for Ubuntu devices lets you organise your life your
43 way by month, week or daily diary.
44@@ -39,13 +38,12 @@
45
46 Package: calendar-app-autopilot
47 Architecture: all
48-Depends: libautopilot-qt (>= 1.4),
49- libqt5test5,
50+Depends: address-book-service-dummy,
51+ address-book-service-testability,
52+ autopilot-qt5,
53 calendar-app (= ${source:Version}),
54 python3-dateutil,
55 ubuntu-ui-toolkit-autopilot,
56- address-book-service-dummy,
57- address-book-service-testability
58 Description: Autopilot tests for Ubuntu Calendar Application
59 This package contains autopilot tests for the Ubuntu Calendar application.
60

Subscribers

People subscribed via source and target branches

to status/vote changes: