[SCM] VLC media player packaging branch, sid, updated. debian/0.9.9a-1-16-g032c9f8

[xtophe-guest at users.alioth.debian.org]

The following commit has been merged in the sid branch:
commit c0b0caa8fb555507a85898f4816cdfb33ee940df
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Thu May 14 19:13:33 2009 +0200

    Remove duplicate "extended Settings" entry in context menu
    
    Thanks: Matt Kraai
    Closes: #526603

diff --git a/debian/patches/404_duplicate_extended.diff b/debian/patches/404_duplicate_extended.diff
new file mode 100644
index 0000000..dbe7fa6
--- /dev/null
+++ b/debian/patches/404_duplicate_extended.diff
@@ -0,0 +1,22 @@
+commit d9f11e475b09045f9bc6a9f0e2378b790ae32a64
+Author: Matt Kraai <kraai at ftbfs.org>
+Date:   Thu May 14 18:45:32 2009 +0200
+
+    Remove duplicate Interface->Extended Settings menu items
+    
+    From debian #526603
+    Signed-off-by: Christophe Mutricy <xtophe at videolan.org>
+
+diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
+index 5fc6f08..64d7ebb 100644
+--- a/modules/gui/qt4/menus.cpp
++++ b/modules/gui/qt4/menus.cpp
+@@ -846,8 +846,6 @@ void QVLCMenu::PopupMenu( intf_thread_t *p_intf, bool show )
+             }
+             addDPStaticEntry( submenu, qtr( I_MENU_EXT ), "",
+                 ":/settings", SLOT( extendedDialog() ) );
+-            addDPStaticEntry( submenu, qtr( I_MENU_EXT ), "",
+-                ":/settings", SLOT( extendedDialog() ) );
+             if( mi )
+             {
+                 action = submenu->addAction( QIcon( "" ),
diff --git a/debian/patches/series b/debian/patches/series
index c0e9ea4..56a60e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 401_detect_xinerama_fullscreen.diff
 402_fortune_pruning.diff
 403_http_hosts.diff
+404_duplicate_extended.diff

-- 
VLC media player packaging