[SCM] VLC media player packaging branch, lucid, updated. debian/1.0.6-1-58-gbe04fa8

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

The following commit has been merged in the lucid branch:
commit be04fa80ddcba337c9fd6fa27ac0ca3d2d2a57ce
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Fri Apr 23 12:19:33 2010 +0200

    Changelog for vlc 1.0.6-1ubuntu1.

diff --git a/debian/changelog b/debian/changelog
index 7088a51..e6e512c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+vlc (1.0.6-1ubuntu1) lucid; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - build and install the libx264 plugin
+    - add Xb-Npp header to vlc package
+    - Add patches 519-526 to fix FTBFS with xulruner-1.9.2 from upstream
+    - Add 600-drop-OJI-xul-192.patch to drop OJI support as xulrunner-1.9.2 on
+      Linux doesn't support it
+    - Add apport hook to include more vlc dependencies in bug reports
+    - Drop --sourcedir=debian/tmp from dh_install to install apport hook
+  * Drop 527-spanish-desktop.patch (merged upstream).
+
+ -- Benjamin Drung <bdrung at ubuntu.com>  Fri, 23 Apr 2010 12:16:15 +0200
+
 vlc (1.0.6-1) unstable; urgency=low
 
   * New upstream version 1.0.6

-- 
VLC media player packaging