[SCM] mate-screensaver Debian package branch, master, updated. debian/1.8.0-5-3-g34d61b1

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-screensaver.git;a=commitdiff;h=ca8071d

The following commit has been merged in the master branch:
commit ca8071d4b9d74a889880cc744d389f63cd51fec8
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Oct 7 00:08:10 2014 +0200

    debian/patches: Drop 1002_fix-segfault-if-xrandr-is-unavailable.patch. Applied upstream.
---
 .../1002_fix-segfault-if-xrandr-is-unavailable.patch      | 15 ---------------
 debian/patches/series                                     |  1 -
 2 files changed, 16 deletions(-)

diff --git a/debian/patches/1002_fix-segfault-if-xrandr-is-unavailable.patch b/debian/patches/1002_fix-segfault-if-xrandr-is-unavailable.patch
deleted file mode 100644
index fded836..0000000
--- a/debian/patches/1002_fix-segfault-if-xrandr-is-unavailable.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix SegFault if XRANDR is not installed/available
-Author: Steven Chamberlain <steven at pyro.eu.org>
-Forwarded: https://github.com/mate-desktop/mate-screensaver/issues/46
---- mate-screensaver-1.8.0/src/gs-fade.c.orig	2014-03-01 11:24:28.000000000 +0000
-+++ mate-screensaver-1.8.0/src/gs-fade.c	2014-05-28 19:10:03.560688363 +0100
-@@ -916,7 +916,8 @@
- 	gs_fade_set_alpha (fade, fade->priv->current_alpha);
- 
- 	for (i = 0; i < fade->priv->num_screens; i++)
--		fade->priv->screen_priv[i].fade_finish (fade, i);
-+		if (fade->priv->screen_priv[i].fade_type != FADE_TYPE_NONE)
-+			fade->priv->screen_priv[i].fade_finish (fade, i);
- }
- 
- static void
diff --git a/debian/patches/series b/debian/patches/series
index f6f2eb2..4aabca0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 1001_add-keywords-to-desktop-files.patch
-1002_fix-segfault-if-xrandr-is-unavailable.patch
 1003_proper-locale-datetime.patch

-- 
mate-screensaver Debian package