Merge lp:~mterry/ubuntu/maverick/cairo/651183 into lp:ubuntu/maverick/cairo

[Michael Terry]

[Didier Roche-Tolomelli (didrocks)]

but will sponsor fta's patch as discussed on IRC :)
Thanks nonetheless!

Unmerged revisions

33. By Michael Terry on 2010-09-29

* debian/patches/drop-excess-comma.patch:
  - Patch taken from upstream to avoid an extra comma that can cause
    FTBFS on picky packages. LP: #651183

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2010-09-09 18:27:34 +0000
+++ .pc/applied-patches	2010-09-29 15:36:10 +0000
@@ -1,3 +1,4 @@
 01_build_perf_utils.patch
 02_am-maintainer-mode.patch
 server_side_gradients.patch
+drop-excess-comma.patch

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-09 18:27:34 +0000
+++ debian/changelog	2010-09-29 15:36:10 +0000
@@ -1,3 +1,11 @@
+cairo (1.10.0-1ubuntu2) maverick; urgency=low
+
+  * debian/patches/drop-excess-comma.patch:
+    - Patch taken from upstream to avoid an extra comma that can cause
+      FTBFS on picky packages.  LP: #651183
+
+ -- Michael Terry <[e-mail]>  Wed, 29 Sep 2010 11:32:31 -0400
+
 cairo (1.10.0-1ubuntu1) maverick; urgency=low
 
   * Resync on Debian

=== added file 'debian/patches/drop-excess-comma.patch'
--- debian/patches/drop-excess-comma.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/drop-excess-comma.patch	2010-09-29 15:36:10 +0000
@@ -0,0 +1,18 @@
+Description: Drop trailing comma in enumeration, as it causes FTBFS
+Origin: http://cgit.freedesktop.org/cairo/commit/?id=8fca990be7fca609e834703e60dd888c13fc637f
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/651183
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30115
+
+Index: cairo/src/cairo.h
+===================================================================
+--- cairo.orig/src/cairo.h	2010-09-29 11:25:29.142273002 -0400
++++ cairo/src/cairo.h	2010-09-29 11:25:37.632273001 -0400
+@@ -1973,7 +1973,7 @@
+     CAIRO_DEVICE_TYPE_SCRIPT,
+     CAIRO_DEVICE_TYPE_XCB,
+     CAIRO_DEVICE_TYPE_XLIB,
+-    CAIRO_DEVICE_TYPE_XML,
++    CAIRO_DEVICE_TYPE_XML
+ } cairo_device_type_t;
+ 
+ cairo_public cairo_device_type_t

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-09-09 18:27:34 +0000
+++ debian/patches/series	2010-09-29 15:36:10 +0000
@@ -1,3 +1,4 @@
 01_build_perf_utils.patch
 02_am-maintainer-mode.patch
 server_side_gradients.patch
+drop-excess-comma.patch

=== modified file 'src/cairo.h'
--- src/cairo.h	2010-09-09 18:27:34 +0000
+++ src/cairo.h	2010-09-29 15:36:10 +0000
@@ -1973,7 +1973,7 @@
     CAIRO_DEVICE_TYPE_SCRIPT,
     CAIRO_DEVICE_TYPE_XCB,
     CAIRO_DEVICE_TYPE_XLIB,
-    CAIRO_DEVICE_TYPE_XML,
+    CAIRO_DEVICE_TYPE_XML
 } cairo_device_type_t;
 
 cairo_public cairo_device_type_t