Ubuntu

Merge lp:~w-shackleton/ubuntu/natty/x2vnc/x2vnc-fix-726783 into lp:ubuntu/natty/x2vnc

Proposed by Will Shackleton on 2011-02-28
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~w-shackleton/ubuntu/natty/x2vnc/x2vnc-fix-726783
Merge into: lp:ubuntu/natty/x2vnc
Diff against target: 29 lines (+8/-2) 2 files modified
To merge this branch: bzr merge lp:~w-shackleton/ubuntu/natty/x2vnc/x2vnc-fix-726783
Reviewer Review Type Date Requested Status
Stefan Lesicnik (community) Disapprove on 2011-03-07
Luke Yelavich Abstain on 2011-03-04
Ubuntu branches 2011-02-28 Pending
Review via email: mp+51644@code.launchpad.net

Description of the Change

Fixes lp:#726783

To post a comment you must log in.
Luke Yelavich (themuso) wrote :

Thanks for your work. As commented in the bug, this has been sent upstream and to Debian. Hopefully the Debian maintainer will release a new package revision with your patch included, we can then sync the package from Debian.

Thanks again.

review: Abstain
Stefan Lesicnik (stefanlsd) wrote :

Not needed here anymore. Work adopted in Debian - thanks for the patch!

review: Disapprove
Martin Pitt (pitti) wrote :

Package got synced from Debian, closing proposal. Thanks!

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2010-08-05 10:34:21 +0000
3+++ debian/changelog 2011-02-28 22:40:48 +0000
4@@ -1,3 +1,9 @@
5+x2vnc (1.7.2-2ubuntu1) maverick; urgency=low
6+
7+ * x.c: Fixed xinerama support for certain multiple screen setups. (LP: #726783)
8+
9+ -- William Shackleton <w.shackleton@gmail.com> Mon, 28 Feb 2011 21:09:32 +0000
10+
11 x2vnc (1.7.2-2) unstable; urgency=low
12
13 * New maintainer (Closes: #586422).
14
15=== modified file 'x.c'
16--- x.c 2008-03-25 10:45:34 +0000
17+++ x.c 2011-02-28 22:40:48 +0000
18@@ -848,9 +848,9 @@
19 {
20 int n,ret=a.x;
21 if(a.y < ret) ret=a.y;
22- n=displayHeight - a.y;
23+ n=y_offset + displayHeight - a.y;
24 if(n < ret) ret=n;
25- n=displayWidth - a.x;
26+ n=x_offset + displayWidth - a.x;
27 if(n < ret) ret=n;
28 return ret;
29 }

Subscribers

People subscribed via source and target branches