Author: hobbes1069 Update of /cvs/free/rpms/openshot/F-14 In directory se02.es.rpmfusion.net:/tmp/cvs-serv15067 Added Files: openshot-1.4.0-doc-install.diff openshot-1.4.0-use_mlt-melt.diff Log Message: * Fri Sep 23 2011 Richard Shaw <hobbes1069(a)gmail.com&gt; - 1.4.0-1 - New release. openshot-1.4.0-doc-install.diff: setup.py | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) --- NEW FILE openshot-1.4.0-doc-install.diff --- diff -Naur openshot-1.4beta2.orig/setup.py openshot-1.4beta2/setup.py --- openshot-1.4beta2.orig/setup.py 2011-09-21 16:22:26.012332050 -0500 +++ openshot-1.4beta2/setup.py 2011-09-21 16:22:58.805224968 -0500 @@ -53,6 +53,31 @@ locale_files.append(filepath) +# Add the help files +help_files = [] +for path in glob.glob(os.path.join('docs', 'gnome', '*')): + lang = os.path.basename(path) + if lang == 'figures': + continue + path_xml = os.path.join('share', 'gnome', 'help', 'openshot', lang) + help_files.append((path_xml, glob.glob('%s/*.xml' % path))) + +# figures are not locale-specific +figures = glob.glob(os.path.join('docs', 'gnome', 'figures', '*.png')) +figures_path = os.path.join('share', 'gnome', 'help', 'openshot', 'figures') +help_files.append((figures_path, figures)) +figures = glob.glob(os.path.join('docs', 'gnome', 'figures', 'effects', '*.png')) +figures_path = os.path.join('share', 'gnome', 'help', 'openshot', 'figures', 'effects') +help_files.append((figures_path, figures)) +figures = glob.glob(os.path.join('docs', 'gnome', 'figures', 'transitions', '*.png')) +figures_path = os.path.join('share', 'gnome', 'help', 'openshot', 'figures', 'transitions') +help_files.append((figures_path, figures)) + +# OMFs are in a different directory +omfs = glob.glob(os.path.join('docs', 'omf', '*.omf')) +omf_path = os.path.join('share', 'omf', 'openshot') +help_files.append((omf_path, omfs)) + # Call the main Distutils setup command # ------------------------------------- dist = setup( @@ -63,7 +88,7 @@ 'openshot.windows' : ['ui/*.ui', 'ui/icons/*'], 'openshot.uploads' : ['logos/*.png'], }, - data_files = os_files, + data_files = os_files + help_files, **info.SETUP ) # ------------------------------------- openshot-1.4.0-use_mlt-melt.diff: classes/av_formats.py | 2 +- windows/preferences.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- NEW FILE openshot-1.4.0-use_mlt-melt.diff --- diff -Naur openshot-1.4.0.orig/openshot/classes/av_formats.py openshot-1.4.0/openshot/classes/av_formats.py --- openshot-1.4.0.orig/openshot/classes/av_formats.py 2011-09-15 21:19:01.000000000 -0500 +++ openshot-1.4.0/openshot/classes/av_formats.py 2011-09-23 09:14:16.357445808 -0500 @@ -32,7 +32,7 @@ class formats: - def __init__(self, melt_command="melt"): + def __init__(self, melt_command="mlt-melt"): # init melt command self.melt_command = melt_command diff -Naur openshot-1.4.0.orig/openshot/windows/preferences.py openshot-1.4.0/openshot/windows/preferences.py --- openshot-1.4.0.orig/openshot/windows/preferences.py 2011-09-22 18:12:01.000000000 -0500 +++ openshot-1.4.0/openshot/windows/preferences.py 2011-09-23 09:14:16.357445808 -0500 @@ -358,7 +358,7 @@ "default_profile" : "DV/DVD NTSC", "project_file_type" : "ascii", "max_history_size" : "20", - "melt_command" : "melt", + "melt_command" : "mlt-melt", "blender_command" : "blender", "output_mode" : "sdl", "use_stock_icons" : "Yes",