Merge lp:~darkxst/ubuntu/raring/gnome-control-center/lp1179659 into lp:ubuntu/raring/gnome-control-center

Proposed by Tim Lunn on 2013-05-28
Status: Merged
Merge reported by: Tim Lunn
Merged at revision: not available
Proposed branch: lp:~darkxst/ubuntu/raring/gnome-control-center/lp1179659
Merge into: lp:ubuntu/raring/gnome-control-center
Diff against target: 43 lines (+10/-1)
2 files modified
debian/changelog (+7/-0)
debian/patches/git_no_glxinfo.patch (+3/-1)
To merge this branch: bzr merge lp:~darkxst/ubuntu/raring/gnome-control-center/lp1179659
Reviewer Review Type Date Requested Status
Ubuntu branches 2013-05-28 Pending
Review via email: mp+166144@code.launchpad.net
To post a comment you must log in.
Brian Murray (brian-murray) wrote :

I've uploaded this to raring's proposed queue.

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 2013-04-16 16:30:42 +0000
3+++ debian/changelog 2013-05-28 21:46:32 +0000
4@@ -1,3 +1,10 @@
5+gnome-control-center (1:3.6.3-0ubuntu24.1) raring; urgency=low
6+
7+ * debian/patches/git_no_glxinfo.patch:
8+ updated to fix details panel crash on vbox glx driver (LP: #1179659)
9+
10+ -- Tim Lunn <tim@feathertop.org> Sun, 26 May 2013 13:01:47 +1000
11+
12 gnome-control-center (1:3.6.3-0ubuntu24) raring; urgency=low
13
14 * debian/patches/92_ubuntu_system_proxy.patch:
15
16=== modified file 'debian/patches/git_no_glxinfo.patch'
17--- debian/patches/git_no_glxinfo.patch 2013-04-15 18:45:44 +0000
18+++ debian/patches/git_no_glxinfo.patch 2013-05-28 21:46:32 +0000
19@@ -32,7 +32,7 @@
20 #include "hostname-helper.h"
21 #include "gsd-disk-space-helper.h"
22
23-@@ -301,54 +305,68 @@
24+@@ -301,54 +305,70 @@
25 }
26
27 static char *
28@@ -91,6 +91,7 @@
29 + None
30 + };
31 + int nconfigs;
32++ int major, minor;
33 + Window window;
34 + GLXFBConfig *config;
35 + GLXWindow glxwin;
36@@ -103,6 +104,7 @@
37 +
38 + display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
39 +
40++ glXQueryVersion (display, &major, &minor);
41 + config = glXChooseFBConfig (display, DefaultScreen (display),
42 + attributes, &nconfigs);
43 + if (config == NULL) {

Subscribers

People subscribed via source and target branches

to all changes: