r46 - videolan/vlc/debian

[xtophe-guest at alioth.debian.org]

Author: xtophe-guest
Date: 2006-05-17 19:39:49 +0000 (Wed, 17 May 2006)
New Revision: 46

Modified:
   videolan/vlc/debian/changelog
Log:
Fix changelog


Modified: videolan/vlc/debian/changelog
===================================================================
--- videolan/vlc/debian/changelog	2006-05-15 21:11:05 UTC (rev 45)
+++ videolan/vlc/debian/changelog	2006-05-17 19:39:49 UTC (rev 46)
@@ -1,4 +1,16 @@
-<<<<<<< .mine
+vlc (0.8.6-svn) experimental; urgency=low
+
+  * debian/control
+    + Build-depends on libshout3-dev
+  
+  * debian/patches
+    + x264 patches have been applied upstream
+    + xulrunner patch has been applied upstream
+
+  * debian/wxvlc.desktop is now supplied by upstream
+
+ -- Christophe Mutricy <xtophe at videolan.org>  Wed, 17 May 2006 20:11:44 +0100
+
 vlc (0.8.5-test3.debian-4) UNRELEASED; urgency=low
 
   * debian/control:
@@ -20,7 +32,6 @@
 
  -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Tue, 25 Apr 2006 09:05:45 +0200
 
-=======
 vlc (0.8.5-test3.debian-3) unstable; urgency=low
 
   * debian/control:
@@ -29,7 +40,6 @@
 
  -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Tue, 25 Apr 2006 09:05:45 +0200
 
->>>>>>> .r42
 vlc (0.8.5-test3.debian-2) unstable; urgency=low
 
   * debian/control: