Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv32541
Modified Files:
matplotlib-basemap-py.info matplotlib-basemap-py.patch
Log Message:
now depends on pyproj-py
Index: matplotlib-basemap-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/matplotlib-basemap-py.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- matplotlib-basemap-py.info 23 Nov 2006 15:23:35 -0000 1.7
+++ matplotlib-basemap-py.info 25 Nov 2006 00:33:19 -0000 1.8
@@ -2,13 +2,14 @@
Package: matplotlib-basemap-py%type_pkg[python]
Version: 0.9.4
-Revision: 1
+Revision: 2
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
-Depends: python%type_pkg[python], matplotlib-py%type_pkg[python] (>= 0.87.3),
matplotlib-basemap-data (>= 0.9)
+Depends: python%type_pkg[python], matplotlib-py%type_pkg[python] (>= 0.87.3),
matplotlib-basemap-data (>= 0.9), pyproj-py%type_pkg[python] (>= 1.8.0-1)
Source: mirror:sourceforge:matplotlib/basemap-%v.tar.gz
Source-MD5: 0bbe631db05dbb987bb0bf8e8422039c
Replaces: matplotlib-basemap-py23, matplotlib-basemap-py24,
matplotlib-basemap-py25
Type: python (2.3 2.4 2.5)
+Patch: %{ni}.patch
GCC: 4.0
NoSetCPPFLAGS: True
NoSetLDFLAGS: True
Index: matplotlib-basemap-py.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/matplotlib-basemap-py.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- matplotlib-basemap-py.patch 15 Feb 2006 17:26:31 -0000 1.1
+++ matplotlib-basemap-py.patch 25 Nov 2006 00:33:19 -0000 1.2
@@ -1,25 +1,22 @@
---- basemap/setup.py.orig 2005-11-18 12:49:47.000000000 -0700
-+++ basemap/setup.py 2005-11-18 12:49:52.000000000 -0700
-@@ -27,14 +27,14 @@
+--- basemap/setup.py.orig 2006-11-24 07:19:06.000000000 -0700
++++ basemap/setup.py 2006-11-24 07:26:10.000000000 -0700
+@@ -21,7 +21,7 @@
- # don't build pyshapelib if it is already installed.
+ deps = glob.glob('src/*.c')
--try:
-- import shapelib
-- import dbflib
--except:
-- packages = packages + ['shapelib','dbflib']
-- package_dirs['shapelib'] ='pyshapelib/lib/shapelib'
-- package_dirs['dbflib'] ='pyshapelib/lib/dbflib'
+-extensions = [Extension("pyproj",deps,include_dirs = ['src'],)]
++#extensions = [Extension("pyproj",deps,include_dirs = ['src'],)]
+ packages = ['matplotlib.toolkits.basemap']
+ package_dirs = {'':'lib'}
+
+@@ -38,8 +38,8 @@
+ packages = packages + ['shapelib','dbflib']
+ package_dirs['shapelib'] ='lib/shapelib'
+ package_dirs['dbflib'] ='lib/dbflib'
- extensions = extensions + \
-+#try:
-+ #import shapelib
-+ #import dbflib
-+#except:
-+packages = packages + ['shapelib','dbflib']
-+package_dirs['shapelib'] ='pyshapelib/lib/shapelib'
-+package_dirs['dbflib'] ='pyshapelib/lib/dbflib'
-+extensions = extensions + \
- [Extension("shapelibc",
+- [Extension("shapelibc",
++ #extensions = extensions + \
++ extensions = [Extension("shapelibc",
["pyshapelib/shapelib_wrap.c",
"pyshapelib/shapelib/shpopen.c",
+ "pyshapelib/shapelib/shptree.c"],
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
