← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

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

 

Olivier Tilloy has proposed merging lp:~osomon/ubuntu-calendar-app/deps-cleanup into lp:ubuntu-calendar-app.

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

Requested reviews:
  Ubuntu Calendar Developers (ubuntu-calendar-dev)

For more details, see:
https://code.launchpad.net/~osomon/ubuntu-calendar-app/deps-cleanup/+merge/298435
-- 
Your team Ubuntu Calendar Developers is requested to review the proposed merge of lp:~osomon/ubuntu-calendar-app/deps-cleanup into lp:ubuntu-calendar-app.
=== modified file 'debian/control'
--- debian/control	2014-09-19 11:35:21 +0000
+++ debian/control	2016-06-27 15:26:36 +0000
@@ -5,10 +5,11 @@
                debhelper (>= 9),
                intltool,
                python3,
+               qml-module-qtorganizer,
+               qml-module-qtquick2,
+               qml-module-qttest,
+               qt5-default,
                qtdeclarative5-dev-tools,
-               qt5-default,
-               qtdeclarative5-qtquick2-plugin,
-               qtdeclarative5-test-plugin,
 Standards-Version: 3.9.4
 Section: misc
 Homepage: https://launchpad.net/ubuntu-calendar-app
@@ -17,18 +18,17 @@
 Package: calendar-app
 Architecture: all
 Depends: ${misc:Depends},
+         libqt5contacts5,
+         libqt5organizer5,
          qmlscene,
-         qtdeclarative5-quicklayouts-plugin,
+         qml-module-qtcontacts,
+         qml-module-qtorganizer,
+         qml-module-qtquick-layouts,
+         qtcontact5-galera,
+         qtdeclarative5-ubuntu-syncmonitor0.1,
          qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
-         ${misc:Depends},
-         libqt5organizer5,
-         qtdeclarative5-qtorganizer-plugin,
          qtorganizer5-eds,
-         qtdeclarative5-ubuntu-syncmonitor0.1,
          ubuntu-mobile-icons | suru-icon-theme,
-         libqt5contacts5,
-         qtdeclarative5-qtcontacts-plugin,
-         qtcontact5-galera,
 Description: Calendar application for Ubuntu devices
  The Calendar application for Ubuntu devices lets you organise your life your
  way by month, week or daily diary.
@@ -39,13 +39,12 @@
 
 Package: calendar-app-autopilot
 Architecture: all
-Depends: libautopilot-qt (>= 1.4),
-         libqt5test5,
+Depends: address-book-service-dummy,
+         address-book-service-testability,
+         autopilot-qt5,
          calendar-app (= ${source:Version}),
          python3-dateutil,
          ubuntu-ui-toolkit-autopilot,
-         address-book-service-dummy,
-         address-book-service-testability
 Description: Autopilot tests for Ubuntu Calendar Application
  This package contains autopilot tests for the Ubuntu Calendar application.
 


Follow ups