diff -u cairo-1.8.6/debian/changelog cairo-1.8.6/debian/changelog
--- cairo-1.8.6/debian/changelog
+++ cairo-1.8.6/debian/changelog
@@ -1,3 +1,10 @@
+cairo (1.8.6-1ubuntu3) jaunty; urgency=low
+
+  * Fix 06_Xlib-Xcb-Hand-off-EXTEND_PAD-to-XRender.dpatch
+    (LP: #217908)
+
+ -- Thomas Jaeger <ThJaeger@gmail.com>  Mon, 16 Feb 2009 19:39:30 -0500
+
 cairo (1.8.6-1ubuntu2) jaunty; urgency=low
 
   * 06_Xlib-Xcb-Hand-off-EXTEND_PAD-to-XRender.dpatch: Hand off EXTEND_PAD
diff -u cairo-1.8.6/debian/patches/06_Xlib-Xcb-Hand-off-EXTEND_PAD-to-XRender.dpatch cairo-1.8.6/debian/patches/06_Xlib-Xcb-Hand-off-EXTEND_PAD-to-XRender.dpatch
--- cairo-1.8.6/debian/patches/06_Xlib-Xcb-Hand-off-EXTEND_PAD-to-XRender.dpatch
+++ cairo-1.8.6/debian/patches/06_Xlib-Xcb-Hand-off-EXTEND_PAD-to-XRender.dpatch
@@ -7,70 +7,32 @@
 @DPATCH@
 diff -urNad cairo-1.8.6~/src/cairo-xcb-surface.c cairo-1.8.6/src/cairo-xcb-surface.c
 --- cairo-1.8.6~/src/cairo-xcb-surface.c	2008-12-14 06:01:40.000000000 -0500
-+++ cairo-1.8.6/src/cairo-xcb-surface.c	2009-02-12 02:37:51.000000000 -0500
-@@ -844,8 +844,11 @@
-     case CAIRO_EXTEND_REPEAT:
++++ cairo-1.8.6/src/cairo-xcb-surface.c	2009-02-16 19:37:08.000000000 -0500
+@@ -845,7 +845,12 @@
  	_cairo_xcb_surface_set_repeat (surface, 1);
  	break;
--    case CAIRO_EXTEND_REFLECT:
-     case CAIRO_EXTEND_PAD:
-+	_cairo_xcb_surface_set_repeat (surface, 2);
-+	break;
-+    case CAIRO_EXTEND_REFLECT:
-+    default:
- 	return CAIRO_INT_STATUS_UNSUPPORTED;
-     }
- 
-diff -urNad cairo-1.8.6~/src/cairo-xlib-surface.c cairo-1.8.6/src/cairo-xlib-surface.c
---- cairo-1.8.6~/src/cairo-xlib-surface.c	2008-12-12 07:48:05.000000000 -0500
-+++ cairo-1.8.6/src/cairo-xlib-surface.c	2009-02-12 02:37:52.000000000 -0500
-@@ -1424,8 +1424,10 @@
-     case CAIRO_EXTEND_REPEAT:
- 	_cairo_xlib_surface_set_repeat (surface, RepeatNormal);
- 	break;
--    case CAIRO_EXTEND_REFLECT:
-     case CAIRO_EXTEND_PAD:
-+	_cairo_xlib_surface_set_repeat (surface, RepeatPad);
+     case CAIRO_EXTEND_REFLECT:
++	_cairo_xcb_surface_set_repeat (surface, 3);
 +	break;
-+    case CAIRO_EXTEND_REFLECT:
-     default:
- 	return CAIRO_INT_STATUS_UNSUPPORTED;
-     }
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_Xlib-Xcb-Hand-off-EXTEND_PAD-to-XRender.dpatch by  <ThJaeger@gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad cairo-1.8.6~/src/cairo-xcb-surface.c cairo-1.8.6/src/cairo-xcb-surface.c
---- cairo-1.8.6~/src/cairo-xcb-surface.c	2008-12-14 06:01:40.000000000 -0500
-+++ cairo-1.8.6/src/cairo-xcb-surface.c	2009-02-12 02:37:51.000000000 -0500
-@@ -844,8 +844,11 @@
-     case CAIRO_EXTEND_REPEAT:
- 	_cairo_xcb_surface_set_repeat (surface, 1);
- 	break;
--    case CAIRO_EXTEND_REFLECT:
      case CAIRO_EXTEND_PAD:
 +	_cairo_xcb_surface_set_repeat (surface, 2);
 +	break;
-+    case CAIRO_EXTEND_REFLECT:
 +    default:
  	return CAIRO_INT_STATUS_UNSUPPORTED;
      }
  
 diff -urNad cairo-1.8.6~/src/cairo-xlib-surface.c cairo-1.8.6/src/cairo-xlib-surface.c
 --- cairo-1.8.6~/src/cairo-xlib-surface.c	2008-12-12 07:48:05.000000000 -0500
-+++ cairo-1.8.6/src/cairo-xlib-surface.c	2009-02-12 02:37:52.000000000 -0500
-@@ -1424,8 +1424,10 @@
-     case CAIRO_EXTEND_REPEAT:
++++ cairo-1.8.6/src/cairo-xlib-surface.c	2009-02-16 19:37:08.000000000 -0500
+@@ -1425,7 +1425,11 @@
  	_cairo_xlib_surface_set_repeat (surface, RepeatNormal);
  	break;
--    case CAIRO_EXTEND_REFLECT:
+     case CAIRO_EXTEND_REFLECT:
++	_cairo_xlib_surface_set_repeat (surface, RepeatReflect);
++	break;
      case CAIRO_EXTEND_PAD:
 +	_cairo_xlib_surface_set_repeat (surface, RepeatPad);
 +	break;
-+    case CAIRO_EXTEND_REFLECT:
      default:
  	return CAIRO_INT_STATUS_UNSUPPORTED;
      }
diff -u cairo-1.8.6/debian/patches/00list cairo-1.8.6/debian/patches/00list
--- cairo-1.8.6/debian/patches/00list
+++ cairo-1.8.6/debian/patches/00list
@@ -3,0 +4 @@
+06_Xlib-Xcb-Hand-off-EXTEND_PAD-to-XRender.dpatch