[SCM] vlc/ubuntu: Release 1.1.7-1ubuntu1 to Ubuntu natty.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit 14988a74b802a711d743cd0a2fc340795916b920
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Tue Feb 1 12:35:24 2011 +0100

    Release 1.1.7-1ubuntu1 to Ubuntu natty.

diff --git a/debian/changelog b/debian/changelog
index 9c099cd..cd08934 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+vlc (1.1.7-1ubuntu1) natty; urgency=low
+
+  * Merge from Debian experimental, remaining changes:
+    - build and install the libx264 plugin
+  * v4l is gone from the kernel. Build only v4l2.
+
+ -- Benjamin Drung <bdrung at ubuntu.com>  Tue, 01 Feb 2011 12:35:06 +0100
+
 vlc (1.1.7-1) experimental; urgency=low
 
   * New upstream release.

-- 
VLC media player packaging