diff -u libavg-0.8.0/debian/changelog libavg-0.8.0/debian/changelog
--- libavg-0.8.0/debian/changelog
+++ libavg-0.8.0/debian/changelog
@@ -1,3 +1,12 @@
+libavg (0.8.0-2ubuntu1) jaunty; urgency=low
+
+  * Merge from debian unstable, remaining changes: (LP: #315451)
+    - No remaining changes.
+  * debian/patches/ffmpeg-headers.diff: Patch to provide new
+    header locations for libavcodec, libavformat & libswscale.
+
+ -- Stefan Lesicnik <stefan@lsd.co.za>  Fri, 09 Jan 2009 15:03:00 +0200
+
 libavg (0.8.0-2) unstable; urgency=low
 
   * Add patch gcc-4.4.diff provided by Martin Michlmayr.
@@ -15,6 +24,15 @@
 
  -- Torsten Werner <twerner@debian.org>  Tue, 07 Oct 2008 22:49:40 +0200
 
+libavg (0.7.0-9ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+   + Patch configure to use pkg-config instead of ffmpeg-config. This
+     change can be reverted once a new version of ffmpeg-free is
+     uploaded which removes ffmpeg-config.
+
+ -- Emanuele Gentili <emgent@ubuntu.com>  Wed, 20 Aug 2008 02:29:08 +0200
+
 libavg (0.7.0-9) unstable; urgency=low
 
   * Add missing Build-Depends: libswscale-dev. (Closes: #487644)
@@ -22,12 +40,38 @@
 
  -- Torsten Werner <twerner@debian.org>  Fri, 15 Aug 2008 17:15:47 +0200
 
+libavg (0.7.0-8ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+   + Patch configure to use pkg-config instead of ffmpeg-config. This 
+     change can be reverted once a new version of ffmpeg-free is 
+     uploaded which removes ffmpeg-config.
+   + debian/control:
+    - Update Standards Version.
+
+ -- Emanuele Gentili <emgent@ubuntu.com>  Sat, 02 Aug 2008 15:32:35 +0200
+
 libavg (0.7.0-8) unstable; urgency=medium
 
   * Change Build-Depends: libdc1394-22-dev.
 
  -- Torsten Werner <twerner@debian.org>  Sun, 20 Jul 2008 23:14:49 +0200
 
+libavg (0.7.0-7ubuntu1) intrepid; urgency=low
+
+  [ Iain Lane ]
+  * Patch configure to use pkg-config instead of ffmpeg-config. This change
+    can be reverted once a new version of ffmpeg-free is uploaded which
+    removes ffmpeg-config. (LP: #246720)
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+  [ Michael Bienia ]
+  * Convert the above changes to configure into a quilt patch
+    (disable_ffmpeg-config.diff).
+
+ -- Michael Bienia <geser@ubuntu.com>  Wed, 09 Jul 2008 23:25:41 +0200
+
 libavg (0.7.0-7) unstable; urgency=high
 
   * Remove Build-Depends: liblzo-dev; thanks to Andreas Henriksson.
@@ -223,0 +268 @@
+
diff -u libavg-0.8.0/debian/control libavg-0.8.0/debian/control
--- libavg-0.8.0/debian/control
+++ libavg-0.8.0/debian/control
@@ -1,7 +1,8 @@
 Source: libavg
 Section: python
 Priority: optional
-Maintainer: Torsten Werner <twerner@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Torsten Werner <twerner@debian.org>
 Build-Depends: cdbs, debhelper (>= 5), libavcodec-dev, libavformat-dev,
  libboost-python-dev (>= 1.34.1-8), libboost-thread-dev, libdc1394-22-dev,
  libgraphicsmagick++1-dev, libpango1.0-dev, libsdl1.2-dev, libswscale-dev,
diff -u libavg-0.8.0/debian/patches/series libavg-0.8.0/debian/patches/series
--- libavg-0.8.0/debian/patches/series
+++ libavg-0.8.0/debian/patches/series
@@ -1,0 +2 @@
+ffmpeg-headers.diff
only in patch2:
unchanged:
--- libavg-0.8.0.orig/debian/.pc/.version
+++ libavg-0.8.0/debian/.pc/.version
@@ -0,0 +1 @@
+2
only in patch2:
unchanged:
--- libavg-0.8.0.orig/debian/patches/ffmpeg-headers.diff
+++ libavg-0.8.0/debian/patches/ffmpeg-headers.diff
@@ -0,0 +1,70 @@
+=== modified file 'src/video/AudioVideoMsg.h'
+--- old/src/video/AudioVideoMsg.h	2008-11-25 13:58:13 +0000
++++ new/src/video/AudioVideoMsg.h	2009-01-09 09:46:41 +0000
+@@ -42,7 +42,7 @@
+ #endif
+ 
+ extern "C" {
+-#include <ffmpeg/avformat.h>
++#include <libavformat/avformat.h>
+ }
+ 
+ namespace avg {
+
+=== modified file 'src/video/FFMpegDecoder.h'
+--- old/src/video/FFMpegDecoder.h	2008-11-25 13:58:13 +0000
++++ new/src/video/FFMpegDecoder.h	2009-01-09 09:42:12 +0000
+@@ -46,10 +46,10 @@
+ #endif
+ 
+ extern "C" {
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/avformat.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
+ #ifdef AVG_ENABLE_SWSCALE
+-#include <ffmpeg/swscale.h>
++#include <libswscale/swscale.h>
+ #endif
+ }
+ #include <boost/thread/mutex.hpp>
+
+=== modified file 'src/video/FFMpegDemuxer.h'
+--- old/src/video/FFMpegDemuxer.h	2008-11-25 13:58:13 +0000
++++ /new/src/video/FFMpegDemuxer.h	2009-01-09 09:37:00 +0000
+@@ -42,7 +42,7 @@
+ #pragma warning(push)
+ #pragma warning(disable:4244)
+ #endif
+-#include <ffmpeg/avformat.h>
++#include <libavformat/avformat.h>
+ #ifdef _WIN32
+ #pragma warning(pop)
+ #endif
+
+=== modified file 'src/video/IDemuxer.h'
+--- old/src/video/IDemuxer.h	2008-11-25 13:58:13 +0000
++++ new/src/video/IDemuxer.h	2009-01-09 09:38:40 +0000
+@@ -42,7 +42,7 @@
+ #pragma warning(push)
+ #pragma warning(disable:4244)
+ #endif
+-#include <ffmpeg/avformat.h>
++#include <libavformat/avformat.h>
+ #ifdef _WIN32
+ #pragma warning(pop)
+ #endif
+
+=== modified file 'src/video/PacketVideoMsg.h'
+--- old/src/video/PacketVideoMsg.h	2008-11-25 13:58:13 +0000
++++ new/src/video/PacketVideoMsg.h	2009-01-09 09:42:26 +0000
+@@ -39,7 +39,7 @@
+ #endif
+ 
+ extern "C" {
+-#include <ffmpeg/avformat.h>
++#include <libavformat/avformat.h>
+ }
+ 
+ #include <vector>
+