Merge lp:~unity-team/unity/split-schema-pkg into lp:unity

[Michal Hruby]

Split gsettings schemas into a separate binary package. Added a key for unity8.

Split gsettings schemas into a separate binary package.

Requires g++ 4.9 fix to land.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3846
http://jenkins.qa.ubuntu.com/job/unity-ci/1038/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/125/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/125/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/125/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1038/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3848
http://jenkins.qa.ubuntu.com/job/unity-ci/1041/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/128/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/128/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/128/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1041/rebuild

review: Needs Fixing (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3848
http://jenkins.qa.ubuntu.com/job/unity-ci/1052/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/139
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/139
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/139

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1052/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-06-18 13:07:37 +0000
+++ CMakeLists.txt	2014-07-30 13:37:30 +0000
@@ -10,7 +10,7 @@
 set (PROJECT_NAME "unity")
 set (UNITY_MAJOR 7)
 set (UNITY_MINOR 3)
-set (UNITY_MICRO 0)
+set (UNITY_MICRO 1)
 set (UNITY_VERSION "${UNITY_MAJOR}.${UNITY_MINOR}.${UNITY_MICRO}")
 set (UNITY_API_VERSION "6.0")
 set (UNITY_COMPONENTS_VERSION "6")

=== modified file 'com.canonical.Unity.gschema.xml'
--- com.canonical.Unity.gschema.xml	2014-04-02 14:07:32 +0000
+++ com.canonical.Unity.gschema.xml	2014-07-30 13:37:30 +0000
@@ -122,6 +122,11 @@
       <summary>List of scope ids specifying which scopes should be created and the order to display them in.</summary>
       <description>The scopes listed in the scope bar will be ordered according to this list.</description>
     </key>
+    <key type="as" name="favorite-scopes">
+      <default>[ 'scope://clickscope', 'scope://musicaggregator', 'scope://videoaggregator' ]</default>
+      <summary>List of scope queries specifying what should be displayed in the dash.</summary>
+      <description>List of favorite scopes displayed in the dash.</description>
+    </key>
   </schema>
   <schema path="/com/canonical/unity/decorations/" id="com.canonical.Unity.Decorations" gettext-domain="unity">
     <key type="u" name="grab-wait">

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-11 19:59:35 +0000
+++ debian/changelog	2014-07-30 13:37:30 +0000
@@ -1,3 +1,9 @@
+unity (7.3.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Split out dconf schemas into separate package
+
+ -- Michal Hruby <[e-mail]>  Wed, 30 Jul 2014 12:17:06 +0100
+
 unity (7.3.0+14.10.20140711-0ubuntu1) utopic; urgency=low
 
   [ Eleni Maria Stea ]

=== modified file 'debian/control'
--- debian/control	2014-05-07 19:55:43 +0000
+++ debian/control	2014-07-30 13:37:30 +0000
@@ -121,12 +121,29 @@
  .
  This package contains the D-Bus service used for unity.
 
+Package: unity-schemas
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+Replaces: libunity-core-6.0-9 (<< 7.3.0),
+Breaks: libunity-core-6.0-9 (<< 7.3.0),
+Description: Interface designed for efficiency of space and interaction.
+ Unity is a desktop experience that sings. Designed by Canonical and the Ayatana
+ community, Unity is all about the combination of familiarity and the future. We
+ bring together visual design, analysis of user experience testing, modern
+ graphics technologies and a deep understanding of the free software landscape
+ to produce what we hope will be the lightest, most elegant and most delightful
+ way to use your PC.
+ .
+ This package contains the configuration schemas used by unity.
+
 Package: libunity-core-6.0-9
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          unity-services (= ${binary:Version}),
+         unity-schemas (= ${binary:Version}),
 Conflicts: unity-common, libunity-core-6.0-6, libunity-core-6.0-7, libunity-core-6.0-8
 Replaces: unity-common, libunity-core-6.0-6, libunity-core-6.0-7, libunity-core-6.0-8
 Provides: unity-common, unity-common-7.0

=== modified file 'debian/libunity-core-6.0-9.install'
--- debian/libunity-core-6.0-9.install	2014-02-20 10:19:09 +0000
+++ debian/libunity-core-6.0-9.install	2014-07-30 13:37:30 +0000
@@ -1,7 +1,6 @@
 usr/lib/libunity-core*.so.*
 usr/lib/unity/*.py
 usr/share/ccsm
-usr/share/glib-2.0
 usr/share/gnome-control-center/
 usr/share/unity
 debian/unity-crashdb.conf etc/apport/crashdb.conf.d/

=== added file 'debian/unity-schemas.install'
--- debian/unity-schemas.install	1970-01-01 00:00:00 +0000
+++ debian/unity-schemas.install	2014-07-30 13:37:30 +0000
@@ -0,0 +1,1 @@
+usr/share/glib-2.0