openshot.code team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 568
committer: Jonathan Thomas <Jonathan.Oomph@xxxxxxxxx>
branch nick: openshot
timestamp: Wed 2011-09-14 22:34:32 -0500
message:
  Sorry, but I had to revert the patch from revision 507.  It was breaking the Debian packaging.  If the setup.py installs these files, then our "openshot" Debian package will install these files too.  Which then conflicts with our "openshot-docs" package.  So... I'm not sure the best way to fix this, so for now, I'm reverting.
  
  Also, I reverted my recent changes the MANIFEST.in file, which excluded the help folders from our "setup.py sdist" command, which doesn't make any since... now that I think about it.  These folders need to be in our source distribution, but not installed by the setup.py.
modified:
  MANIFEST.in
  setup.py


--
lp:openshot
https://code.launchpad.net/~openshot.code/openshot/main

Your team OpenShot Code is subscribed to branch lp:openshot.
To unsubscribe from this branch go to https://code.launchpad.net/~openshot.code/openshot/main/+edit-subscription

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2011-09-14 06:44:32 +0000
+++ MANIFEST.in	2011-09-15 03:34:32 +0000
@@ -6,12 +6,6 @@
 recursive-include openshot *
 recursive-include xdg *
 
-exclude docs/gnome/*
-exclude docs/gnome/figures/*
-exclude docs/gnome/figures/effects/*
-exclude docs/gnome/figures/transitions/*
-exclude docs/gnome/*/*
-exclude docs/omf/*
 global-exclude *pyc
 global-exclude .project
 global-exclude .pydevproject
\ No newline at end of file

=== modified file 'setup.py'
--- setup.py	2011-09-08 19:43:22 +0000
+++ setup.py	2011-09-15 03:34:32 +0000
@@ -52,30 +52,6 @@
 	filepath = filepath.replace('openshot/', '')
 	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
 # -------------------------------------
@@ -87,7 +63,7 @@
 	 				'openshot.windows' : ['ui/*.ui', 'ui/icons/*'],
 	 				'openshot.uploads' : ['logos/*.png'],
 	 				},
-	 data_files = os_files + help_files,
+	 data_files = os_files,
 	 **info.SETUP
 )
 # -------------------------------------