SF.net SVN: matplotlib:[6624] trunk/matplotlib

Revision: 6624
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6624&view=rev
Author:   jdh2358
Date:     2008-12-15 20:48:34 +0000 (Mon, 15 Dec 2008)

Log Message:
-----------
Merged revisions 6621-6622 via svnmerge from 
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_98_5_maint

........
  r6621 | jdh2358 | 2008-12-15 12:19:01 -0800 (Mon, 15 Dec 2008) | 1 line
  
  hack to prevent distutils from linking our files
........
  r6622 | jdh2358 | 2008-12-15 12:45:20 -0800 (Mon, 15 Dec 2008) | 1 line
  
  hack to prevent distutils from creating links in our sdist
........

Modified Paths:
--------------
    trunk/matplotlib/MANIFEST.in
    trunk/matplotlib/setup.py

Property Changed:
----------------
    trunk/matplotlib/


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6619
   + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6623

Modified: trunk/matplotlib/MANIFEST.in
===================================================================
--- trunk/matplotlib/MANIFEST.in	2008-12-15 20:46:00 UTC (rev 6623)
+++ trunk/matplotlib/MANIFEST.in	2008-12-15 20:48:34 UTC (rev 6624)
@@ -1,7 +1,7 @@
 include CHANGELOG KNOWN_BUGS INSTALL
 include INTERACTIVE TODO
 include Makefile  MANIFEST.in MANIFEST
-include matplotlibrc.template matplotlibrc setup.cfg.template
+include matplotlibrc.template setup.cfg.template
 include __init__.py setupext.py setup.py setupegg.py
 include examples/data/*
 include lib/mpl_toolkits

Modified: trunk/matplotlib/setup.py
===================================================================
--- trunk/matplotlib/setup.py	2008-12-15 20:46:00 UTC (rev 6623)
+++ trunk/matplotlib/setup.py	2008-12-15 20:48:34 UTC (rev 6624)
@@ -6,6 +6,11 @@
 The matplotlib build options can be modified with a setup.cfg file. See
 setup.cfg.template for more information.
 """
+# distutils is breaking our sdists for files in symlinked dirs.
+# distutils will copy if os.link is not available, so this is a hack
+# to force copying
+import os
+del os.link
 
 # This dict will be updated as we try to select the best option during
 # the build process. However, values in setup.cfg will be used, if


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.