Merge lp:~mitya57/unity-control-center/lp1484658 into lp:unity-control-center

[Dmitry Shachnev]

Bump gnome-bluetooth Breaks/Replaces to 3.11.3, to resolve file conflict.

Bump gnome-bluetooth Breaks/Replaces to 3.11.3, to resolve file conflict.

dpkg: error processing archive /var/cache/apt/archives/unity-control-center_15.04.0+15.10.20150813-0ubuntu1_i386.deb (--unpack):
 trying to overwrite '/usr/share/man/man1/bluetooth-wizard.1.gz', which is also in package gnome-bluetooth 3.8.2.1-0ubuntu12

[Sebastien Bacher (seb128)]

thanks

review: Approve

=== modified file 'debian/control'
--- debian/control	2015-03-12 19:18:11 +0000
+++ debian/control	2015-08-14 08:12:42 +0000
@@ -94,13 +94,13 @@
 Conflicts: gnome-control-center (<< 1:3.6.3-0ubuntu50),
            gnome-control-center-unity,
            unity-control-center-datetime
-Replaces: gnome-bluetooth (<< 3.4.0),
+Replaces: gnome-bluetooth (<< 3.11.3),
           gnome-control-center-unity,
           unity-control-center-datetime
 Breaks: gnome-power-manager (<< 3.0),
         gnome-session (<< 3.0),
         libglib2.0-0 (<< 2.28.6-2),
-        gnome-bluetooth (<< 3.4.0),
+        gnome-bluetooth (<< 3.11.3),
         compiz (<< 1:0.9.8+bzr330),
         metacity (<< 1:2.34.2),
         unity (<< 6.2-0ubuntu2~)