Merge lp:~sbeattie/ubuntu/lucid/vnc4/lp556147 into lp:ubuntu/lucid/vnc4

Proposed by Steve Beattie on 2010-04-06
Status: Merged
Merge reported by: James Westby
Merged at revision: not available
Proposed branch: lp:~sbeattie/ubuntu/lucid/vnc4/lp556147
Merge into: lp:ubuntu/lucid/vnc4
Diff against target: 28 lines (+9/-1)
2 files modified
debian/changelog (+9/-0)
unix/vncserver (+0/-1)
To merge this branch: bzr merge lp:~sbeattie/ubuntu/lucid/vnc4/lp556147
Reviewer Review Type Date Requested Status
Ubuntu branches 2010-04-06 Pending
Review via email: mp+22882@code.launchpad.net

Description of the change

This change reverts out the fix included in http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/lucid/vnc4/lucid/revision/12 , which was originally added to address bug 78282 but now causes bug 556147.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-04-03 18:41:34 +0000
3+++ debian/changelog 2010-04-06 16:09:22 +0000
4@@ -1,3 +1,12 @@
5+vnc4 (4.1.1+xorg4.3.0-37ubuntu2) lucid; urgency=low
6+
7+ * unix/vncserver: revert "-extension XFIXES" as it is no longer
8+ needed (LP: #556147)
9+ * Remaining Ubuntu changes:
10+ - None
11+
12+ -- Steve Beattie <sbeattie@ubuntu.com> Mon, 05 Apr 2010 18:31:57 -0700
13+
14 vnc4 (4.1.1+xorg4.3.0-37ubuntu1) lucid; urgency=low
15
16 * Merge package with debian unstable. Unfortunately Ubuntu adapted an
17
18=== modified file 'unix/vncserver'
19--- unix/vncserver 2010-04-03 18:41:34 +0000
20+++ unix/vncserver 2010-04-06 16:09:22 +0000
21@@ -260,7 +260,6 @@
22 $cmd .= " -rfbauth $vncUserDir/passwd";
23 $cmd .= " -rfbport $vncPort";
24 $cmd .= " -pn";
25-$cmd .= " -extension XFIXES";
26
27 # Add font path and color database stuff here, e.g.:
28 #

Subscribers

People subscribed via source and target branches

to all changes: