Package: xdg-utils
Version: 1.1.0~rc1-2
Severity: minor
Tags: patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Hello,
It looks like the xserver-blank patch has been applied upstream, so it is not
needed anymore as it only creates duplicated sections. Here is a git-formated
patch that removes it:
$ git am 0001-Remove-patch-xserver-blanking.diff-now-useless.patch
I did not touch the debian/changelog, I leave that to you. :-)
Regards,
- --
Tanguy Ortolo
- -- System Information:
Debian Release: wheezy/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1,
'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
xdg-utils depends on no packages.
Versions of packages xdg-utils recommends:
ii libfile-mimeinfo-perl <none>
ii x11-utils 7.6+4
ii x11-xserver-utils 7.6+3
Versions of packages xdg-utils suggests:
ii gvfs-bin 1.8.2-2
- -- no debconf information
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCgAGBQJOtoBXAAoJEOryzVHFAGgZNssP/3BFRyXMbgRN8L5zBxeGoKEU
LwFNmTDBpQOK9zeu9fCOh3f+OYvHPqSRn4de6h7x5h7jXfwPz/XYJiaQGOL9Lmx9
tB/ePvGuKb+rX4Kefr0pWt1Zwt/XUiLK6QkJyC2QiyJgcvMM82rBl1Lwwtx4ksO6
G31HbAOGpcq4jRx+R525wH1M0rUSO89ka8zDAKs3HXv9qWP/XcyoYqQ8574iZk7S
IYbrYL6PwIZtoYTQRbld+UuNerntNUFcjzLlHPRzsWhqg/D1Pv2PUI8ua4MmirC6
1UBTwbDmVWdweFcMlxNkxwirHOH6G84h/V9YwCpsQyOBU/Q//Q8AdH7NFq+f+Qie
I3ak3beJKeUhJTSkbRemZvZ9Qfbclw9BgaQfpL6t18z/YdDJN47DQn8EfC6R+nDt
RjeoO1AOrToYZsX+XC79KFB3kLrPA5HC141/6C+IrzNPzFXNRWlkQJaxu1lWvIos
aedwdhM8yGVCNJwceVkizQMRK9U5ANkFzo3M7GoAR6GcXiY/egRdmLFqVqefkfZy
GShpw9fiVWsiYAzGxEpxaA6LOt7ZjZPhnpplplb6USKl8ZnV8lj/MXZiePW7Pz87
r+qa2ZMEFS77F4xBApmJVOuO8qPVBvie+xS6SiCLlkQiJSH7Fq2uV2cM8Yn3KjMi
edpzc2FW/a2cHsQfq02C
=T6Ac
-----END PGP SIGNATURE-----
>From 1b103fda0dd1b5ce00cca2c437ef92432ef38fef Mon Sep 17 00:00:00 2001
From: Tanguy Ortolo <tanguy+deb...@ortolo.eu>
Date: Sun, 6 Nov 2011 13:37:15 +0100
Subject: [PATCH] Remove patch xserver-blanking.diff now useless
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------1.7.7.1"
This is a multi-part message in MIME format.
--------------1.7.7.1
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit
It has been applied upstream.
---
debian/patches/series | 1 -
debian/patches/xserver-blanking.diff | 68 ----------------------------------
2 files changed, 0 insertions(+), 69 deletions(-)
delete mode 100644 debian/patches/xserver-blanking.diff
--------------1.7.7.1
Content-Type: text/x-patch; name="0001-Remove-patch-xserver-blanking.diff-now-useless.patch"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment; filename="0001-Remove-patch-xserver-blanking.diff-now-useless.patch"
diff --git a/debian/patches/series b/debian/patches/series
index cf46aa6..370bb95 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -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
diff --git a/debian/patches/xserver-blanking.diff b/debian/patches/xserver-blanking.diff
deleted file mode 100644
index 2b424a2..0000000
--- a/debian/patches/xserver-blanking.diff
+++ /dev/null
@@ -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 <b...@decadent.org.uk>
-
---- 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
--------------1.7.7.1--
