[SCM] vlc/master: Drop backported patches.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 02678a5468c2ec4db484e90cb4fdd0e5a340b5ba
Author: Benjamin Drung <bdrung at debian.org>
Date:   Mon Jul 18 09:45:24 2011 +0200

    Drop backported patches.

diff --git a/debian/patches/bp-gnome-mime-types.patch b/debian/patches/bp-gnome-mime-types.patch
deleted file mode 100644
index 63126ce..0000000
--- a/debian/patches/bp-gnome-mime-types.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Rémi Denis-Courmont <remi at remlab.net>
-Date: Thu, 9 Jun 2011 19:36:31 +0300
-Subject: [PATCH] Add GNOME MIME types for Ogg Vorbis and Ogg Theora
-Origin: upstream, http://git.videolan.org/?p=vlc/vlc-1.1.git;a=commit;h=48997070b31d66c2826e4dd15687ddacebf9134a
-Applied-Upstream: 1.1.11
-
---- a/share/vlc.desktop
-+++ b/share/vlc.desktop
-@@ -53,5 +53,5 @@
- Terminal=false
- Type=Application
- Categories=AudioVideo;Player;
--MimeType=video/dv;video/mpeg;video/x-mpeg;video/msvideo;video/quicktime;video/x-anim;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-flc;video/x-fli;application/ogg;application/x-ogg;application/x-matroska;video/webm;audio/webm;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-wav;audio/x-mpegurl;audio/x-scpls;audio/x-m4a;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;application/vnd.rn-realmedia;audio/x-real-audio;audio/x-pn-realaudio;application/x-flac;audio/x-flac;application/x-shockwave-flash;misc/ultravox;audio/vnd.rn-realaudio;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-wav;audio/x-pn-windows-acm;image/vnd.rn-realpix;video/vnd.rn-realvideo;audio/x-pn-realaudio-plugin;application/x-extension-mp4;audio/mp4;video/mp4;video/mp4v-es;x-content/video-vcd;x-content/video-svcd;x-content/video-dvd;x-content/audio-cdda;x-content/audio-player;video/x-flv;
-+MimeType=video/dv;video/mpeg;video/x-mpeg;video/msvideo;video/quicktime;video/x-anim;video/x-avi;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/x-flc;video/x-fli;application/ogg;application/x-ogg;video/x-ogm+ogg;audio/x-vorbis+ogg;application/x-matroska;video/webm;audio/webm;audio/x-mp3;audio/x-mpeg;audio/mpeg;audio/x-wav;audio/x-mpegurl;audio/x-scpls;audio/x-m4a;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;application/vnd.rn-realmedia;audio/x-real-audio;audio/x-pn-realaudio;application/x-flac;audio/x-flac;application/x-shockwave-flash;misc/ultravox;audio/vnd.rn-realaudio;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-wav;audio/x-pn-windows-acm;image/vnd.rn-realpix;video/vnd.rn-realvideo;audio/x-pn-realaudio-plugin;application/x-extension-mp4;audio/mp4;video/mp4;video/mp4v-es;x-content/video-vcd;x-content/video-svcd;x-content/video-dvd;x-content/audio-cdda;x-content/audio-player;video/x-flv;
- X-KDE-Protocols=ftp,http,https,mms,rtmp,rtsp,sftp,smb
diff --git a/debian/patches/bp-pulseaudio-build-fix.patch b/debian/patches/bp-pulseaudio-build-fix.patch
deleted file mode 100644
index b624f2f..0000000
--- a/debian/patches/bp-pulseaudio-build-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Pierre Ynard <linkfanel at yahoo.fr>
-Date: Mon, 6 Jun 2011 23:31:05 +0200
-Subject: [PATCH] PulseAudio: build fix
-Origin: upstream, http://git.videolan.org/?p=vlc/vlc-1.1.git;a=commit;h=90c91a987009701df006265185d29b1fbda134b7
-Applied-Upstream: 1.1.11
-
---- a/modules/audio_output/pulse.c
-+++ b/modules/audio_output/pulse.c
-@@ -273,7 +273,7 @@
-     aout_instance_t *aout = (aout_instance_t *)obj;
- 
- #if !defined(PA_CHECK_VERSION) || !PA_CHECK_VERSION(0,9,22)
--    if( !vlc_xlib_init( p_this ) )
-+    if( !vlc_xlib_init( obj ) )
-         return VLC_EGENERIC;
- #endif
- 
diff --git a/debian/patches/series b/debian/patches/series
index 248c635..3400aa7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
 200_osdmenu_paths.patch
 xulrunner-1.9.1.patch
 900_weaken_schroedinger_deps.diff
-bp-pulseaudio-build-fix.patch
-bp-gnome-mime-types.patch

-- 
VLC media player packaging