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

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository mate-settings-daemon.

commit f43e7f4ff7cd379d9655d1b46b97ac93b83ff5e2
Merge: 20d8b72 023ba77
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Sep 2 04:49:52 2015 +0200

    Merge branch 'debian/experimental'
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog

 debian/changelog                                   |  82 +++
 debian/control                                     | 149 ++---
 debian/copyright                                   |  48 +-
 debian/mate-settings-daemon-common.install         |   5 +
 debian/mate-settings-daemon-dev.install            |   2 +
 debian/mate-settings-daemon-gstreamer.install      |  13 -
 debian/mate-settings-daemon-gstreamer.manpages     |   1 -
 debian/mate-settings-daemon-pulse.manpages         |   1 -
 debian/mate-settings-daemon.install                |   5 +
 debian/msd-datetime-mechanism.1                    |  16 -
 debian/msd-locate-pointer.1                        |  17 -
 .../0001_prefer-gcalculator-for-media-keys.patch   |  25 -
 .../0002_fix-a11y-keyboard-dialog-segfaults.patch  |  96 ----
 ...ess-to-list-elements-in-background-plugin.patch |  24 -
 .../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                              |   9 -
 debian/rules                                       |  84 +--
 21 files changed, 178 insertions(+), 1316 deletions(-)

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