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

[siretart at users.alioth.debian.org]

The following commit has been merged in the lucid branch:
commit 7b7589f973023a48d2086c6efa817eb63ef3af45
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Dec 30 18:26:39 2009 +0100

    update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 58e27c5..84e5499 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+vlc (1.0.4-1ubuntu1) lucid; urgency=low
+
+  * merge from debian. Remaining changes:
+    - build and install the libx264 plugin
+    - add Xb-Npp header to vlc package
+
+ -- Reinhard Tartler <siretart at tauware.de>  Wed, 30 Dec 2009 18:23:36 +0100
+
 vlc (1.0.4-1) unstable; urgency=low
 
   * New upstream release
@@ -29,12 +37,6 @@ vlc (1.0.4-1) unstable; urgency=low
 
  -- Christophe Mutricy <xtophe at videolan.org>  Wed, 30 Dec 2009 12:56:49 +0100
 
-vlc (1.0.3-1ubuntu3) lucid; urgency=low
-
-  * prepare new upload
-
- -- Reinhard Tartler <siretart at tauware.de>  Sat, 21 Nov 2009 22:16:53 +0100
-
 vlc (1.0.3-1ubuntu2) lucid; urgency=low
 
   [ Reinhard Tartler ]

-- 
VLC media player packaging