diff -u -b -w -r enthought.orig/debug/setup.py enthought/debug/setup.py
--- enthought.orig/debug/setup.py	2006-08-31 20:18:18.000000000 -0700
+++ enthought/debug/setup.py	2007-03-29 18:06:03.000000000 -0700
@@ -14,9 +14,6 @@
 
     config.add_data_dir('images')
 
-    config.add_data_dir('plugin')
-    config.add_subpackage('plugin')
-
     config.add_data_files('*.txt')
 
     return config
diff -u -b -w -r enthought.orig/logger/setup.py enthought/logger/setup.py
--- enthought.orig/logger/setup.py	2006-08-31 20:18:14.000000000 -0700
+++ enthought/logger/setup.py	2007-03-29 18:06:40.000000000 -0700
@@ -12,9 +12,6 @@
                        delegate_options_to_subpackages=True,
                        quiet=True)
 
-    config.add_data_dir('plugin')
-    config.add_subpackage('plugin')
-
     config.add_data_dir('widget')
     config.add_subpackage('widget')
 
diff -u -b -w -r enthought.orig/naming/setup.py enthought/naming/setup.py
--- enthought.orig/naming/setup.py	2006-08-31 20:18:26.000000000 -0700
+++ enthought/naming/setup.py	2007-03-29 18:08:00.000000000 -0700
@@ -14,12 +14,6 @@
 
     config.add_subpackage('adapter')
     
-    config.add_subpackage('examples')
-    config.add_data_dir('examples')
-    
-    config.add_data_dir('tests')
-    config.add_subpackage('tests')
-
     config.add_subpackage('traits')
 
     config.add_subpackage('ui')
diff -u -b -w -r enthought.orig/pyface/dock/dock_sizer.py enthought/pyface/dock/dock_sizer.py
--- enthought.orig/pyface/dock/dock_sizer.py	2006-08-31 21:44:27.000000000 -0700
+++ enthought/pyface/dock/dock_sizer.py	2007-03-29 18:20:46.000000000 -0700
@@ -1303,7 +1303,9 @@
         self.check_features()
         dx, dy = self.width, self.height
         if self.control is not None:
-            dx, dy = self.control.GetBestFittingSize()
+            s = self.control.GetBestFittingSize()
+            dx = s.GetWidth()
+            dy = s.GetHeight()
             if self.width < 0:
                 self.width, self.height = dx, dy
 
@@ -3248,8 +3250,8 @@
         if self._contents is None:
             return
 
-        x,   y = self.GetPosition()
-        dx, dy = self.GetSize()
+        x,   y = self.GetPosition().Get()
+        dx, dy = self.GetSizeTuple()
         self._contents.recalc_sizes( x, y, dx, dy )
 
     #---------------------------------------------------------------------------
