[SCM] VLC media player packaging branch, karmic, updated. debian/1.0.2-1-33-g9790d12

[siretart at users.alioth.debian.org]

The following commit has been merged in the karmic branch:
commit 9790d12dabe278e30bf819c4c3ad2d1717a13515
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Oct 13 10:35:27 2009 +0200

    PulseAudio: higher priority than ALSA, LP: #402018
    
    Without this, the PulseAudio output is completely useless. PulseAudio
    provides ALSA emulation, so VLC would always use ALSA. Now, it will use
    ALSA if PulseAudio is not available, but avoid the PulseAudio ALSA
    emulation which makes more sense. Either way, if your PulseAudio setup
    is broken, you are screwed - this change makes no difference.
    
    This closes launchpad bug #402018 and many of its dupes

diff --git a/debian/patches/402_increase_pulseaudio_score.diff b/debian/patches/402_increase_pulseaudio_score.diff
new file mode 100644
index 0000000..6ff43f4
--- /dev/null
+++ b/debian/patches/402_increase_pulseaudio_score.diff
@@ -0,0 +1,27 @@
+From: Rémi Denis-Courmont <remi at remlab.net>
+Date: Wed, 2 Sep 2009 16:44:55 +0000 (+0300)
+Subject: PulseAudio: higher priority than ALSA
+X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=7c4ca246a6be1d76bca3482893d5e1b35c5c7fb9
+
+PulseAudio: higher priority than ALSA
+
+Without this, the PulseAudio output is completely useless. PulseAudio
+provides ALSA emulation, so VLC would always use ALSA. Now, it will use
+ALSA if PulseAudio is not available, but avoid the PulseAudio ALSA
+emulation which makes more sense. Either way, if your PulseAudio setup
+is broken, you are screwed - this change makes no difference.
+---
+
+diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
+index 2fc17a4..f915a6b 100644
+--- a/modules/audio_output/pulse.c
++++ b/modules/audio_output/pulse.c
+@@ -97,7 +97,7 @@ static void uninit(aout_instance_t *p_aout);
+ vlc_module_begin ()
+     set_shortname( "Pulse Audio" )
+     set_description( N_("Pulseaudio audio output") )
+-    set_capability( "audio output", 40 )
++    set_capability( "audio output", 160 )
+     set_category( CAT_AUDIO )
+     set_subcategory( SUBCAT_AUDIO_AOUT )
+     add_shortcut( "pulseaudio" )
diff --git a/debian/patches/series b/debian/patches/series
index ca5ad3c..4a713f9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 200_osdmenu_paths.diff
 300_manpage_syntax.diff
 401_i420_mmx_pic.diff
+402_increase_pulseaudio_score.diff

-- 
VLC media player packaging