Merge lp:~michael-sheldon/jokosher/gstwinbuild into lp:jokosher

[Michael Sheldon]

Updates the files involved in creating a Windows release to make them compatible with newer versions of GStreamer, GTK and Python.

=== modified file 'setup_win32.py'
--- setup_win32.py	2010-02-25 23:50:24 +0000
+++ setup_win32.py	2010-03-04 17:22:00 +0000
@@ -4,6 +4,8 @@
 from subprocess import *
 import os
 import glob
+import pygst
+pygst.require('0.10')
 import py2exe
 
 dist = setup(name='jokosher',
@@ -27,7 +29,7 @@
 	options = {
 			'py2exe': {
 				'packages' : 'encodings, Jokosher, Jokosher.elements, Jokosher.ui',
-				'includes' : 'cairo, gtk, gtk.glade, gobject, pango, pangocairo, atk, gst, pygst, xdg, Queue, xml.etree.ElementTree, gtk.keysyms, code, keyword, re'
+				'includes' : 'cairo, gtk, gtk.glade, gobject, pango, pangocairo, atk, gio, gst, pygst, xdg, Queue, xml.etree.ElementTree, gtk.keysyms, code, keyword, re, pkg_resources'
 			}
 	},
 	data_files=[

=== modified file 'windows_installer.iss'
--- windows_installer.iss	2010-02-26 02:51:56 +0000
+++ windows_installer.iss	2010-03-04 17:22:00 +0000
@@ -5,6 +5,10 @@
 DefaultGroupName=Jokosher
 Compression=bzip/9
 
+[InstallDelete]
+Type: files; Name: {app}\*.dll
+Type: files; Name: {app}\*.pyd
+
 [Files]
 Source: dist/*; DestDir: {app}; Flags: recursesubdirs createallsubdirs