[mate-settings-daemon] 01/02: Merge branch 'master' into debian/experimental

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch debian/experimental
in repository mate-settings-daemon.

commit 5bd50886cea3bbc3b2a3556d3077ea7bed50f1a9
Merge: 8c79037 7f160a8
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Mar 12 04:50:36 2015 +0100

    Merge branch 'master' into debian/experimental
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog
    	debian/patches/series

 debian/changelog                                   |  13 +
 .../0010_move_a11y_keybindings_to_media_keys.patch | 239 ---------
 debian/patches/0011_add_a11y_settings_plugin.patch | 597 ---------------------
 ..._gnome_a11y_schema_to_enable_applications.patch |  24 -
 .../patches/0013_monitor_gnome_schema_keys.patch   |  22 -
 debian/patches/1001_fix-numlock-cpu-usage.patch    |  35 ++
 debian/patches/series                              |   1 +
 7 files changed, 49 insertions(+), 882 deletions(-)

diff --cc debian/changelog
index debeb02,aabbec3..914bc0f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,19 +1,41 @@@
 +mate-settings-daemon (1.8.3-1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +    - Including GLib >= 2.43 compatibility patch. (Closes: #778691).
 +  * Fix accessibility key bindings for Orca and Onboard. (Closes: #775212).
 +
 +  [ Mike Gabriel ]
 +  * debian/copyright:
 +    + Work in license information for a11y-settings plugin.
 +  * debian/mate-settings-daemon-gstreamer.install:
 +    + Provide new keybindings/50-accessibility.xml to MATE Control Center.
 +      (This file will also be provided in mate-settings-daemon-pulse via
 +      Makefile magic and debian/rules).
 +
 +  [ Martin Wimpress ]
 +  * debian/patches:
 +    + Add 0010_move_a11y_keybindings_to_media_keys.patch,
 +          0011_add_a11y_settings_plugin.patch,
 +          0012_use_gnome_a11y_schema_to_enable_applications.patch,
 +          0013_monitor_gnome_schema_keys.patch.
 +
 + -- Mike Gabriel <sunweaver at debian.org>  Thu, 15 Jan 2015 13:05:52 +0100
 +
+ mate-settings-daemon (1.8.2-3) unstable; urgency=medium
+ 
 -  * debian/changelo:
++  * debian/changelog:
+     + Fix typo in previous changelog stanza.
+   * debian/patches:
+     + Add debian/patches/1001_fix-numlock-cpu-usage.patch. Prevent m-s-d from
+       causing high CPU load if the user repetitively toggles the NUMLOCK key
+       while being connected via a remote session (NX, X2Go, VNC, xrdp, etc.)
+       or sometimes also in a local X.org session. (Closes: #780226, #778278,
+       LP:#1364111).
+ 
+  -- Mike Gabriel <sunweaver at debian.org>  Tue, 10 Mar 2015 20:36:14 +0100
+ 
  mate-settings-daemon (1.8.2-2) unstable; urgency=medium
  
 -  [ Mike Gabriel ]
    * debian/patches:
      + Add README file explaining our patch naming scheme.
      + Add 0002_fix-a11y-keyboard-dialog-segfaults.patch. Fix segfaults when
diff --cc debian/patches/series
index 78e0536,9a8ddbb..7ea9d98
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,7 -1,4 +1,8 @@@
  0001_prefer-gcalculator-for-media-keys.patch
  0002_fix-a11y-keyboard-dialog-segfaults.patch
 +0010_move_a11y_keybindings_to_media_keys.patch
 +0011_add_a11y_settings_plugin.patch
 +0012_use_gnome_a11y_schema_to_enable_applications.patch
 +0013_monitor_gnome_schema_keys.patch
+ 1001_fix-numlock-cpu-usage.patch
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-settings-daemon.git