--- gsettings-desktop-schemas-3.10.1/debian/changelog 2014-01-02 14:15:26.000000000 +1100 +++ gsettings-desktop-schemas-3.12.0/debian/changelog 2014-05-23 20:06:22.000000000 +1000 @@ -1,3 +1,38 @@ +gsettings-desktop-schemas (3.12.0-1ubuntu1) UNRELEASED; urgency=medium + + * Merge with debian, Remaining changes: + - Don't break on gnome-shell, gnome-settings-daemon << 3.10 + and nautilus << 3.7.92 missing keys are reverted in ubuntu packaging + + debian/patches: + - git_revert_application_based_key.patch: this is still + needed by metacity, mutter <= 3.8 and Muffin. + - git_revert_menu_icon_key_removal.patch, these are still + needed in 3.8 + - git_revert_background_key_removal.patch, Don't remove background key + - ubuntu_lock-on-suspend.patch: Add key for lock on suspend + + -- Tim Lunn Fri, 23 May 2014 19:56:01 +1000 + +gsettings-desktop-schemas (3.12.0-1) experimental; urgency=medium + + * New upstream release. + + -- Andreas Henriksson Mon, 24 Mar 2014 20:02:00 +0100 + +gsettings-desktop-schemas (3.11.90-1) experimental; urgency=medium + + * New upstream release. + + -- Andreas Henriksson Wed, 19 Feb 2014 23:27:06 +0100 + +gsettings-desktop-schemas (3.10.0-1) experimental; urgency=low + + * New upstream release + * debian/control.in: Update gsettings-desktop-schemas breaks to + gnome-settings-daemon (<< 3.10.0) and gnome-shell (<< 3.10.0) + + -- Sjoerd Simons Fri, 01 Nov 2013 22:40:58 +0100 + gsettings-desktop-schemas (3.10.1-0ubuntu1) trusty; urgency=low * New upstream release (LP: #1263045) --- gsettings-desktop-schemas-3.10.1/debian/control 2014-01-02 14:16:53.000000000 +1100 +++ gsettings-desktop-schemas-3.12.0/debian/control 2014-05-23 20:13:59.000000000 +1000 @@ -7,7 +7,7 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort , Jeremy Bicha , Michael Biebl , Sjoerd Simons +Uploaders: Andreas Henriksson , Debian GNOME Maintainers , Emilio Pozuelo Monfort , Jeremy Bicha , Sjoerd Simons Build-depends: debhelper (>= 8), cdbs, gnome-pkg-tools (>= 0.11), @@ -15,8 +15,8 @@ libglib2.0-dev (>= 2.31.0), gobject-introspection (>= 1.31.0), libgirepository1.0-dev (>= 1.31.0) -Standards-Version: 3.9.3 -Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gsettings-desktop-schemas/ +Standards-Version: 3.9.4 +Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gsettings-desktop-schemas/ Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gsettings-desktop-schemas/ Homepage: http://www.gnome.org/ --- gsettings-desktop-schemas-3.10.1/debian/control.in 2014-01-02 14:15:26.000000000 +1100 +++ gsettings-desktop-schemas-3.12.0/debian/control.in 2014-05-23 19:52:35.000000000 +1000 @@ -11,8 +11,8 @@ libglib2.0-dev (>= 2.31.0), gobject-introspection (>= 1.31.0), libgirepository1.0-dev (>= 1.31.0) -Standards-Version: 3.9.3 -Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gsettings-desktop-schemas/ +Standards-Version: 3.9.4 +Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gsettings-desktop-schemas/ Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gsettings-desktop-schemas/ Homepage: http://www.gnome.org/ --- gsettings-desktop-schemas-3.10.1/debian/patches/git_revert_menu_icon_key_removal.patch 2014-01-02 14:15:26.000000000 +1100 +++ gsettings-desktop-schemas-3.12.0/debian/patches/git_revert_menu_icon_key_removal.patch 2014-05-23 20:11:00.000000000 +1000 @@ -9,9 +9,11 @@ .../org.gnome.desktop.interface.gschema.xml.in.in | 38 ++++++++++++++++++++++ 2 files changed, 42 insertions(+) ---- a/schemas/gsettings-desktop-schemas.convert -+++ b/schemas/gsettings-desktop-schemas.convert -@@ -34,6 +34,8 @@ +Index: gsettings-desktop-schemas/schemas/gsettings-desktop-schemas.convert +=================================================================== +--- gsettings-desktop-schemas.orig/schemas/gsettings-desktop-schemas.convert ++++ gsettings-desktop-schemas/schemas/gsettings-desktop-schemas.convert +@@ -34,6 +34,8 @@ enable-animations = /desktop/gnome/inter #menus-have-tearoff = /desktop/gnome/interface/menus_have_tearoff #can-change-accels = /desktop/gnome/interface/can_change_accels #toolbar-style = /desktop/gnome/interface/toolbar_style @@ -20,7 +22,7 @@ #menubar-detachable = /desktop/gnome/interface/menubar_detachable #toolbar-detachable = /desktop/gnome/interface/toolbar_detachable #toolbar-icons-size = /desktop/gnome/interface/toolbar_icons_size -@@ -54,6 +56,8 @@ +@@ -54,6 +56,8 @@ gtk-im-module = /desktop/gnome/interface document-font-name = /desktop/gnome/interface/document_font_name monospace-font-name = /desktop/gnome/interface/monospace_font_name menubar-accel = /desktop/gnome/interface/menubar_accel @@ -29,8 +31,10 @@ cursor-size = /desktop/gnome/peripherals/mouse/cursor_size gtk-color-palette = /desktop/gnome/gtk-color-palette # Disabled as we want users to use the default new theme colors ---- a/schemas/org.gnome.desktop.interface.gschema.xml.in.in -+++ b/schemas/org.gnome.desktop.interface.gschema.xml.in.in +Index: gsettings-desktop-schemas/schemas/org.gnome.desktop.interface.gschema.xml.in.in +=================================================================== +--- gsettings-desktop-schemas.orig/schemas/org.gnome.desktop.interface.gschema.xml.in.in ++++ gsettings-desktop-schemas/schemas/org.gnome.desktop.interface.gschema.xml.in.in @@ -38,6 +38,20 @@ and "text". @@ -75,8 +79,8 @@ 'Adwaita' <_summary>Cursor theme -@@ -227,5 +257,13 @@ - Whether overlay scrollbars should be used. Note: Apps require restart. +@@ -220,5 +250,13 @@ + If true, display date in the clock, in addition to time. + --- gsettings-desktop-schemas-3.10.1/debian/patches/git_revert_notifications_key_removal.patch 2013-12-16 09:12:33.000000000 +1100 +++ gsettings-desktop-schemas-3.12.0/debian/patches/git_revert_notifications_key_removal.patch 1970-01-01 10:00:00.000000000 +1000 @@ -1,31 +0,0 @@ -From 914267443acc5b5ae25a44a44aecd6ee58d0bfbb Mon Sep 17 00:00:00 2001 -From: Giovanni Campagna -Date: Thu, 31 Jan 2013 12:43:50 +0000 -Subject: Remove a deprecated key - -This key has been around for little enough that it is probably safe -to remove, and removing it reduces confusion in users and developers. - -https://bugzilla.gnome.org/show_bug.cgi?id=692944 ---- -Index: gsettings-desktop-schemas-3.8.0/schemas/org.gnome.desktop.screensaver.gschema.xml.in.in -=================================================================== ---- gsettings-desktop-schemas-3.8.0.orig/schemas/org.gnome.desktop.screensaver.gschema.xml.in.in 2013-04-01 22:45:39.565957839 -0400 -+++ gsettings-desktop-schemas-3.8.0/schemas/org.gnome.desktop.screensaver.gschema.xml.in.in 2013-04-01 22:45:39.557957840 -0400 -@@ -20,6 +20,16 @@ - <_summary>Time before locking - <_description>The number of seconds after screensaver activation before locking the screen. - -+ -+ false -+ <_summary>Show notifications in the lock screen -+ <_description> -+ Whether notifications are shown in the lock screen or not. This only affects the standard experience. -+ -+ DEPRECATED: This key is deprecated and ignored. -+ It has been superseded by org.gnome.desktop.notifications show-in-lock-screen. -+ -+ - - true - <_summary>Show full name in the lock screen --- gsettings-desktop-schemas-3.10.1/debian/patches/series 2014-01-02 14:15:26.000000000 +1100 +++ gsettings-desktop-schemas-3.12.0/debian/patches/series 2014-05-23 20:05:10.000000000 +1000 @@ -1,6 +1,4 @@ ubuntu_lock-on-suspend.patch -ubuntu_overlay-scrollbars.patch git_revert_background_key_removal.patch -git_revert_notifications_key_removal.patch git_revert_menu_icon_key_removal.patch git_revert_application_based_key_removal.patch --- gsettings-desktop-schemas-3.10.1/debian/patches/ubuntu_overlay-scrollbars.patch 2014-01-02 14:15:26.000000000 +1100 +++ gsettings-desktop-schemas-3.12.0/debian/patches/ubuntu_overlay-scrollbars.patch 1970-01-01 10:00:00.000000000 +1000 @@ -1,21 +0,0 @@ -## Description: we need the deprecated schema for upgrade from precise until -## next LTS in case this package is updated before the overlay-scrollbar one -## (so still referencing the old key) and that a debconf prompt is loaded: -## perl-gtk will try to fetch this old schema and crash. -## Author: Didier Roche -## Bug: https://launchpad.net/bugs/1060249 ---- a/schemas/org.gnome.desktop.interface.gschema.xml.in.in -+++ b/schemas/org.gnome.desktop.interface.gschema.xml.in.in -@@ -220,5 +220,12 @@ - If true, display date in the clock, in addition to time. - - -+ -+ true -+ <_summary>Enable Overlay Scrollbars -+ <_description> -+ Whether overlay scrollbars should be used. Note: Apps require restart. -+ -+ - -