diff -u mediatomb-0.11.0/debian/changelog mediatomb-0.11.0/debian/changelog
--- mediatomb-0.11.0/debian/changelog
+++ mediatomb-0.11.0/debian/changelog
@@ -1,3 +1,10 @@
+mediatomb (0.11.0-3ubuntu2) jaunty; urgency=low
+
+  * Added ffmpeg_headers_location.patch to fix ffmpeg headers location,
+    fixes FTBFS (LP: #311180).
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Thu, 08 Jan 2009 11:18:48 +0100
+
 mediatomb (0.11.0-3ubuntu1) intrepid; urgency=low
 
   * fix LP: #272772: packages that Depend/Recommend/Suggest firefox
diff -u mediatomb-0.11.0/debian/patches/series mediatomb-0.11.0/debian/patches/series
--- mediatomb-0.11.0/debian/patches/series
+++ mediatomb-0.11.0/debian/patches/series
@@ -2,0 +3 @@
+ffmpeg_headers_location.patch
only in patch2:
unchanged:
--- mediatomb-0.11.0.orig/debian/patches/ffmpeg_headers_location.patch
+++ mediatomb-0.11.0/debian/patches/ffmpeg_headers_location.patch
@@ -0,0 +1,145 @@
+Index: mediatomb-0.11.0/configure
+===================================================================
+--- mediatomb-0.11.0.orig/configure	2009-01-08 10:55:30.000000000 +0100
++++ mediatomb-0.11.0/configure	2009-01-08 10:55:53.000000000 +0100
+@@ -26123,9 +26123,9 @@
+ if test "x$FFMPEG_OK" = xyes; then
+     if test -n "$FFMPEG_SEARCH_HEADERS" ; then
+         CPPFLAGS="-I$FFMPEG_SEARCH_HEADERS"
+-        as_ac_Header=`echo "ac_cv_header_$FFMPEG_SEARCH_HEADERS/ffmpeg/avformat.h" | $as_tr_sh`
+-{ echo "$as_me:$LINENO: checking for $FFMPEG_SEARCH_HEADERS/ffmpeg/avformat.h" >&5
+-echo $ECHO_N "checking for $FFMPEG_SEARCH_HEADERS/ffmpeg/avformat.h... $ECHO_C" >&6; }
++        as_ac_Header=`echo "ac_cv_header_$FFMPEG_SEARCH_HEADERS/libavformat/avformat.h" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $FFMPEG_SEARCH_HEADERS/libavformat/avformat.h" >&5
++echo $ECHO_N "checking for $FFMPEG_SEARCH_HEADERS/libavformat/avformat.h... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -26141,7 +26141,7 @@
+ 
+ 
+ 
+-#include <$FFMPEG_SEARCH_HEADERS/ffmpeg/avformat.h>
++#include <$FFMPEG_SEARCH_HEADERS/libavformat/avformat.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+@@ -26187,8 +26187,8 @@
+ 
+ 
+     else
+-        { echo "$as_me:$LINENO: checking for ffmpeg/avformat.h" >&5
+-echo $ECHO_N "checking for ffmpeg/avformat.h... $ECHO_C" >&6; }
++        { echo "$as_me:$LINENO: checking for libavformat/avformat.h" >&5
++echo $ECHO_N "checking for libavformat/avformat.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_ffmpeg_avformat_h+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -26204,7 +26204,7 @@
+ 
+ 
+ 
+-#include <ffmpeg/avformat.h>
++#include <libavformat/avformat.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+@@ -26241,9 +26241,9 @@
+ 
+                 CPPFLAGS="-I$SEARCH_DIR_HEADERS"
+                 unset ac_cv_header_ffmpeg_avformat_h
+-                as_ac_Header=`echo "ac_cv_header_$SEARCH_DIR_HEADERS/ffmpeg/avformat.h" | $as_tr_sh`
+-{ echo "$as_me:$LINENO: checking for $SEARCH_DIR_HEADERS/ffmpeg/avformat.h" >&5
+-echo $ECHO_N "checking for $SEARCH_DIR_HEADERS/ffmpeg/avformat.h... $ECHO_C" >&6; }
++                as_ac_Header=`echo "ac_cv_header_$SEARCH_DIR_HEADERS/libavformat/avformat.h" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking for $SEARCH_DIR_HEADERS/libavformat/avformat.h" >&5
++echo $ECHO_N "checking for $SEARCH_DIR_HEADERS/libavformat/avformat.h... $ECHO_C" >&6; }
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -26259,7 +26259,7 @@
+ 
+ 
+ 
+-#include <$SEARCH_DIR_HEADERS/ffmpeg/avformat.h>
++#include <$SEARCH_DIR_HEADERS/libavformat/avformat.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (ac_try="$ac_compile"
+@@ -26846,7 +26846,7 @@
+ 
+                 #define __STDC_CONSTANT_MACROS
+                 #include <stdint.h>
+-                #include <ffmpeg/avformat.h>
++                #include <libavformat/avformat.h>
+ 
+ int
+ main ()
+@@ -26895,7 +26895,7 @@
+                     #define __STDC_CONSTANT_MACROS
+                     #include <stdint.h>
+                     extern "C" {
+-                        #include <ffmpeg/avformat.h>
++                        #include <libavformat/avformat.h>
+                     }
+ 
+ int
+Index: mediatomb-0.11.0/configure.ac
+===================================================================
+--- mediatomb-0.11.0.orig/configure.ac	2009-01-08 10:56:02.000000000 +0100
++++ mediatomb-0.11.0/configure.ac	2009-01-08 10:56:20.000000000 +0100
+@@ -2327,7 +2327,7 @@
+ if test "x$FFMPEG_OK" = xyes; then
+     if test -n "$FFMPEG_SEARCH_HEADERS" ; then
+         CPPFLAGS="-I$FFMPEG_SEARCH_HEADERS"
+-        AC_CHECK_HEADER($FFMPEG_SEARCH_HEADERS/ffmpeg/avformat.h,
++        AC_CHECK_HEADER($FFMPEG_SEARCH_HEADERS/libavformat/avformat.h,
+                 [
+                     FFMPEG_CXXFLAGS="-I$FFMPEG_SEARCH_HEADERS"
+                 ],
+@@ -2340,12 +2340,12 @@
+                 ]
+         )
+     else 
+-        AC_CHECK_HEADER(ffmpeg/avformat.h,
++        AC_CHECK_HEADER(libavformat/avformat.h,
+             [],
+             [
+                 CPPFLAGS="-I$SEARCH_DIR_HEADERS"
+                 unset ac_cv_header_ffmpeg_avformat_h
+-                AC_CHECK_HEADER($SEARCH_DIR_HEADERS/ffmpeg/avformat.h,
++                AC_CHECK_HEADER($SEARCH_DIR_HEADERS/libavformat/avformat.h,
+                     [
+                         FFMPEG_CXXFLAGS="-I$SEARCH_DIR_HEADERS"
+                     ],
+@@ -2447,7 +2447,7 @@
+             [
+                 #define __STDC_CONSTANT_MACROS
+                 #include <stdint.h>
+-                #include <ffmpeg/avformat.h>
++                #include <libavformat/avformat.h>
+             ],
+             [
+                 av_register_all();
+@@ -2462,7 +2462,7 @@
+                     #define __STDC_CONSTANT_MACROS
+                     #include <stdint.h>
+                     extern "C" {
+-                        #include <ffmpeg/avformat.h>
++                        #include <libavformat/avformat.h>
+                     }
+                 ],
+                 [
+Index: mediatomb-0.11.0/src/metadata/ffmpeg_handler.cc
+===================================================================
+--- mediatomb-0.11.0.orig/src/metadata/ffmpeg_handler.cc	2009-01-08 10:56:32.000000000 +0100
++++ mediatomb-0.11.0/src/metadata/ffmpeg_handler.cc	2009-01-08 10:56:45.000000000 +0100
+@@ -56,7 +56,7 @@
+ {
+ #endif
+ 
+-#include <ffmpeg/avformat.h>
++#include <libavformat/avformat.h>
+ 
+ #ifdef FFMPEG_NEEDS_EXTERN_C
+ } // extern "C"