From 37aaf614c5029cc63e471b5589703b96405fc66f24a80f758ff1bc6e1b6f6cc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <zaitor@opensuse.org>
Date: Wed, 11 Nov 2015 08:15:19 +0000
Subject: [PATCH] Accepting request 343509 from home:Zaitor

Urk, yet a resub, correct .changes

OBS-URL: https://build.opensuse.org/request/show/343509
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=234
---
 gnome-settings-daemon-3.18.1.tar.xz            |  3 ---
 gnome-settings-daemon-3.18.2.tar.xz            |  3 +++
 ...e-settings-daemon-notify-idle-resumed.patch | 18 +++++++++---------
 gnome-settings-daemon.changes                  | 15 +++++++++++++++
 gnome-settings-daemon.spec                     |  2 +-
 5 files changed, 28 insertions(+), 13 deletions(-)
 delete mode 100644 gnome-settings-daemon-3.18.1.tar.xz
 create mode 100644 gnome-settings-daemon-3.18.2.tar.xz

diff --git a/gnome-settings-daemon-3.18.1.tar.xz b/gnome-settings-daemon-3.18.1.tar.xz
deleted file mode 100644
index 3712340..0000000
--- a/gnome-settings-daemon-3.18.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fa621a17f1d132fe60461020b0dad20a9fab6b0e3e651628aaa53a8f6a6df2c0
-size 1625784
diff --git a/gnome-settings-daemon-3.18.2.tar.xz b/gnome-settings-daemon-3.18.2.tar.xz
new file mode 100644
index 0000000..16a21b6
--- /dev/null
+++ b/gnome-settings-daemon-3.18.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3071c7258f22684f7f64b7f735821e4cb25f59fc4665eb08e8d86b560e72fc6f
+size 1626400
diff --git a/gnome-settings-daemon-notify-idle-resumed.patch b/gnome-settings-daemon-notify-idle-resumed.patch
index f393c73..f056027 100644
--- a/gnome-settings-daemon-notify-idle-resumed.patch
+++ b/gnome-settings-daemon-notify-idle-resumed.patch
@@ -1,10 +1,10 @@
-Index: gnome-settings-daemon-3.17.2/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
+Index: gnome-settings-daemon-3.18.2/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
 ===================================================================
---- gnome-settings-daemon-3.17.2.orig/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
-+++ gnome-settings-daemon-3.17.2/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
-@@ -66,5 +66,10 @@
-       <summary>Enable the ALS sensor</summary>
-       <description>If the ambient light sensor functionality is enabled.</description>
+--- gnome-settings-daemon-3.18.2.orig/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
++++ gnome-settings-daemon-3.18.2/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in.in
+@@ -50,5 +50,10 @@
+       <summary>Power button action</summary>
+       <description>The action to take when the system power button is pressed. This action is hard-coded (and the setting ignored) on virtual machines (power off) and tablets (suspend).</description>
      </key>
 +    <key name="notify-idle-resumed" type="b">
 +      <default>true</default>
@@ -13,10 +13,10 @@ Index: gnome-settings-daemon-3.17.2/data/org.gnome.settings-daemon.plugins.power
 +    </key>
    </schema>
  </schemalist>
-Index: gnome-settings-daemon-3.17.2/plugins/power/gsd-power-manager.c
+Index: gnome-settings-daemon-3.18.2/plugins/power/gsd-power-manager.c
 ===================================================================
---- gnome-settings-daemon-3.17.2.orig/plugins/power/gsd-power-manager.c
-+++ gnome-settings-daemon-3.17.2/plugins/power/gsd-power-manager.c
+--- gnome-settings-daemon-3.18.2.orig/plugins/power/gsd-power-manager.c
++++ gnome-settings-daemon-3.18.2/plugins/power/gsd-power-manager.c
 @@ -148,6 +148,7 @@ struct GsdPowerManagerPrivate
          NotifyNotification      *notification_ups_discharging;
          NotifyNotification      *notification_low;
diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes
index 78dcaff..f5d0429 100644
--- a/gnome-settings-daemon.changes
+++ b/gnome-settings-daemon.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Nov 10 16:00:08 UTC 2015 - zaitor@opensuse.org
+
+- Update to version 3.18.2:
+  + Media keys: Re-add configuration for the power button, except
+    for tablets and virtual machines which have hard-coded
+    defaults.
+  + Wacom: Fix application of left-handed mode and keep-aspect
+    setting.
+  + XSettings:
+    - Export cursor theme.
+    - Fix possible crasher when disabling the plugin.
+  + Updated translations.
+- Rebase gnome-settings-daemon-notify-idle-resumed.patch.
+
 -------------------------------------------------------------------
 Thu Oct 22 21:40:19 CEST 2015 - tiwai@suse.de
 
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index d00ad47..6f8d55b 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -30,7 +30,7 @@
 %endif
 
 Name:           gnome-settings-daemon
-Version:        3.18.1
+Version:        3.18.2
 Release:        0
 Summary:        Settings daemon for the GNOME desktop
 License:        GPL-2.0+