Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31572
Modified Files:
matplotlib-py.info matplotlib-py.patch
Log Message:
New upstream version.
Index: matplotlib-py.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/matplotlib-py.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- matplotlib-py.patch 23 Dec 2004 16:59:15 -0000 1.6
+++ matplotlib-py.patch 14 Feb 2005 23:56:47 -0000 1.7
@@ -1,5 +1,108 @@
---- matplotlib/setupext.py.orig Thu Dec 23 09:34:30 2004
-+++ matplotlib/setupext.py Thu Dec 23 09:36:09 2004
+--- matplotlib/setup.py Mon Feb 14 16:22:40 2005
++++ matplotlib/setup.py Mon Feb 14 16:28:56 2005
+@@ -77,7 +77,7 @@
+ data.extend(glob.glob('images/*.ppm'))
+ data.append('.matplotlibrc')
+
+-data_files=[('share/matplotlib', data),]
++data_files=[('share/[EMAIL PROTECTED]@', data),]
+
+ # Figure out which array packages to provide binary support for
+ # and define the NUMERIX value: Numeric, numarray, or both.
+@@ -148,44 +148,29 @@
+
+ build_transforms(ext_modules, packages, NUMERIX)
+
+-if BUILD_GTKAGG:
+- try:
+- import gtk
+- except ImportError:
+- print 'GTKAgg requires pygtk'
+- BUILD_GTKAGG=0
+- except RuntimeError:
+- print 'pygtk present but import failed'
+-if BUILD_GTKAGG:
+- BUILD_AGG = 1
+- build_gtkagg(ext_modules, packages, NUMERIX)
+-
+-if BUILD_TKAGG:
+- try: import Tkinter
+- except ImportError: print 'TKAgg requires TkInter'
+- else:
+- BUILD_AGG = 1
+- build_tkagg(ext_modules, packages, NUMERIX)
++BUILD_AGG = 1
++build_gtkagg(ext_modules, packages, NUMERIX)
++
++BUILD_AGG = 1
++build_tkagg(ext_modules, packages, NUMERIX)
+
+
+-if BUILD_AGG:
+- build_agg(ext_modules, packages, NUMERIX)
++build_agg(ext_modules, packages, NUMERIX)
+
+-if BUILD_FT2FONT:
+- build_ft2font(ext_modules, packages)
++build_ft2font(ext_modules, packages)
+
+ if BUILD_WINDOWING and sys.platform=='win32':
+ build_windowing(ext_modules, packages)
+
+-if BUILD_IMAGE:
+- build_image(ext_modules, packages, NUMERIX)
++build_image(ext_modules, packages, NUMERIX)
+
+-if 1: # I don't think we need to make these optional
+- build_contour(ext_modules, packages, NUMERIX)
++build_contour(ext_modules, packages, NUMERIX)
+
+ for mod in ext_modules:
+ if VERBOSE:
+ mod.extra_compile_args.append('-DVERBOSE')
++ mod.include_dirs.append('@PREFIX@/include')
++ mod.library_dirs.append('@PREFIX@/lib')
+
+ setup(name="matplotlib",
+ version= __version__,
+--- matplotlib/lib/matplotlib/__init__.py Mon Feb 14 16:30:46 2005
++++ matplotlib/lib/matplotlib/__init__.py Mon Feb 14 08:11:18 2005
+@@ -294,7 +294,7 @@
+ path = os.environ['MATPLOTLIBDATA']
+ if os.path.isdir(path): return path
+
+- path = os.path.join(distutils.sysconfig.PREFIX, 'share', 'matplotlib')
++ path = os.path.join(distutils.sysconfig.PREFIX, 'share', '[EMAIL
PROTECTED]@')
+ if os.path.isdir(path): return path
+
+ path = '/usr/local/share/matplotlib'
+@@ -304,11 +304,11 @@
+ if os.path.isdir(path): return path
+
+ path = os.path.join(os.sep.join(__file__.split(os.sep)[:-1]),
+- 'share','matplotlib')
++ 'share','[EMAIL PROTECTED]@')
+ if os.path.isdir(path): return path
+
+ path = os.path.join(os.sep.join(__file__.split(os.sep)[:-5]),
+- 'share','matplotlib')
++ 'share','[EMAIL PROTECTED]@')
+ if os.path.isdir(path): return path
+
+
+--- matplotlib/src/ft2font.cpp Mon Feb 14 16:29:38 2005
++++ matploblib/src/ft2font.cpp Thu Dec 23 10:53:44 2004
+@@ -373,7 +373,7 @@
+ if ( use_kerning && previous && glyph_index ) {
+ FT_Vector delta;
+ FT_Get_Kerning( face, previous, glyph_index,
+- FT_KERNING_DEFAULT, &delta );
++ ft_kerning_default, &delta );
+ pen.x += delta.x;
+ }
+ error = FT_Load_Glyph( face, glyph_index, FT_LOAD_DEFAULT );
+--- matplotlib/setupext.py Wed Feb 9 11:23:59 2005
++++ matplotlib/setupext.py.orig Mon Feb 14 16:25:49 2005
@@ -35,7 +35,7 @@
'win32' : ['win32_static',],
'linux2' : ['/usr/local', '/usr',],
@@ -78,81 +181,3 @@
# you're still here? ok we'll try it this way
o = find_tcltk()
---- matplotlib/setup.py.orig Thu Dec 23 09:37:53 2004
-+++ matplotlib/setup.py Thu Dec 23 09:38:12 2004
-@@ -77,7 +77,7 @@
- data.extend(glob.glob('images/*.ppm'))
- data.append('.matplotlibrc')
-
--data_files=[('share/matplotlib', data),]
-+data_files=[('share/[EMAIL PROTECTED]@', data),]
-
- # Figure out which array packages to provide binary support for
- # and define the NUMERIX value: Numeric, numarray, or both.
-@@ -144,23 +144,12 @@
- build_transforms(ext_modules, packages, NUMERIX)
-
- if BUILD_GTKAGG:
-- try:
-- import gtk
-- except ImportError:
-- print 'GTKAgg requires pygtk'
-- BUILD_GTKAGG=0
-- except RuntimeError:
-- print 'pygtk present but import failed'
--if BUILD_GTKAGG:
- BUILD_AGG = 1
- build_gtkagg(ext_modules, packages)
-
- if BUILD_TKAGG:
-- try: import Tkinter
-- except ImportError: print 'TKAgg requires TkInter'
-- else:
-- BUILD_AGG = 1
-- build_tkagg(ext_modules, packages)
-+ BUILD_AGG = 1
-+ build_tkagg(ext_modules, packages)
-
-
- if BUILD_AGG:
-@@ -181,6 +170,8 @@
- for mod in ext_modules:
- if VERBOSE:
- mod.extra_compile_args.append('-DVERBOSE')
-+ mod.include_dirs.append('@PREFIX@/include')
-+ mod.library_dirs.append('@PREFIX@/lib')
-
- setup(name="matplotlib",
- version= __version__,
---- matplotlib/lib/matplotlib/__init__.py.orig Thu Dec 23 09:34:50 2004
-+++ matplotlib/lib/matplotlib/__init__.py Thu Dec 23 09:39:17 2004
-@@ -296,15 +296,15 @@
- path = os.environ['MATPLOTLIBDATA']
- if os.path.isdir(path): return path
-
-- path = os.path.join(distutils.sysconfig.PREFIX, 'share', 'matplotlib')
-+ path = os.path.join(distutils.sysconfig.PREFIX, 'share', '[EMAIL
PROTECTED]@')
- if os.path.isdir(path): return path
-
- path = os.path.join(os.sep.join(__file__.split(os.sep)[:-1]),
-- 'share','matplotlib')
-+ 'share','[EMAIL PROTECTED]@')
- if os.path.isdir(path): return path
-
- path = os.path.join(os.sep.join(__file__.split(os.sep)[:-5]),
-- 'share','matplotlib')
-+ 'share','[EMAIL PROTECTED]@')
- if os.path.isdir(path): return path
-
-
---- matplotlib/src/ft2font.cpp Sat Dec 18 10:55:22 2004
-+++ matplotlib/src/ft2font.cpp.orig Sat Dec 18 10:54:55 2004
-@@ -373,7 +373,7 @@
- if ( use_kerning && previous && glyph_index ) {
- FT_Vector delta;
- FT_Get_Kerning( face, previous, glyph_index,
-- FT_KERNING_DEFAULT, &delta );
-+ ft_kerning_default, &delta );
- pen.x += delta.x;
- }
- error = FT_Load_Glyph( face, glyph_index, FT_LOAD_DEFAULT );
Index: matplotlib-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/matplotlib-py.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- matplotlib-py.info 21 Jan 2005 23:44:48 -0000 1.8
+++ matplotlib-py.info 14 Feb 2005 23:56:47 -0000 1.9
@@ -1,14 +1,14 @@
Info2: <<
Package: matplotlib-py%type_pkg[python]
-Version: 0.71
+Version: 0.72
Revision: 1
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
Depends: python%type_pkg[python], pygtk2-py%type_pkg[python], tcltk-shlibs,
numarray-py%type_pkg[python], numeric-py%type_pkg[python]
BuildDepends: pygtk2-py%type_pkg[python]-dev, tcltk-dev, glib2-dev, gtk+2-dev,
atk1, pango1-xft2-dev, gettext-dev, gettext-bin, libiconv-dev, pkgconfig
Suggests: wxpython-py%type_pkg[python] (>= 2.5.1.5-1)
Source: mirror:sourceforge:matplotlib/matplotlib-%v.tar.gz
-Source-MD5: 286bd4ad537fd9566214e39395a3cb50
+Source-MD5: b2910ccbe015892cae43c42c7be3309e
Type: python (2.2 2.3 2.4)
NoSetCPPFLAGS: True
PatchScript: sed 's|@PREFIX@|%p|g' < %a/%{ni}.patch | sed
's|@PYVER@|%type_pkg[python]|g' | patch -p1
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
