[SCM] VLC media player packaging branch, lucid, updated. debian/1.0.6-1ubuntu1-3-ge5cac67

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

The following commit has been merged in the lucid branch:
commit e5cac6711903c265d2fcca045ea1028be4b93e8a
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Wed May 5 01:33:23 2010 +0200

    SRU for Lucid.

diff --git a/debian/changelog b/debian/changelog
index e6e512c..15f5068 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+vlc (1.0.6-1ubuntu1.1) lucid-proposed; urgency=low
+
+  * debian/vlc{,-nox}.install:
+    - Move libx264 plugin from vlc to vlc-nox (LP: #575054).
+  * debian/control:
+    - Adjust vlc-nox Replaces field properly.
+
+ -- Alessio Treglia <quadrispro at ubuntu.com>  Tue, 04 May 2010 14:17:27 +0200
+
 vlc (1.0.6-1ubuntu1) lucid; urgency=low
 
   * Merge from Debian unstable, remaining changes:

-- 
VLC media player packaging