r50 - videolan/vlc/debian

[xtophe-guest at alioth.debian.org]

Author: xtophe-guest
Date: 2006-05-24 21:58:37 +0000 (Wed, 24 May 2006)
New Revision: 50

Modified:
   videolan/vlc/debian/changelog
   videolan/vlc/debian/rules
Log:
Synchronize with Debian


Modified: videolan/vlc/debian/changelog
===================================================================
--- videolan/vlc/debian/changelog	2006-05-23 14:50:41 UTC (rev 49)
+++ videolan/vlc/debian/changelog	2006-05-24 21:58:37 UTC (rev 50)
@@ -4,25 +4,30 @@
     + 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
+vlc (0.8.5.debian-1) unstable; urgency=low
 
+  * New upstream release (Closes: #364934).
+  * This release no longer disables audio input if the v4l video device does
+    not advertise an audio device (Closes: #316377).
+  * This release fixes PPC asm compilation issues in x264 (Closes: #366965).
+
   * debian/control:
     + Merged wxvlc and vlc-plugin-alsa into vlc to get rid of circular
       dependencies (Closes: #365816).
     + Set policy to 3.7.2.
     + libxosd-dev is installable again; build-depend on it (Closes: #364937).
 
-  * debian/patches/030_x264_ppc_asm.diff:
-    + Fix PPC assembly compilation issues in x264 (Closes: #366965).
+  * debian/patches/030_x264_altivec.diff:
+  * debian/patches/030_x264_armvl.diff:
+    + Patches applied upstream. Removed.
 
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Sun, 14 May 2006 00:54:51 -0500
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Tue, 23 May 2006 16:15:56 +0200
 
 vlc (0.8.5-test3.debian-3) unstable; urgency=low
 
@@ -32,14 +37,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:
-    + Build-depend on libdvdread-dev (>= 0.9.5) because libdvdread3-dev just
-      disappeared (Closes: #364681).
-
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Tue, 25 Apr 2006 09:05:45 +0200
-
 vlc (0.8.5-test3.debian-2) unstable; urgency=low
 
   * debian/control:

Modified: videolan/vlc/debian/rules
===================================================================
--- videolan/vlc/debian/rules	2006-05-23 14:50:41 UTC (rev 49)
+++ videolan/vlc/debian/rules	2006-05-24 21:58:37 UTC (rev 50)
@@ -65,7 +65,6 @@
 	--enable-dvdnav \
 	--enable-gnutls \
 	--enable-ffmpeg \
-	--enable-xosd \
 	--enable-smb \
 	--disable-gnomevfs \
 	--enable-bonjour \