[SCM] dvdstyler/master: delete drop-mplex.patch mjpegtools is now part of Debian and there are known issues not using it when multiplexing menus

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

The following commit has been merged in the master branch:
commit 69935002d64d3bc869792bec451f21d95f72990c
Author: Fabrice Coutadeur <coutadeurf at gmail.com>
Date:   Fri Aug 16 16:54:11 2013 +0200

    delete drop-mplex.patch
    mjpegtools is now part of Debian and there are known issues not using it when multiplexing menus

diff --git a/debian/patches/drop-mplex.patch b/debian/patches/drop-mplex.patch
deleted file mode 100644
index ec5c065..0000000
--- a/debian/patches/drop-mplex.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: Drop references to mplex in the settings popup to avoid enabling it
-Author: Fabrice Coutadeur <fabricesp at ubuntu.com>
----
- src/Config.h        |    2 +-
- src/SettingsDlg.cpp |    4 ----
- 2 files changed, 1 insertion(+), 5 deletions(-)
-
---- dvdstyler.orig/src/SettingsDlg.cpp
-+++ dvdstyler/src/SettingsDlg.cpp
-@@ -216,8 +216,6 @@ void SettingsDlg::CreatePropPanel(wxSize
- 
- 	wxSizer* grpSizer = BeginGroup(debugSizer, _("Debug"));
- 	AddCheckProp(grpSizer, _("Don't remove temp files"), !s_config.GetRemoveTempFiles(def));
--	AddCheckProp(grpSizer, _("Use mplex"), s_config.GetUseMplex(def));
--	AddCheckProp(grpSizer, _("Use mplex for menus"), s_config.GetUseMplexForMenus(def));
- }
- 
- bool SettingsDlg::SetValues() {
-@@ -263,8 +261,6 @@ bool SettingsDlg::SetValues() {
- 	s_config.SetAddECCCmd(GetString(i++));
- 	s_config.SetFormatCmd(GetString(i++));
- 	s_config.SetRemoveTempFiles(!GetBool(i++));
--	s_config.SetUseMplex(GetBool(i++));
--	s_config.SetUseMplexForMenus(GetBool(i++));
- 	return true;
- }
- 
---- dvdstyler.orig/src/Config.h
-+++ dvdstyler/src/Config.h
-@@ -59,7 +59,7 @@ const int DEF_DVD_RESERVED_SPACE = 0; //
- 	const wxString DEF_ADD_ECC_CMD   = _T("dvdisaster -mRS02 -n dvd -c -i \"$FILE\"");
- #endif
- const bool DEF_USE_MPLEX = false;
--const bool DEF_USE_MPLEX_FOR_MENUS = true;
-+const bool DEF_USE_MPLEX_FOR_MENUS = false;
- #ifdef USE_FFMPEG
- const wxString DEF_AVCONV_CMD    = _T("ffmpeg");
- #else
diff --git a/debian/patches/series b/debian/patches/series
index dd3a29d..86497cd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 fix_desktop_file.patch #Fix errors detected by desktop-file-validate
 genisoimage.patch
-drop-mplex.patch

-- 
dvdstyler packaging