Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv18520
Modified Files:
distribute-py.info setuptools-py.info
Log Message:
another attempt to get setuptools and distribute to play nicely together
Index: distribute-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/distribute-py.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- distribute-py.info 28 Sep 2010 13:49:24 -0000 1.5
+++ distribute-py.info 28 Sep 2010 20:36:38 -0000 1.6
@@ -3,7 +3,7 @@
Type: python (2.4 2.5 2.6 2.7 3.1)
Distribution: (%type_pkg[python] = 24) 10.4, (%type_pkg[python] = 24) 10.5
Version: 0.6.14
-Revision: 2
+Revision: 3
Source:
http://pypi.python.org/packages/source/d/distribute/distribute-%v.tar.gz
Source-MD5: ac607e05682116c06383b27a15e2db90
@@ -21,6 +21,9 @@
InstallScript: <<
%p/bin/python%type_raw[python] setup.py install --root=%d
--single-version-externally-managed
rm %i/bin/easy_install
+ # setuptools has this as a directory, distribute has it as a file. This
confuses dpkg
+ # Hopefully just removing this file will allow dpkg to switch back to
setuptools when necessary.
+ rm
%i/lib/python%type_raw[python]/site-packages/setuptools-0.6c11-py%type_raw[python].egg-info
<<
LICENSE: OSI-Approved
Index: setuptools-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/languages/setuptools-py.info,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- setuptools-py.info 7 Jul 2010 15:18:59 -0000 1.15
+++ setuptools-py.info 28 Sep 2010 20:36:38 -0000 1.16
@@ -3,10 +3,14 @@
Type: python (2.4 2.5 2.6 2.7)
Distribution: (%type_pkg[python] = 24) 10.4, (%type_pkg[python] = 24) 10.5
Version: 0.6c11
-Revision: 1
+Revision: 2
Source:
http://pypi.python.org/packages/source/s/setuptools/setuptools-%v.tar.gz
Source-MD5: 7df2a529a074f613b509fb44feefe74e
+
Depends: python%type_pkg[python]
+Conflicts: distribute-py%type_pkg[python]
+Replaces: distribute-py%type_pkg[python]
+
Description: EasyInstall and python eggs
Maintainer: Kurt Schwehr <[email protected]>
DocFiles: EasyInstall.txt PKG-INFO api_tests.txt pkg_resources.txt
setuptools.txt
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
