[SCM] VLC media player packaging branch, maverick, updated. debian/1.1.1-1-79-g38a09d1

[bdrung-guest at users.alioth.debian.org]

The following commit has been merged in the maverick branch:
commit 38a09d1ab8d63b7978c98a224a8ec1a11fcbb96f
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Fri Jul 23 10:57:22 2010 +0200

    Changelog for 1.1.1-1+exp1ubuntu1.

diff --git a/debian/changelog b/debian/changelog
index 7acce77..0a25501 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+vlc (1.1.1-1+exp1ubuntu1) maverick; urgency=low
+
+  * Merge from Debian experimental, remaining changes:
+    - build and install the libx264 plugin
+    - add Xb-Npp header to vlc package
+    - Add apport hook to include more vlc dependencies in bug reports
+
+ -- Benjamin Drung <bdrung at ubuntu.com>  Fri, 23 Jul 2010 10:41:59 +0200
+
 vlc (1.1.1-1+exp1) experimental; urgency=low
 
   * Depends on xulrunner-dev >= 1.9.2

-- 
VLC media player packaging