Merge lp:~jbicha/unity-control-center/system-config-printer-zesty into lp:unity-control-center

Proposed by Jeremy Bicha on 2016-11-25
Status: Merged
Merged at revision: 12877
Proposed branch: lp:~jbicha/unity-control-center/system-config-printer-zesty
Merge into: lp:unity-control-center
Diff against target: 37 lines (+18/-1)
2 files modified
debian/changelog (+17/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~jbicha/unity-control-center/system-config-printer-zesty
Reviewer Review Type Date Requested Status
Unity Control Center development team 2016-11-25 Pending
Review via email: mp+311784@code.launchpad.net

Commit message

 Recommend system-config-printer instead of system-config-printer-gnome (LP: #1643129)

To post a comment you must log in.
12879. By Jeremy Bicha on 2016-11-25

Add explicit changelog entry

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2016-10-03 11:19:09 +0000
+++ debian/changelog 2016-11-25 00:24:43 +0000
@@ -1,3 +1,20 @@
1unity-control-center (15.04.0+16.10.20161003.1-0ubuntu3) UNRELEASED; urgency=medium
2
3 * Restore the string change dropped in the previous upload since
4 Ubuntu 17.04 is not in string freeze
5 * Recommend system-config-printer instead of system-config-printer-gnome
6 (LP: #1643129)
7
8 -- Jeremy Bicha <jbicha@ubuntu.com> Thu, 24 Nov 2016 19:21:53 -0500
9
10unity-control-center (15.04.0+16.10.20161003.1-0ubuntu2) yakkety; urgency=medium
11
12 * panels/user-accounts/um-utils.c: Revert a string freeze break. The old
13 string isn't as precise as the new one, but it still works. This can be
14 reverted after 16.10.
15
16 -- Iain Lane <iain.lane@canonical.com> Wed, 05 Oct 2016 10:14:56 +0100
17
1unity-control-center (15.04.0+16.10.20161003.1-0ubuntu1) yakkety; urgency=medium18unity-control-center (15.04.0+16.10.20161003.1-0ubuntu1) yakkety; urgency=medium
219
3 [ Robert Ancell ]20 [ Robert Ancell ]
421
=== modified file 'debian/control'
--- debian/control 2016-10-03 11:14:01 +0000
+++ debian/control 2016-11-25 00:24:43 +0000
@@ -90,7 +90,7 @@
90 mousetweaks,90 mousetweaks,
91 policykit-1-gnome,91 policykit-1-gnome,
92 libcanberra-pulse,92 libcanberra-pulse,
93 system-config-printer-gnome,93 system-config-printer,
94 unity-control-center-faces,94 unity-control-center-faces,
95Conflicts: gnome-control-center (<< 1:3.6.3-0ubuntu50),95Conflicts: gnome-control-center (<< 1:3.6.3-0ubuntu50),
96 gnome-control-center-unity,96 gnome-control-center-unity,

Subscribers

People subscribed via source and target branches