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

[Jeremy Bícha]

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

[lp:~jbicha/unity-control-center/system-config-printer-zesty]

12879. By Jeremy Bícha on 2016-11-25

Add explicit changelog entry

=== 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 @@
+unity-control-center (15.04.0+16.10.20161003.1-0ubuntu3) UNRELEASED; urgency=medium
+
+  * Restore the string change dropped in the previous upload since
+    Ubuntu 17.04 is not in string freeze
+  * Recommend system-config-printer instead of system-config-printer-gnome
+    (LP: #1643129)
+
+ -- Jeremy Bicha <[e-mail]>  Thu, 24 Nov 2016 19:21:53 -0500
+
+unity-control-center (15.04.0+16.10.20161003.1-0ubuntu2) yakkety; urgency=medium
+
+  * panels/user-accounts/um-utils.c: Revert a string freeze break. The old
+    string isn't as precise as the new one, but it still works. This can be
+    reverted after 16.10.
+
+ -- Iain Lane <[e-mail]>  Wed, 05 Oct 2016 10:14:56 +0100
+
 unity-control-center (15.04.0+16.10.20161003.1-0ubuntu1) yakkety; urgency=medium
 
   [ Robert Ancell ]

=== 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 @@
             mousetweaks,
             policykit-1-gnome,
             libcanberra-pulse,
-            system-config-printer-gnome,
+            system-config-printer,
             unity-control-center-faces,
 Conflicts: gnome-control-center (<< 1:3.6.3-0ubuntu50),
            gnome-control-center-unity,