# HG changeset patch
# User Chris Cannam <chris.cannam@eecs.qmul.ac.uk>
# Date 1359125738 0
# Node ID 0693e1548d867ee261c96f0460da6375cfee0b32
# Parent  d863c00020a9f06a5d556776320aa23f1e91171c
Add updated PyQt

diff -r d863c00020a9 -r 0693e1548d86 easyhg.wxs
--- a/easyhg.wxs	Thu Jan 24 16:05:31 2013 +0000
+++ b/easyhg.wxs	Fri Jan 25 14:55:38 2013 +0000
@@ -257,15 +257,20 @@
                   DiskId="1"
                   Source="d:\easyhg-bundle-dependencies\pyexpat.pyd"/>
               <File
-                  Id="sip"
-                  Name="sip.pyd"
-                  DiskId="1"
-                  Source="d:\easyhg-bundle-dependencies\sip.pyd"/>
-              <File
                   Id="unicodedata"
                   Name="unicodedata.pyd"
                   DiskId="1"
                   Source="d:\easyhg-bundle-dependencies\unicodedata.pyd"/>
+              <File
+                  Id="QtCorepy"
+                  Name="PyQt4.QtCore.pyd"
+                  DiskId="1"
+                  Source="d:\easyhg-bundle-dependencies\PyQt4.QtCore.pyd" />
+              <File
+                  Id="QtGuipy"
+                  Name="PyQt4.QtGui.pyd"
+                  DiskId="1"
+                  Source="d:\easyhg-bundle-dependencies\PyQt4.QtGui.pyd" />
             </Component>		  
 
             <Component
@@ -289,39 +294,6 @@
                   KeyPath="yes"/>
             </Component>		  
 
-            <Directory Id="PyQt4" Name="PyQt4">
-              <Component
-                  Id="PyQt4"
-                  Guid="5EE2BE01-3D91-44C5-869A-5E8167079AA0">
-                <File
-                    Id="init"
-                    Name="__init__.py"
-                    DiskId="1"
-                    Source="d:\easyhg-bundle-dependencies\PyQt4\__init__.py"
-                    KeyPath="yes"/>
-                <File
-                    Id="inito"
-                    Name="__init__.pyo"
-                    DiskId="1"
-                    Source="d:\easyhg-bundle-dependencies\PyQt4\__init__.pyo" />
-                <File
-                    Id="Qtpy"
-                    Name="Qt.pyd"
-                    DiskId="1"
-                    Source="d:\easyhg-bundle-dependencies\PyQt4\Qt.pyd" />
-                <File
-                    Id="QtCorepy"
-                    Name="QtCore.pyd"
-                    DiskId="1"
-                    Source="d:\easyhg-bundle-dependencies\PyQt4\QtCore.pyd" />
-                <File
-                    Id="QtGuipy"
-                    Name="QtGui.pyd"
-                    DiskId="1"
-                    Source="d:\easyhg-bundle-dependencies\PyQt4\QtGui.pyd" />
-              </Component>
-            </Directory>
-
         </Directory>
       </Directory>
 
@@ -346,7 +318,6 @@
       <ComponentRef Id="hg"/>
       <ComponentRef Id="sip"/>
       <ComponentRef Id="kdiff3"/>
-      <ComponentRef Id="PyQt4"/>
       <ComponentRef Id="ProgramMenuDir"/>
     </Feature>