[SCM] ffmpeg/ubuntu: update debian/changelog

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 2580768e5254fd8b62b7ed8bea2a9b91906689c6
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Feb 13 20:05:47 2011 +0100

    update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 28f4b0c..964149b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ffmpeg (4:0.6.1-5ubuntu1) natty; urgency=low
+
+  * Merge from debian. Remaining changes:
+    - don't build against libfaad, libdirac, librtmp and libopenjpeg (all in universe)
+    - explicitly --enable-pic on powerpc, cf. LP #654666
+    - different arm configure bits that should probably better be merged into debian
+
+ -- Reinhard Tartler <siretart at tauware.de>  Sun, 13 Feb 2011 20:04:06 +0100
+
 ffmpeg (4:0.6.1-5) unstable; urgency=low
 
   * don't enable vaapi support on the hurd, Closes: #613034
@@ -179,7 +188,6 @@ ffmpeg (4:0.6~svn20100505-1) experimental; urgency=low
   * Many upstream changes, see upstream Changelog for details
 
  -- Reinhard Tartler <siretart at tauware.de>  Sun, 24 Jan 2010 21:24:56 +0100
-<<<<<<< HEAD
 
 ffmpeg (4:0.5.1-1ubuntu1) lucid; urgency=low
 
@@ -237,8 +245,6 @@ ffmpeg (4:0.5+svn20090706-5ubuntu1) lucid; urgency=low
        - libopenjpeg
 
  -- Reinhard Tartler <siretart at tauware.de>  Sat, 16 Jan 2010 10:12:15 +0100
-=======
->>>>>>> origin/master
 
 ffmpeg (4:0.5+svn20090706-5) unstable; urgency=medium
 

-- 
FFmpeg packaging