diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | com.canonical.Unity.gschema.xml | 5 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 17 | ||||
| -rw-r--r-- | debian/libunity-core-6.0-9.install | 1 | ||||
| -rw-r--r-- | debian/unity-schemas.install | 1 |
6 files changed, 30 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 801d8ae3b..780b006c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ include (cmake/pch.cmake) 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") diff --git a/com.canonical.Unity.gschema.xml b/com.canonical.Unity.gschema.xml index b1d2445f8..700374ec5 100644 --- a/com.canonical.Unity.gschema.xml +++ b/com.canonical.Unity.gschema.xml @@ -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"> diff --git a/debian/changelog b/debian/changelog index d44d7ce3f..00b757613 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +unity (7.3.1-0ubuntu1) UNRELEASED; urgency=medium + + * Split out dconf schemas into separate package + + -- Michal Hruby <michal.hruby@canonical.com> Wed, 30 Jul 2014 12:17:06 +0100 + unity (7.3.0+14.10.20140731.1-0ubuntu1) utopic; urgency=low [ Ubuntu daily release ] @@ -2204,7 +2210,6 @@ unity (7.0.0daily13.05.31ubuntu.unity.next-0ubuntu1) raring; urgency=low unity (7.0.0daily13.05.08ubuntu.unity.next-0ubuntu1) raring; urgency=low * Automatic snapshot from revision 3317 (ubuntu-unity/next) - unity (7.0.0daily13.05.01.1ubuntu.unity.next-0ubuntu1) raring; urgency=low [ Sebastien Bacher ] diff --git a/debian/control b/debian/control index 214cc81dd..fb2652235 100644 --- a/debian/control +++ b/debian/control @@ -121,12 +121,29 @@ Description: Services for the Unity interface . 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 diff --git a/debian/libunity-core-6.0-9.install b/debian/libunity-core-6.0-9.install index 9c69159d3..3e2b01376 100644 --- a/debian/libunity-core-6.0-9.install +++ b/debian/libunity-core-6.0-9.install @@ -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/ diff --git a/debian/unity-schemas.install b/debian/unity-schemas.install new file mode 100644 index 000000000..c38cba419 --- /dev/null +++ b/debian/unity-schemas.install @@ -0,0 +1 @@ +usr/share/glib-2.0 |