diff -u unicap-0.9.3/debian/rules unicap-0.9.3/debian/rules
--- unicap-0.9.3/debian/rules
+++ unicap-0.9.3/debian/rules
@@ -53,12 +53,6 @@
 
 CFLAGS := $(CFLAGS) $$(pkg-config libavcodec libavutil xv x11 --cflags)
 
-# Needed only with unofficial libav* packages but harmless
-CFLAGS += \
-	-I/usr/include/ffmpeg/libavcodec \
-	-I/usr/include/ffmpeg/libavutil \
-	-I/usr/include/ffmpeg/libavformat
-
 LDFLAGS += -pthread -Wl,-z,defs -Wl,--as-needed -Wl,--no-undefined
 LDFLAGS := $(LDFLAGS) $$(pkg-config libavcodec libavutil xv x11 --libs)
 
@@ -92,7 +86,7 @@
 
 debian/install-unicap-stamp:
 	d-shlibmove --commit \
-		--override s/libavcodec51-dev/libavcodec-dev/ \
+		--override s/libavcodec52-dev/libavcodec-dev/ \
 		--override s/libavutil49-dev/libavutil-dev/ \
 		--override s/libraw1394-8-dev/libraw1394-dev/ \
 		--override 's/ | xlibs-dev (<< 4.3.0)//' \
@@ -107,7 +101,7 @@
 	touch $@
 debian/install-ucil-stamp:
 	d-shlibmove --commit \
-		--override s/libavcodec51-dev/libavcodec-dev/ \
+		--override s/libavcodec52-dev/libavcodec-dev/ \
 		--override s/libavutil49-dev/libavutil-dev/ \
 		--override s/libraw1394-8-dev/libraw1394-dev/ \
 		--override s/libpangoft2-1.0-0-dev/libpango1.0-dev/ \
@@ -118,7 +112,7 @@
 	touch $@
 debian/install-unicapgtk-stamp:
 	d-shlibmove --commit \
-		--override s/libavcodec51-dev/libavcodec-dev/ \
+		--override s/libavcodec52-dev/libavcodec-dev/ \
 		--override s/libavutil49-dev/libavutil-dev/ \
 		--override s/libraw1394-8-dev/libraw1394-dev/ \
 		--override s/libpangoft2-1.0-0-dev/libpango1.0-dev/ \
@@ -150,7 +144,7 @@
 # Needed by upstream build process
 CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), intltool, gtk-doc-tools (>= 1.4)
 CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libgtk2.0-dev (>= 2.9.0), libglib2.0-dev (>= 2.11.0)
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libavcodec-dev, libavformat-dev, libtheora-dev, libvorbis-dev
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libavcodec-dev, libtheora-dev, libvorbis-dev
 CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libasound2-dev, libpng12-dev
 CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libxv-dev
 CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libraw1394-dev (>= 1.1.0)
diff -u unicap-0.9.3/debian/control unicap-0.9.3/debian/control
--- unicap-0.9.3/debian/control
+++ unicap-0.9.3/debian/control
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Jonas Smedegaard <dr@jones.dk>
-Build-Depends: cdbs (>= 0.4.39), autotools-dev, gnulib (>= 0.0.20041014-2), devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), dh-buildinfo, debhelper (>= 5.0.44), intltool, gtk-doc-tools (>= 1.4), libgtk2.0-dev (>= 2.9.0), libglib2.0-dev (>= 2.11.0), libavcodec-dev, libavformat-dev, libtheora-dev, libvorbis-dev, libasound2-dev, libpng12-dev, libxv-dev, libraw1394-dev (>= 1.1.0), pkg-config, d-shlibs (>= 0.32)
+Build-Depends: cdbs (>= 0.4.39), autotools-dev, gnulib (>= 0.0.20041014-2), devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), dh-buildinfo, debhelper (>= 5.0.44), intltool, gtk-doc-tools (>= 1.4), libgtk2.0-dev (>= 2.9.0), libglib2.0-dev (>= 2.11.0), libavcodec-dev, libtheora-dev, libvorbis-dev, libasound2-dev, libpng12-dev, libxv-dev, libraw1394-dev (>= 1.1.0), pkg-config, d-shlibs (>= 0.32)
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/collab-maint/unicap.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/unicap.git;a=summary
diff -u unicap-0.9.3/debian/changelog unicap-0.9.3/debian/changelog
--- unicap-0.9.3/debian/changelog
+++ unicap-0.9.3/debian/changelog
@@ -1,3 +1,12 @@
+unicap (0.9.3-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * add patch for new location of ffmpeg header files. Closes: #516949
+  * remove references to libavformat in debian/rules. The package does not
+    use that library at all, only libavcodec and thus libavutil
+
+ -- Reinhard Tartler <siretart@tauware.de>  Tue, 24 Feb 2009 20:41:37 +0100
+
 unicap (0.9.3-3) unstable; urgency=low
 
   * Fix watch file.
diff -u unicap-0.9.3/debian/patches/series unicap-0.9.3/debian/patches/series
--- unicap-0.9.3/debian/patches/series
+++ unicap-0.9.3/debian/patches/series
@@ -5,2 +5,3 @@
 1005_fix_POTFILES.patch
+1006_fix_ffmpeg_includes.patch
 2001_ignore_patched_gettextized_file.patch
only in patch2:
unchanged:
--- unicap-0.9.3.orig/debian/patches/1006_fix_ffmpeg_includes.patch
+++ unicap-0.9.3/debian/patches/1006_fix_ffmpeg_includes.patch
@@ -0,0 +1,35 @@
+--- a/libucil/colorspace.c
++++ b/libucil/colorspace.c
+@@ -20,8 +20,8 @@
+ #include "config.h"
+ 
+ #if HAVE_AVCODEC
+-#include <avcodec.h>
+-#include <avutil.h>
++#include <libavcodec/avcodec.h>
++#include <libavutil/avutil.h>
+ #endif //HAVE_AVCODEC
+ 
+ #include <sys/types.h>
+--- a/examples/c/avcodec/recordvideo.c
++++ b/examples/c/avcodec/recordvideo.c
+@@ -21,7 +21,7 @@
+ #undef HAVE_AV_CONFIG_H
+ #endif
+ 
+-#include <avcodec.h>
++#include <libavcodec/avcodec.h>
+ 
+ int PixelFormatBPP[] = {
+    //PIX_FMT_NONE= -1,
+--- a/libucil/ucil_avc_avi.c
++++ b/libucil/ucil_avc_avi.c
+@@ -31,7 +31,7 @@
+ #include <semaphore.h>
+ #include <pthread.h>
+ #include <stdarg.h>
+-#include <avcodec.h>
++#include <libavcodec/avcodec.h>
+ #include <glib.h>
+ #include "avi.h"
+ #include "ucil_avc_avi.h"