diff -Nru vlc-0.8.6.release.h/debian/changelog vlc-0.8.6.release.h/debian/changelog
--- vlc-0.8.6.release.h/debian/changelog	2008-08-27 12:18:55.000000000 +0200
+++ vlc-0.8.6.release.h/debian/changelog	2008-08-27 12:19:07.000000000 +0200
@@ -1,3 +1,9 @@
+vlc (0.8.6.release.h-1ubuntu2) hardy; urgency=low
+
+  * Register that VLC can open flv files (LP: 261567)
+
+ -- Sveinung Kvilhaugsvik <sveinung84@users.sourceforge.net>  Wed, 27 Aug 2008 00:04:13 +0200
+
 vlc (0.8.6.release.h-1ubuntu1) intrepid; urgency=low
 
   * Merge from Debian unstable. (LP: #238873, #243450, #245563)
diff -Nru /tmp/lurXhkPWZo/vlc-0.8.6.release.h/debian/patches/register_flv.diff /tmp/OshvFAYjS4/vlc-0.8.6.release.h/debian/patches/register_flv.diff
--- vlc-0.8.6.release.h/debian/patches/register_flv.diff	1970-01-01 01:00:00.000000000 +0100
+++ vlc-0.8.6.release.h/debian/patches/register_flv.diff	2008-08-27 12:19:07.000000000 +0200
@@ -0,0 +1,10 @@
+Index: vlc-0.8.6.release.h/share/applications/vlc.desktop
+===================================================================
+--- vlc-0.8.6.release.h.orig/share/applications/vlc.desktop	2008-08-26 23:59:37.000000000 +0200
++++ vlc-0.8.6.release.h/share/applications/vlc.desktop	2008-08-27 00:00:17.000000000 +0200
+@@ -13,4 +13,4 @@
+ 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;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;
++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;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;video/x-flv;
diff -Nru /tmp/lurXhkPWZo/vlc-0.8.6.release.h/debian/patches/series /tmp/OshvFAYjS4/vlc-0.8.6.release.h/debian/patches/series
--- vlc-0.8.6.release.h/debian/patches/series	2008-08-27 12:18:55.000000000 +0200
+++ vlc-0.8.6.release.h/debian/patches/series	2008-08-27 12:19:07.000000000 +0200
@@ -1,3 +1,4 @@
+register_flv.diff
 001_am_maintainer_mode.diff
 #010_iceape.diff
 030_pulse.diff
diff -Nru /tmp/lurXhkPWZo/vlc-0.8.6.release.h/debian/vlc.desktop /tmp/OshvFAYjS4/vlc-0.8.6.release.h/debian/vlc.desktop
--- vlc-0.8.6.release.h/debian/vlc.desktop	2008-08-27 12:18:55.000000000 +0200
+++ vlc-0.8.6.release.h/debian/vlc.desktop	2008-08-27 12:19:07.000000000 +0200
@@ -15,4 +15,4 @@
 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;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;
+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;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;video/x-flv;
diff -Nru /tmp/lurXhkPWZo/vlc-0.8.6.release.h/.pc/.version /tmp/OshvFAYjS4/vlc-0.8.6.release.h/.pc/.version
--- vlc-0.8.6.release.h/.pc/.version	1970-01-01 01:00:00.000000000 +0100
+++ vlc-0.8.6.release.h/.pc/.version	2008-08-27 12:19:07.000000000 +0200
@@ -0,0 +1 @@
+2