Merge lp:~ochosi/ubuntu/vivid/xdg-utils/drop_xserver_patch into lp:ubuntu/vivid/xdg-utils

[Simon Steinbeiß]

The xdg-screensaver script is currently carrying a patch that has already been merged which results in duplicate code.
This merge-request drops the duplicate portions of the script and the now superfluous patch.

[Sebastien Bacher (seb128)]

thanks

review: Approve

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-07-16 09:20:59 +0000
+++ debian/patches/series	2015-01-12 09:56:18 +0000
@@ -1,6 +1,5 @@
 xdg-mime-follow-symlinks.diff
 x-www-browser.diff
-xserver-blanking.diff
 xdg-email-envvar.diff
 xdg-email-mutt-detect.diff
 xdg-mime-generic-use-mimetype.diff

=== removed file 'debian/patches/xserver-blanking.diff'
--- debian/patches/xserver-blanking.diff	2011-02-20 18:34:53 +0000
+++ debian/patches/xserver-blanking.diff	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-Description: Support X server blanking in xdg-screensaver.
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30561
-Bug-Debian: http://bugs.debian.org/511248
-Author: Ben Hutchings <[e-mail]>
-
---- a/scripts/xdg-screensaver
-+++ b/scripts/xdg-screensaver
-@@ -435,6 +435,10 @@ perform_action()
-     '')
-       screensaver_xserver "$1"
-       ;;
-+
-+    '')
-+      screensaver_xserver "$1"
-+      ;;
-   esac
- 
-   if [ "$1" = "suspend" ] ; then
-@@ -682,6 +686,49 @@ screensaver_kde()
-             return 1
-         fi
-         ;;
-+
-+        *)
-+        echo "ERROR:  Unknown command '$1'" >&2
-+        return 1
-+        ;;
-+    esac
-+}
-+
-+screensaver_xserver()
-+{
-+    case "$1" in
-+        suspend)
-+        xset s off > /dev/null
-+        result=$?
-+        ;;
-+
-+        resume)
-+        xset s default > /dev/null
-+        result=$?
-+        ;;
-+
-+        activate)
-+        xset s activate > /dev/null
-+        result=$?
-+        ;;
-+
-+        reset)
-+        xset s reset > /dev/null
-+        result=$?
-+        ;;
-+
-+        status)
-+        timeout=`xset q | sed '/^Screen Saver:/,/^[^ ]/ { s/.*timeout: *\([0-9]*\).*/\1/; t }; d'`
-+        result=$?
-+        if [ "$timeout" -gt 0 ]; then
-+            echo "enabled"
-+        elif [ "$timeout" -eq 0 ]; then
-+            echo "disabled"
-+        else
-+            echo "ERROR:  xset q did not report the screensaver timeout" >&2
-+            return 1
-+        fi
-+        ;;
- 
-         *)
-         echo "ERROR: Unknown command '$1'" >&2

=== modified file 'scripts/xdg-screensaver'
--- scripts/xdg-screensaver	2014-07-16 09:20:59 +0000
+++ scripts/xdg-screensaver	2015-01-12 09:56:18 +0000
@@ -737,49 +737,6 @@
     esac
 }
 
-screensaver_xserver()
-{
-    case "$1" in
-        suspend)
-        xset s off > /dev/null
-        result=$?
-        ;;
-
-        resume)
-        xset s default > /dev/null
-        result=$?
-        ;;
-
-        activate)
-        xset s activate > /dev/null
-        result=$?
-        ;;
-
-        reset)
-        xset s reset > /dev/null
-        result=$?
-        ;;
-
-        status)
-        timeout=`xset q | sed '/^Screen Saver:/,/^[^ ]/ { s/.*timeout: *\([0-9]*\).*/\1/; t }; d'`
-        result=$?
-        if [ "$timeout" -gt 0 ]; then
-            echo "enabled"
-        elif [ "$timeout" -eq 0 ]; then
-            echo "disabled"
-        else
-            echo "ERROR: xset q did not report the screensaver timeout" >&2
-            return 1
-        fi
-        ;;
-
-        *)
-        echo "ERROR: Unknown command '$1'" >&2
-        return 1
-        ;;
-    esac
-}
-
 screensaver_suspend_loop()
 {
   lockfile