Merge lp:~mitya57/ubuntu/quantal/libunity/lp1055019 into lp:ubuntu/quantal/libunity

[Dmitry Shachnev]

lp:~ubuntu-desktop/libunity/ubuntu is outdated, so I propose a merge here.

Quoting from bug 1055019:

unity-mail has this line:

favorites = Unity.LauncherFavorites.get_default().enumerate_ids()

Calling get_default() makes it crash when unity-common (which provides com.canonical.Unity.gschema.xml) is not installed.

This merge makes libunity9 depend on unity-common to fix such crashes.

6.0.0-0ubuntu3 is the first version that uses the updated gsettings path, so it's used as minimal version.

[Sebastien Bacher (seb128)]

Thank you for your work, I just merged that fix

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-20 15:43:14 +0000
+++ debian/changelog	2012-09-23 14:32:20 +0000
@@ -1,3 +1,9 @@
+libunity (6.5.2-0ubuntu2) UNRELEASED; urgency=low
+
+  * Make libunity9 depend on unity-common >= 6.0.0-0ubuntu3 (LP: #1055019).
+
+ -- Dmitry Shachnev <[e-mail]>  Sun, 23 Sep 2012 18:11:24 +0400
+
 libunity (6.5.2-0ubuntu1) quantal-proposed; urgency=low
 
   [ Timo Jyrinki ]

=== modified file 'debian/control'
--- debian/control	2012-06-29 11:57:23 +0000
+++ debian/control	2012-09-23 14:32:20 +0000
@@ -30,7 +30,8 @@
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
-         ${misc:Depends}
+         ${misc:Depends},
+         unity-common (>= 6.0.0-0ubuntu3)
 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.