Merge lp:~sil2100/libunity/sync_trunk into lp:libunity

[Łukasz Zemczak]

Sync trunk with distro

Sync trunk with distro

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:304
http://jenkins.qa.ubuntu.com/job/libunity-ci/129/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-amd64-ci/114
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-armhf-ci/114
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libunity-saucy-i386-ci/114

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/libunity-ci/129/rebuild

review: Approve (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

Approve.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-10 00:08:06 +0000
+++ debian/changelog	2013-10-22 17:43:28 +0000
@@ -1,3 +1,10 @@
+libunity (7.1.2+13.10.20131010-0ubuntu2) saucy; urgency=low
+
+  * Declare a Breaks: against unity-common (<< 7.1.2) to help apt calculate
+    the upgrade from raring properly.  LP: #1241420.
+
+ -- Steve Langasek <[e-mail]>  Fri, 18 Oct 2013 11:11:35 -0700
+
 libunity (7.1.2+13.10.20131010-0ubuntu1) saucy; urgency=low
 
   [ Michal Hruby ]
 
=== modified file 'debian/control'
--- debian/control	2013-10-01 13:52:20 +0000
+++ debian/control	2013-10-22 17:43:28 +0000
@@ -38,7 +38,8 @@
          ${misc:Depends},
          libunity-protocol-private0 (= ${binary:Version}),
          libunity-scopes-json-def-desktop (>= ${source:Version}) | unity-scopes-json-def,
-Suggests: unity-common (>= 7.0.0)
+Breaks: unity-common (<< 7.1.2)
+Suggests: unity-common (>= 7.1.2)
 Description: binding to get places into the launcher - shared library
  libunity is a shared library to be able to interact with the launcher
  and add places in Unity environment.