[SCM] x264/ubuntu: update debian/changelog

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit ccdd73624e57aa58c228088665d3d1659f9d81bd
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jul 26 14:25:29 2011 +0200

    update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 4ec3dea..c5199b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+x264 (2:0.116.2037+gitf8ebd4a-1ubuntu1) oneiric; urgency=low
+
+  * Merge from debian (seriously!), remaining changes
+    - tighten dependencies on Libav 0.7
+    - Build against libffms2-dev
+    - build against libgpac-dev to enable .mp4 output
+    - allow parallel builds
+
+ -- Reinhard Tartler <siretart at tauware.de>  Tue, 26 Jul 2011 14:25:22 +0200
+
 x264 (2:0.116.2037+gitf8ebd4a-1) unstable; urgency=low
 
   [ Andres Mejia ]

-- 
x264 packaging