Merge lp:~jonas-drange/ubuntu-settings-components/fixes-packaging into lp:~phablet-team/ubuntu-settings-components/printer-components

Proposed by Jonas G. Drange
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 212
Merged at revision: 211
Proposed branch: lp:~jonas-drange/ubuntu-settings-components/fixes-packaging
Merge into: lp:~phablet-team/ubuntu-settings-components/printer-components
Diff against target: 37 lines (+9/-0)
3 files modified
debian/changelog (+7/-0)
debian/control (+1/-0)
debian/qml-module-ubuntu-settings-components.install (+1/-0)
To merge this branch: bzr merge lp:~jonas-drange/ubuntu-settings-components/fixes-packaging
Reviewer Review Type Date Requested Status
Andrew Hayzen (community) Approve
Review via email: mp+315358@code.launchpad.net
To post a comment you must log in.
212. By Jonas G. Drange

depends on libqt5printsupport5

Revision history for this message
Andrew Hayzen (ahayzen) wrote :

LGTM, the only other thing as we discussed is you may need to depend on libcups2 rather than just recommending cups - but we can figure that out later to get this building in silos.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-12-01 00:34:17 +0000
3+++ debian/changelog 2017-01-23 13:52:32 +0000
4@@ -1,3 +1,10 @@
5+ubuntu-settings-components (0.12+17.04.20161201-0ubuntu2) UNRELEASED; urgency=medium
6+
7+ * packaging: suggest cups, depend on libcups2-dev
8+ * adds cups bindings for printer/job management
9+
10+ -- Jonas G. Drange <jonas.drange@canonical.com> Mon, 23 Jan 2017 14:46:41 +0100
11+
12 ubuntu-settings-components (0.11+17.04.20161201-0ubuntu1) zesty; urgency=medium
13
14 * dateExt: take care of the numbers of days in month when adding
15
16=== modified file 'debian/control'
17--- debian/control 2017-01-09 11:44:08 +0000
18+++ debian/control 2017-01-23 13:52:32 +0000
19@@ -5,6 +5,7 @@
20 Build-Depends: cmake,
21 cmake-extras (>= 0.6),
22 libcups2-dev,
23+ libqt5printsupport5,
24 debhelper (>= 9),
25 pkg-config,
26 python3:any,
27
28=== modified file 'debian/qml-module-ubuntu-settings-components.install'
29--- debian/qml-module-ubuntu-settings-components.install 2016-08-17 10:29:44 +0000
30+++ debian/qml-module-ubuntu-settings-components.install 2017-01-23 13:52:32 +0000
31@@ -1,5 +1,6 @@
32 usr/lib/*/qt5/qml/Ubuntu/Settings/Components
33 usr/lib/*/qt5/qml/Ubuntu/Settings/Fingerprint
34 usr/lib/*/qt5/qml/Ubuntu/Settings/Menus
35+usr/lib/*/qt5/qml/Ubuntu/Settings/Printers
36 usr/lib/*/qt5/qml/Ubuntu/Settings/Vpn
37 usr/share/locale

Subscribers

People subscribed via source and target branches