diff -u -b -w -r enthought.orig/pyface/dock/dock_window.py enthought/pyface/dock/dock_window.py
--- enthought.orig/pyface/dock/dock_window.py	2006-08-17 20:25:04.000000000 -0700
+++ enthought/pyface/dock/dock_window.py	2007-03-29 18:22:05.000000000 -0700
@@ -437,7 +437,7 @@
         """
         sizer = self.sizer
         if sizer is not None:
-            dx, dy = self.control.GetSize()
+            dx, dy = self.control.GetSizeTuple()
             sizer.SetDimension( 0, 0, dx, dy )
             
     #---------------------------------------------------------------------------
diff -u -b -w -r enthought.orig/pyface/setup.py enthought/pyface/setup.py
--- enthought.orig/pyface/setup.py	2006-08-31 20:18:26.000000000 -0700
+++ enthought/pyface/setup.py	2007-03-29 18:10:53.000000000 -0700
@@ -17,18 +17,23 @@
     config.add_subpackage('*.*')
 
     map(config.add_data_dir,
-        ['action/images','doc','dock/demos','dock/images',
-         'examples','grid/images','grid/tests','images','sheet/tests',
-         'sheet/swig_interface','tree/images'])
+        ['action/images','dock/images',
+  		 'grid/images','images','tree/images'])
     
     return config
 
 if __name__ == "__main__":
     from numpy.distutils.core import setup
     setup(version='1.1.0',
+
            description  = 'Traits capable windowing framework',
+
            author       = 'Enthought, Inc',
+
            author_email = 'info@enthought.com',
+
            url          = 'http://code.enthought.com/ets',
+
            license      = 'BSD',
+
            configuration=configuration)
diff -u -b -w -r enthought.orig/setup.py enthought/setup.py
--- enthought.orig/setup.py	2006-08-31 20:18:40.000000000 -0700
+++ enthought/setup.py	2007-03-29 18:16:00.000000000 -0700
@@ -31,149 +31,34 @@
 
     config.add_data_files('LICENSE.txt')
 
-    config.add_subpackage('chaco')
-
-    config.add_subpackage('chaco2')
-    config.add_subpackage('chaco2.examples')
-    config.add_subpackage('chaco2.tools')
-    config.add_subpackage('chaco2.advanced_datamodel')
-    config.add_data_files('chaco2/*.txt', 'chaco2/LICENSE')
-    config.add_data_dir('chaco2/doc')
-    config.add_data_dir('chaco2/tests')
-    
-    config.add_subpackage('charm')
-    config.add_subpackage('charm.ui')
-    config.add_subpackage('charm.ui.action')
-    config.add_data_dir('charm/ui/images')
-    config.add_subpackage('charm.plugin')
-    config.add_subpackage('charm.plugin.charm')
-    config.add_subpackage('charm.plugin.charm.view')
-    config.add_data_dir('charm/plugin/charm/images')
-    config.add_data_dir('charm/apps')
-    
-    config.add_data_dir('envisage/repository/images')
-
-    config.add_subpackage('component')
-    config.add_data_dir('component/image')
-
     config.add_subpackage('debug')
     config.add_subpackage('debug.*')
     config.add_data_dir('debug/images')
 
-    config.add_subpackage('enable')
-    config.add_subpackage('enable2')
-
-    config.add_subpackage('endo')
-
-#    config.add_data_dir('enquire')
-
-    config.add_subpackage('envisage')
-
-    config.add_subpackage('freetype')
-
-    config.add_subpackage('gotcha')
-    config.add_subpackage('gotcha.*')
-    config.add_subpackage('gotcha.*.*')
-    config.add_data_dir('gotcha/*/images')
-
-    config.add_subpackage('graph')
-    config.add_subpackage('graph.*')
-    config.add_subpackage('graph.*.*')
-    config.add_data_dir('graph/scripts/resource_type/images')
-    config.add_data_dir('graph/chips/resource_type/images')
-    config.add_data_dir('graph/function/scripts')
-    config.add_data_dir('graph/function/tests')
-#    config.add_data_dir('graph/vpl/images')
-#    config.add_data_dir('graph/vpl/resource_type/images')
-    config.add_data_files('graph/*.doc','graph/*.txt')
-    config.add_data_files('graph/function/*.xml','graph/tests/*.m')
-
-    config.add_subpackage('greenlet')
-
-    config.add_subpackage('guitest')
-
-    config.add_subpackage('help')
-    config.add_subpackage('help.tests')
-    config.add_data_dir('help/EnLibHelp')
-    config.add_data_dir('help/TestHelp')
-    config.add_data_files('help/*.chm')
-    config.add_data_files('help/*.png')
-
-    config.add_subpackage('interpolate')
-
     config.add_subpackage('io')
-    config.add_data_dir('io/tests')
-
-    config.add_subpackage('kiva')
 
     config.add_subpackage('logger')
     config.add_subpackage('logger.*')
     config.add_subpackage('logger.*.*')
     config.add_data_dir('logger/widget/images')
-    config.add_subpackage('logging')
-
-    config.add_subpackage('mathtext')
-    config.add_data_files('mathtext/*.txt','mathtext/*.pyd')
-    config.add_data_dir('mathtext/share/matplotlib')
-    config.add_data_dir('mathtext/license')
-
-    config.add_subpackage('mathematics')
-
-    config.add_subpackage('mayavi')
-
-    config.add_subpackage('model')
-    config.add_data_dir('model/tests')
-    config.add_data_dir('model/images')
-    config.add_data_files('model/*.ppt')
 
     config.add_subpackage('naming')
     config.add_subpackage('naming.*')
-    config.add_data_dir('naming/examples')
-    config.add_data_dir('naming/tests')
     config.add_data_dir('naming/ui/images')
 
-    config.add_subpackage('persistence')
-
-    config.add_subpackage('plugins')
-    config.add_subpackage('plugins.*')
-    config.add_subpackage('plugins.*.*')
-    config.add_data_files('plugins/*.txt')
-
     config.add_subpackage('pyface')
 
 #    config.add_data_dir('research')
 
     config.add_subpackage('resource')
-    config.add_subpackage('resource_type')
-    config.add_data_dir('resource_type/images')
-
-    config.add_subpackage('sharing')
-    config.add_subpackage('sharing.plugin')
-    config.add_data_dir('sharing/test')
-    config.add_data_files('sharing/*.txt')
 
     config.add_subpackage('sweet_pickle')
-    config.add_data_dir('sweet_pickle/tests')
     config.add_data_files('sweet_pickle/*.txt')
 
-    config.add_subpackage('testing')
-    config.add_data_dir('testing/research')
-    config.add_data_files('testing/research/*.txt')
-    config.add_data_files('testing/*.txt')
-
     config.add_subpackage('traits')
     config.add_subpackage('traits.ui.wx')
     
-    config.add_subpackage('tvtk')
-
     config.add_subpackage('type_manager')
-    config.add_data_dir('type_manager/tests')
-
-    config.add_subpackage('units')
-    config.add_subpackage('units.plugin')
-    config.add_subpackage('units.plugin.action')
-    config.add_data_dir('units/data')
-    config.add_data_dir('units/tests')
     
     config.add_subpackage('util')
 
diff -u -b -w -r enthought.orig/sweet_pickle/setup.py enthought/sweet_pickle/setup.py
--- enthought.orig/sweet_pickle/setup.py	2006-08-31 20:18:30.000000000 -0700
+++ enthought/sweet_pickle/setup.py	2007-03-29 18:11:27.000000000 -0700
@@ -12,11 +12,8 @@
                        delegate_options_to_subpackages=True,
                        quiet=True)
 
-    config.add_data_dir('tests')
     config.add_data_files('*.txt')
 
-    config.add_subpackage('tests')
-
     return config
 
 if __name__ == "__main__":
Only in enthought.orig/traits: build
Only in enthought/traits: ctraits.so
diff -u -b -w -r enthought.orig/traits/setup.py enthought/traits/setup.py
--- enthought.orig/traits/setup.py	2006-08-31 20:18:38.000000000 -0700
+++ enthought/traits/setup.py	2007-03-29 18:28:43.000000000 -0700
@@ -36,17 +36,11 @@
     # path, enthought/traits/__init__.py gets copied instead
     config.add_data_files(('..', os.path.abspath(os.path.join('..','__init__.py'))))
     
-    config.add_data_dir('demo')
-    config.add_data_dir('doc')
-    config.add_data_dir('examples')
     config.add_data_dir('images')
-    config.add_data_dir('plugins')
-    config.add_data_dir('tests')
     
     config.add_subpackage('ui')
 
     config.add_subpackage('vet')
-    config.add_data_dir('vet/examples')
     config.add_data_dir('vet/images')
 
     config.add_data_files('*.txt')
diff -u -b -w -r enthought.orig/traits/ui/setup.py enthought/traits/ui/setup.py
--- enthought.orig/traits/ui/setup.py	2006-08-31 20:18:38.000000000 -0700
+++ enthought/traits/ui/setup.py	2007-03-29 18:17:19.000000000 -0700
@@ -28,13 +28,10 @@
                        delegate_options_to_subpackages=False,
                        quiet=True)
 
-    config.add_data_dir('demos')
     config.add_data_dir('extras')
     config.add_data_dir('images')
     config.add_data_dir('null')
-    config.add_data_dir('tests')
     
-    config.add_subpackage('demos')
     config.add_subpackage('extras')
     config.add_subpackage('null')
     return config
diff -u -b -w -r enthought.orig/traits/ui/wx/instance_editor.py enthought/traits/ui/wx/instance_editor.py
--- enthought.orig/traits/ui/wx/instance_editor.py	2006-08-17 20:25:30.000000000 -0700
+++ enthought/traits/ui/wx/instance_editor.py	2007-03-29 17:53:05.000000000 -0700
@@ -391,7 +391,7 @@
         panel = self._panel
         if panel is not None:
             # Compute/update the maximum size the panel has ever been:
-            dx, dy = panel.GetSize()
+            dx, dy = panel.GetSizeTuple()
             mdx    = mdy = 0 
             if self._panel_size is not None:
                 mdx, mdy = self._panel_size
Only in enthought/traits/ui/wx: instance_editor.py.orig
Only in enthought/traits/ui/wx: setup Kopie.py
diff -u -b -w -r enthought.orig/traits/ui/wx/setup.py enthought/traits/ui/wx/setup.py
--- enthought.orig/traits/ui/wx/setup.py	2006-08-31 20:18:38.000000000 -0700
+++ enthought/traits/ui/wx/setup.py	2007-03-29 18:12:34.000000000 -0700
@@ -13,9 +13,6 @@
                        quiet=True)
 
     config.add_data_dir('images')
-    config.add_data_dir('tests')
-
-    config.add_subpackage('tests')
 
     return config
 
Only in enthought/traits/ui/wx: setup.pyc
diff -u -b -w -r enthought.orig/traits/ui/wx/view_application.py enthought/traits/ui/wx/view_application.py
--- enthought.orig/traits/ui/wx/view_application.py	2006-08-17 20:25:30.000000000 -0700
+++ enthought/traits/ui/wx/view_application.py	2007-03-29 17:47:45.000000000 -0700
@@ -30,7 +30,7 @@
     import enable_fbi
 
 # Redirect output to this file if not None or ''
-redirect_filename = 'debug.log'
+redirect_filename = None
 
 #-------------------------------------------------------------------------------
 #  Creates a 'stand-alone' wx Application to display a specified traits UI View:  
Only in enthought/traits/ui/wx: view_application.py.orig
diff -u -b -w -r enthought.orig/type_manager/setup.py enthought/type_manager/setup.py
--- enthought.orig/type_manager/setup.py	2006-08-31 20:18:38.000000000 -0700
+++ enthought/type_manager/setup.py	2007-03-29 18:13:03.000000000 -0700
@@ -12,8 +12,6 @@
                        delegate_options_to_subpackages=True,
                        quiet=True)
 
-    config.add_subpackage('tests')
-
     config.add_data_files('*.txt')
 
     return config
diff -u -b -w -r enthought.orig/util/setup.py enthought/util/setup.py
--- enthought.orig/util/setup.py	2006-08-31 20:18:38.000000000 -0700
+++ enthought/util/setup.py	2007-03-29 18:17:53.000000000 -0700
@@ -29,12 +29,10 @@
 
     config.add_subpackage('distribution')
     config.add_subpackage('distribution.editor')
-    config.add_data_dir('distribution/editor/tests')
     config.add_subpackage('traits')
     config.add_subpackage('traits.editor')
     config.add_subpackage('wx')
     config.add_subpackage('wx.spreadsheet')
-    config.add_data_dir('test')
     return config
 
 if __name__ == "__main__":
