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

[Tim Lunn]

[Brian Murray (brian-murray)]

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

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-16 16:30:42 +0000
+++ debian/changelog	2013-05-28 21:46:32 +0000
@@ -1,3 +1,10 @@
+gnome-control-center (1:3.6.3-0ubuntu24.1) raring; urgency=low
+
+  * debian/patches/git_no_glxinfo.patch:
+    updated to fix details panel crash on vbox glx driver (LP: #1179659)
+
+ -- Tim Lunn <[e-mail]>  Sun, 26 May 2013 13:01:47 +1000
+
 gnome-control-center (1:3.6.3-0ubuntu24) raring; urgency=low
 
   * debian/patches/92_ubuntu_system_proxy.patch: 

=== modified file 'debian/patches/git_no_glxinfo.patch'
--- debian/patches/git_no_glxinfo.patch	2013-04-15 18:45:44 +0000
+++ debian/patches/git_no_glxinfo.patch	2013-05-28 21:46:32 +0000
@@ -32,7 +32,7 @@
  #include "hostname-helper.h"
  #include "gsd-disk-space-helper.h"
  
-@@ -301,54 +305,68 @@
+@@ -301,54 +305,70 @@
  }
  
  static char *
@@ -91,6 +91,7 @@
 +    None
 +  };
 +  int nconfigs;
++  int major, minor;
 +  Window window;
 +  GLXFBConfig *config;
 +  GLXWindow glxwin;
@@ -103,6 +104,7 @@
 +
 +  display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
 +
++  glXQueryVersion (display, &major, &minor);
 +  config = glXChooseFBConfig (display, DefaultScreen (display),
 +                              attributes, &nconfigs);
 +  if (config == NULL) {