[SCM] jokosher packaging branch, master, updated. debian/0.11.5-3-3-g446798b

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 02b0a2443a655a197ca88ccd33e8ccd99e0f1560
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Aug 18 15:39:49 2010 +0200

    Add patch to workaround python-cairo bug to avoid crash after starting mixer (see LP: #548761).

diff --git a/debian/patches/cairo_fix.patch b/debian/patches/cairo_fix.patch
new file mode 100644
index 0000000..774ca8d
--- /dev/null
+++ b/debian/patches/cairo_fix.patch
@@ -0,0 +1,29 @@
+Origin: http://bazaar.launchpad.net/~michael-sheldon/jokosher/cairo_fix/revision/1105
+Description: Avoid use of poorly documented CairoContext.reset_clip() method,
+ which has changed usage between pycairo versions.
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/548761
+---
+ Jokosher/VUWidget.py |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- jokosher-0.11.5.orig/Jokosher/VUWidget.py
++++ jokosher-0.11.5/Jokosher/VUWidget.py
+@@ -306,6 +306,7 @@ class VUWidget(gtk.DrawingArea):
+ 		"""
+ 		
+ 		ctx = widget.window.cairo_create()
++		ctx.save()
+ 		
+ 		rect = self.get_allocation()
+ 
+@@ -320,8 +321,8 @@ class VUWidget(gtk.DrawingArea):
+ 		ctx.set_source_surface(self.source, 0, 0)	
+ 		ctx.paint()
+ 
+-		# Reset the clip region
+-		ctx.reset_clip()
++		# Restore the clipping region from saved context
++		ctx.restore()
+ 		
+ 		# Draw the current volume level bar, with highlight if appropriate
+ 		vpos = self.__GetVolumeHandleYPos()
diff --git a/debian/patches/series b/debian/patches/series
index 341131e..e327f8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ desktop_file.patch
 load_extensions_from_unpacked_eggs.patch
 hard-code-omf-location.patch
 string_exceptions.patch
+cairo_fix.path

-- 
jokosher packaging