r22368 - in /desktop/unstable/gnome-desktop/debian: changelog control control.in patches/01_trap_rr_x_errors.patch rules

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Nov 18 08:23:15 2009
New Revision: 22368

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22368
Log:
* Switch to python-support.
* 01_trap_rr_x_errors.patch: patch from Chris Coulson to support 
  FreeNX, it fixes some BadRequest errors. Closes: #556797.

Added:
    desktop/unstable/gnome-desktop/debian/patches/01_trap_rr_x_errors.patch
Modified:
    desktop/unstable/gnome-desktop/debian/changelog
    desktop/unstable/gnome-desktop/debian/control
    desktop/unstable/gnome-desktop/debian/control.in
    desktop/unstable/gnome-desktop/debian/rules

Modified: desktop/unstable/gnome-desktop/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop/debian/changelog?rev=22368&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-desktop/debian/changelog [utf-8] Wed Nov 18 08:23:15 2009
@@ -1,3 +1,11 @@
+gnome-desktop (2.28.1-2) unstable; urgency=low
+
+  * Switch to python-support.
+  * 01_trap_rr_x_errors.patch: patch from Chris Coulson to support 
+    FreeNX, it fixes some BadRequest errors. Closes: #556797.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 18 Nov 2009 09:16:11 +0100
+
 gnome-desktop (2.28.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: desktop/unstable/gnome-desktop/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop/debian/control?rev=22368&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-desktop/debian/control [utf-8] Wed Nov 18 08:23:15 2009
@@ -23,7 +23,7 @@
                libxml2-dev (>= 2.4.20),
                libgconf2-dev (>= 2.0.0),
                python-dev,
-               python-central (>= 0.5.6),
+               python-support (>= 0.7),
                libglib2.0-doc,
                libgtk2.0-doc
 
@@ -39,8 +39,6 @@
 Conflicts: gnome-core (<< 1.5),
            gnome-desktop-data (<< 2.12)
 Replaces: gnome-desktop-data (<< 2.12)
-Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
 Description: The GNOME about box
  Informative little about thing that lets us brag to our friends as our name
  scrolls by, and lets users click to load the GNOME home pages.

Modified: desktop/unstable/gnome-desktop/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop/debian/control.in?rev=22368&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-desktop/debian/control.in [utf-8] Wed Nov 18 08:23:15 2009
@@ -23,7 +23,7 @@
                libxml2-dev (>= 2.4.20),
                libgconf2-dev (>= 2.0.0),
                python-dev,
-               python-central (>= 0.5.6),
+               python-support (>= 0.7),
                libglib2.0-doc,
                libgtk2.0-doc
 
@@ -39,8 +39,6 @@
 Conflicts: gnome-core (<< 1.5),
            gnome-desktop-data (<< 2.12)
 Replaces: gnome-desktop-data (<< 2.12)
-Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
 Description: The GNOME about box
  Informative little about thing that lets us brag to our friends as our name
  scrolls by, and lets users click to load the GNOME home pages.

Added: desktop/unstable/gnome-desktop/debian/patches/01_trap_rr_x_errors.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop/debian/patches/01_trap_rr_x_errors.patch?rev=22368&op=file
==============================================================================
--- desktop/unstable/gnome-desktop/debian/patches/01_trap_rr_x_errors.patch (added)
+++ desktop/unstable/gnome-desktop/debian/patches/01_trap_rr_x_errors.patch [utf-8] Wed Nov 18 08:23:15 2009
@@ -1,0 +1,30 @@
+Debian #556797
+LP #454487
+GNOME #600188
+
+diff -Nur -x '*.orig' -x '*~' gnome-desktop-2.28.1/libgnome-desktop/gnome-rr.c gnome-desktop-2.28.1.new/libgnome-desktop/gnome-rr.c
+--- gnome-desktop-2.28.1/libgnome-desktop/gnome-rr.c	2009-08-19 16:51:03.000000000 +0100
++++ gnome-desktop-2.28.1.new/libgnome-desktop/gnome-rr.c	2009-10-31 01:11:51.382756270 +0000
+@@ -375,6 +375,8 @@
+ 
+     /* First update the screen resources */
+ 
++	gdk_error_trap_push ();
++
+     if (needs_reprobe)
+         resources = XRRGetScreenResources (xdisplay, xroot);
+     else
+@@ -394,6 +396,13 @@
+ #endif
+     }
+ 
++	gdk_flush ();
++	if (gdk_error_trap_pop ()) {
++		g_set_error (error, GNOME_RR_ERROR, GNOME_RR_ERROR_UNKNOWN,
++			 	_("unhandled X error while getting the screen resources"));
++	    return FALSE;
++	}
++
+     if (resources)
+     {
+ 	if (!fill_screen_info_from_resources (info, resources, error))

Modified: desktop/unstable/gnome-desktop/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-desktop/debian/rules?rev=22368&op=diff
==============================================================================
--- desktop/unstable/gnome-desktop/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-desktop/debian/rules [utf-8] Wed Nov 18 08:23:15 2009
@@ -15,4 +15,4 @@
 			--disable-gtk-doc
 
 binary-install/gnome-about::
-	dh_pycentral -pgnome-about
+	dh_pysupport -pgnome-about