diff -u ffmpeg-php-0.6.0/debian/changelog ffmpeg-php-0.6.0/debian/changelog
--- ffmpeg-php-0.6.0/debian/changelog
+++ ffmpeg-php-0.6.0/debian/changelog
@@ -1,3 +1,10 @@
+ffmpeg-php (0.6.0-2ubuntu1) maverick; urgency=low
+
+  * Fix FTBFS with ffmpeg >= 0.6 (LP: #589202).
+    - Add fix_ftbfs_pix_fmt_rgba32.patch
+
+ -- Felix Geyer <debfx-pkg@fobos.de>  Thu, 03 Jun 2010 16:28:20 +0200
+
 ffmpeg-php (0.6.0-2) unstable; urgency=low
 
   * Update my email address
diff -u ffmpeg-php-0.6.0/debian/control ffmpeg-php-0.6.0/debian/control
--- ffmpeg-php-0.6.0/debian/control
+++ ffmpeg-php-0.6.0/debian/control
@@ -1,7 +1,8 @@
 Source: ffmpeg-php
 Section: php
 Priority: optional
-Maintainer: Debian PHP Maintainers <pkg-php-maint@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian PHP Maintainers <pkg-php-maint@lists.alioth.debian.org>
 Uploaders: Raphael Geissert <geissert@debian.org>
 Build-Depends: debhelper (>= 5), php5-dev (>= 5.2.0), libavformat-dev, libavcodec-dev, libswscale-dev, libgd2-xpm-dev, php5-cli (>= 5.2.0), php5-gd, quilt, chrpath, hardening-includes
 Build-Conflicts: php5-ffmpeg
diff -u ffmpeg-php-0.6.0/debian/patches/series ffmpeg-php-0.6.0/debian/patches/series
--- ffmpeg-php-0.6.0/debian/patches/series
+++ ffmpeg-php-0.6.0/debian/patches/series
@@ -3,0 +4 @@
+fix_ftbfs_pix_fmt_rgba32.patch
only in patch2:
unchanged:
--- ffmpeg-php-0.6.0.orig/debian/patches/fix_ftbfs_pix_fmt_rgba32.patch
+++ ffmpeg-php-0.6.0/debian/patches/fix_ftbfs_pix_fmt_rgba32.patch
@@ -0,0 +1,47 @@
+Description: Fix FTBFS with ffmpeg >= 0.6 as it doesn't define PIX_FMT_RGBA32 anymore.
+Author: Felix Geyer <debfx-pkg@fobos.de>
+Origin: backport, http://ffmpeg-php.svn.sourceforge.net/viewvc/ffmpeg-php?view=rev&revision=677
+
+diff -Nur ffmpeg-php-0.6.0/ffmpeg_frame.c ffmpeg-php-0.6.0.patch/ffmpeg_frame.c
+--- ffmpeg-php-0.6.0/ffmpeg_frame.c	2008-10-14 01:02:01.000000000 +0200
++++ ffmpeg-php-0.6.0.patch/ffmpeg_frame.c	2010-06-03 16:13:17.596647216 +0200
+@@ -60,6 +60,12 @@
+     ZEND_FETCH_RESOURCE(gd_img, gdImagePtr, ret, -1, "Image", le_gd); \
+ }
+ 
++#if PIX_FMT_RGBA32
++#define FFMPEG_PHP_FFMPEG_RGB_PIX_FORMAT PIX_FMT_RGBA32
++#else
++#define FFMPEG_PHP_FFMPEG_RGB_PIX_FORMAT PIX_FMT_RGB32
++#endif
++
+ // Borrowed from gd.c
+ #define gdImageBoundsSafeMacro(im, x, y) (!((((y) < (im)->cy1) || ((y) > (im)->cy2)) || (((x) < (im)->cx1) || ((x) > (im)->cx2))))
+ 
+@@ -333,7 +339,7 @@
+ 
+     GET_FRAME_RESOURCE(getThis(), ff_frame);
+ 
+-    _php_convert_frame(ff_frame, PIX_FMT_RGBA32);
++    _php_convert_frame(ff_frame, FFMPEG_PHP_FFMPEG_RGB_PIX_FORMAT);
+ 
+     return_value->value.lval = _php_get_gd_image(ff_frame->width, 
+             ff_frame->height);
+@@ -418,7 +424,7 @@
+ 
+             /* create a an av_frame and allocate space for it */
+             frame = avcodec_alloc_frame();
+-            avpicture_alloc((AVPicture*)frame, PIX_FMT_RGBA32, width, height);
++            avpicture_alloc((AVPicture*)frame, FFMPEG_PHP_FFMPEG_RGB_PIX_FORMAT, width, height);
+ 
+             /* copy the gd image to the av_frame */
+             _php_gd_image_to_avframe(gd_img, frame, width, height);
+@@ -429,7 +435,7 @@
+             /* set the ffpmeg_frame's properties */
+             ff_frame->width = width;
+             ff_frame->height = height;
+-            ff_frame->pixel_format = PIX_FMT_RGBA32;
++            ff_frame->pixel_format = FFMPEG_PHP_FFMPEG_RGB_PIX_FORMAT;
+             break;
+         default:
+             zend_error(E_ERROR, "Invalid argument\n");