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

Proposed by Simon Steinbeiß on 2015-01-12
Status: Merged
Approved by: Sebastien Bacher on 2015-01-12
Approved revision: 26
Merged at revision: 26
Proposed branch: lp:~ochosi/ubuntu/vivid/xdg-utils/drop_xserver_patch
Merge into: lp:ubuntu/vivid/xdg-utils
Diff against target: 137 lines (+0/-112)
3 files modified
debian/patches/series (+0/-1)
debian/patches/xserver-blanking.diff (+0/-68)
scripts/xdg-screensaver (+0/-43)
To merge this branch: bzr merge lp:~ochosi/ubuntu/vivid/xdg-utils/drop_xserver_patch
Reviewer Review Type Date Requested Status
Sebastien Bacher 2015-01-12 Approve on 2015-01-12
Review via email: mp+246101@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/patches/series'
2--- debian/patches/series 2014-07-16 09:20:59 +0000
3+++ debian/patches/series 2015-01-12 09:56:18 +0000
4@@ -1,6 +1,5 @@
5 xdg-mime-follow-symlinks.diff
6 x-www-browser.diff
7-xserver-blanking.diff
8 xdg-email-envvar.diff
9 xdg-email-mutt-detect.diff
10 xdg-mime-generic-use-mimetype.diff
11
12=== removed file 'debian/patches/xserver-blanking.diff'
13--- debian/patches/xserver-blanking.diff 2011-02-20 18:34:53 +0000
14+++ debian/patches/xserver-blanking.diff 1970-01-01 00:00:00 +0000
15@@ -1,68 +0,0 @@
16-Description: Support X server blanking in xdg-screensaver.
17-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30561
18-Bug-Debian: http://bugs.debian.org/511248
19-Author: Ben Hutchings <ben@decadent.org.uk>
20-
21---- a/scripts/xdg-screensaver
22-+++ b/scripts/xdg-screensaver
23-@@ -435,6 +435,10 @@ perform_action()
24- '')
25- screensaver_xserver "$1"
26- ;;
27-+
28-+ '')
29-+ screensaver_xserver "$1"
30-+ ;;
31- esac
32-
33- if [ "$1" = "suspend" ] ; then
34-@@ -682,6 +686,49 @@ screensaver_kde()
35- return 1
36- fi
37- ;;
38-+
39-+ *)
40-+ echo "ERROR: Unknown command '$1'" >&2
41-+ return 1
42-+ ;;
43-+ esac
44-+}
45-+
46-+screensaver_xserver()
47-+{
48-+ case "$1" in
49-+ suspend)
50-+ xset s off > /dev/null
51-+ result=$?
52-+ ;;
53-+
54-+ resume)
55-+ xset s default > /dev/null
56-+ result=$?
57-+ ;;
58-+
59-+ activate)
60-+ xset s activate > /dev/null
61-+ result=$?
62-+ ;;
63-+
64-+ reset)
65-+ xset s reset > /dev/null
66-+ result=$?
67-+ ;;
68-+
69-+ status)
70-+ timeout=`xset q | sed '/^Screen Saver:/,/^[^ ]/ { s/.*timeout: *\([0-9]*\).*/\1/; t }; d'`
71-+ result=$?
72-+ if [ "$timeout" -gt 0 ]; then
73-+ echo "enabled"
74-+ elif [ "$timeout" -eq 0 ]; then
75-+ echo "disabled"
76-+ else
77-+ echo "ERROR: xset q did not report the screensaver timeout" >&2
78-+ return 1
79-+ fi
80-+ ;;
81-
82- *)
83- echo "ERROR: Unknown command '$1'" >&2
84
85=== modified file 'scripts/xdg-screensaver'
86--- scripts/xdg-screensaver 2014-07-16 09:20:59 +0000
87+++ scripts/xdg-screensaver 2015-01-12 09:56:18 +0000
88@@ -737,49 +737,6 @@
89 esac
90 }
91
92-screensaver_xserver()
93-{
94- case "$1" in
95- suspend)
96- xset s off > /dev/null
97- result=$?
98- ;;
99-
100- resume)
101- xset s default > /dev/null
102- result=$?
103- ;;
104-
105- activate)
106- xset s activate > /dev/null
107- result=$?
108- ;;
109-
110- reset)
111- xset s reset > /dev/null
112- result=$?
113- ;;
114-
115- status)
116- timeout=`xset q | sed '/^Screen Saver:/,/^[^ ]/ { s/.*timeout: *\([0-9]*\).*/\1/; t }; d'`
117- result=$?
118- if [ "$timeout" -gt 0 ]; then
119- echo "enabled"
120- elif [ "$timeout" -eq 0 ]; then
121- echo "disabled"
122- else
123- echo "ERROR: xset q did not report the screensaver timeout" >&2
124- return 1
125- fi
126- ;;
127-
128- *)
129- echo "ERROR: Unknown command '$1'" >&2
130- return 1
131- ;;
132- esac
133-}
134-
135 screensaver_suspend_loop()
136 {
137 lockfile

Subscribers

People subscribed via source and target branches