[SCM] VLC media player packaging branch, experimental, updated. debian/1.0.0.rc2-1-10-gfc0f63a
xtophe-guest at users.alioth.debian.org
xtophe-guest at users.alioth.debian.org
Tue Jul 28 22:24:16 UTC 2009
The following commit has been merged in the experimental branch:
commit ec9bce4935f310a04a99ee4c5a26ef6800b3659b
Author: Christophe Mutricy <xtophe at videolan.org>
Date: Tue Jun 30 15:37:18 2009 +0200
Delete unused patch
diff --git a/debian/patches/404_duplicate_extended.diff b/debian/patches/404_duplicate_extended.diff
deleted file mode 100644
index dbe7fa6..0000000
--- a/debian/patches/404_duplicate_extended.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-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( "" ),
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list