Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/text
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15392

Modified Files:
        pyx-py.patch pyx-py.info 
Log Message:
Update from maintainer (Tracker item #1306090).


Index: pyx-py.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/text/pyx-py.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pyx-py.patch        27 Apr 2005 03:26:41 -0000      1.1
+++ pyx-py.patch        11 Nov 2005 21:27:35 -0000      1.2
@@ -1,5 +1,5 @@
---- PyX-0.7.1/setup.cfg.orig   Mon Dec 20 22:10:36 2004
-+++ PyX-0.7.1/setup.cfg        Mon Dec 20 22:12:27 2004
+--- PyX-0.8.1/setup.cfg.orig   2005-09-05 18:30:36.000000000 +0200
++++ PyX-0.8.1/setup.cfg        2005-09-05 18:31:14.000000000 +0200
 @@ -2,11 +2,11 @@
  # In this section you can specify which c extension modules should be built
  
@@ -22,61 +22,59 @@
 -# library_dirs=
 [EMAIL PROTECTED]@/include
 [EMAIL PROTECTED]@/lib
---- PyX-0.7.1/setup.py.orig    Mon Dec 20 22:10:46 2004
-+++ PyX-0.7.1/setup.py Mon Dec 20 22:14:20 2004
-@@ -41,7 +41,7 @@
- #
+--- PyX-0.8.1/setup.py.orig    2005-09-05 18:25:28.000000000 +0200
++++ PyX-0.8.1/setup.py 2005-09-07 17:11:42.000000000 +0200
+@@ -61,7 +61,7 @@
+     data_files.append((dir, files))
+     siteconfignames[files] = siteconfigname
  
- data_files = [# share/pyx is taken relative to "setup.py install --home=..."
--              ("share/pyx", ["pyx/lfs/10pt.lfs",
-+              ("share/[EMAIL PROTECTED]@", ["pyx/lfs/10pt.lfs",
-                              "pyx/lfs/11pt.lfs",
-                              "pyx/lfs/12pt.lfs",
-                              "pyx/lfs/10ptex.lfs",
-@@ -53,7 +53,7 @@
-                              "pyx/lfs/foils30pt.lfs",
-                              "contrib/pyx.def"]),
-               # /etc is taken relative to "setup.py install --root=..."
--              ("/etc", ["pyxrc"])]
-+              ("etc", ["pyxrc"])]
+-adddatafiles("lfsdir", "share/pyx", ["pyx/lfs/10pt.lfs",
++adddatafiles("lfsdir", "share/[EMAIL PROTECTED]@", ["pyx/lfs/10pt.lfs",
+                                      "pyx/lfs/11pt.lfs",
+                                      "pyx/lfs/12pt.lfs",
+                                      "pyx/lfs/10ptex.lfs",
+@@ -71,11 +71,11 @@
+                                      "pyx/lfs/foils20pt.lfs",
+                                      "pyx/lfs/foils25pt.lfs",
+                                      "pyx/lfs/foils30pt.lfs"])
+-adddatafiles("sharedir", "share/pyx", ["contrib/pyx.def"])
++adddatafiles("sharedir", "share/[EMAIL PROTECTED]@", ["contrib/pyx.def"])
  
- #
- # pyx_build_py
-@@ -95,8 +95,8 @@
+ # Note that on windows we can't install to absolute paths. Hence
+ # we put the global pyxrc into the share directory as well.
+-adddatafiles("pyxrcdir", os.name != "nt" and "/etc" or "share/pyx", ["pyxrc"])
++adddatafiles("pyxrcdir", os.name != "nt" and "etc" or "share/[EMAIL 
PROTECTED]@", ["[EMAIL PROTECTED]@"])
  
-     def run(self):
-         install_data.run(self)
--        self.pyx_lfsdir = self.pyx_sharedir = os.path.join(self.install_dir, 
"share", "pyx")
--        self.pyx_pyxrc = os.path.join(self.root or "/", "etc", "pyxrc")
-+        self.pyx_lfsdir = self.pyx_sharedir = os.path.join("@PREFIX@", 
"share", "[EMAIL PROTECTED]@")
-+        self.pyx_pyxrc = os.path.join("@PREFIX@", "etc", "pyxrc")
+ 
################################################################################
+ # extend install commands to overwrite siteconfig.py during build and install
+@@ -123,7 +123,7 @@
+             # (the following four lines are copied from within the 
install_data.run loop)
+             dir = convert_path(dir)
+             if not os.path.isabs(dir):
+-                dir = os.path.join(self.install_dir, dir)
++                dir = os.path.join("@PREFIX@", dir)
+             elif self.root:
+                 dir = change_root(self.root, dir)
  
- #
- # additional package metadata (only available in Python 2.3 and above)
---- PyX-0.7.1/pyx/tex.py.orig  Mon Dec 20 22:11:01 2004
-+++ PyX-0.7.1/pyx/tex.py       Mon Dec 20 22:15:13 2004
-@@ -1031,7 +1031,7 @@
-         except IOError:
-             try:
-                 try:
--                    SysLfsName = os.path.join(sys.prefix, "share", "pyx", 
str(lfs) + ".lfs")
-+                    SysLfsName = os.path.join(sys.prefix, "share", "[EMAIL 
PROTECTED]@", str(lfs) + ".lfs")
-                     lfsdef = open(SysLfsName, "r").read()
-                 except IOError:
-                     SysLfsName = os.path.join(os.path.dirname(__file__), 
"lfs", str(lfs) + ".lfs")
-@@ -1040,7 +1040,7 @@
-                 files = map(lambda x: x[:-4],
-                             filter(lambda x: x[-4:] == ".lfs",
-                                    os.listdir(".") +
--                                   os.listdir(os.path.join(sys.prefix, 
"share", "pyx")),
-+                                   os.listdir(os.path.join(sys.prefix, 
"share", "[EMAIL PROTECTED]@")),
-                                    
os.listdir(os.path.join(os.path.dirname(__file__), "lfs"))))
-                 raise IOError("file '%s.lfs' not found. Available latex font 
sizes:\n%s" % (lfs, files))
-         self.define(lfsdef)
---- PyX-0.7.1/examples/misc/INDEX.orig Mon Dec 20 22:11:28 2004
-+++ PyX-0.7.1/examples/misc/INDEX      Mon Dec 20 22:15:30 2004
-@@ -1,4 +1,3 @@
--pattern
- valign
- latex
- vector
+--- PyX-0.8.1/manual/Makefile.orig     2005-09-06 16:43:38.000000000 +0200
++++ PyX-0.8.1/manual/Makefile  2005-09-06 16:46:43.000000000 +0200
+@@ -22,7 +22,7 @@
+ pdf:manual.pdf
+ html:manual/manual.html
+ 
+-manual.pdf: $(src)
++manual.pdf: $(src) eps
+       #for index-with-own-hyperrefs debugging, anybody interested?
+       #./mkhowto --a4 --pdf --keep manual.tex
+       ./mkhowto --a4 --pdf manual.tex
+--- PyX-0.8.1/pyx/config.py.orig       2005-11-11 11:36:51.000000000 +0100
++++ PyX-0.8.1/pyx/config.py    2005-11-11 11:37:36.000000000 +0100
+@@ -24,7 +24,7 @@
+ import ConfigParser, os.path
+ import siteconfig
+ 
+-cflist = [os.path.join(siteconfig.pyxrcdir, "pyxrc"),  
os.path.expanduser("~/.pyxrc")]
++cflist = [os.path.join(siteconfig.pyxrcdir, "[EMAIL PROTECTED]@"),  
os.path.expanduser("~/.pyxrc")]
+ 
+ config = ConfigParser.ConfigParser()
+ config.read(cflist)

Index: pyx-py.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/text/pyx-py.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pyx-py.info 27 Apr 2005 03:26:41 -0000      1.1
+++ pyx-py.info 11 Nov 2005 21:27:35 -0000      1.2
@@ -1,30 +1,26 @@
 Info2: <<
-Package: pyx%type_pkg[-wierda]-py%type_pkg[python]
-Type: -wierda(boolean), python(2.2 2.3)
-Version: 0.7.1
+Package: pyx-py%type_pkg[python]
+Type: python(2.2 2.3 2.4)
+Version: 0.8.1
 Revision: 1
 Maintainer: Andrea Riciputi <[EMAIL PROTECTED]>
 Depends: <<
- python%type_pkg[python]|python%type_pkg[python]-nox,
- (%type_raw[-wierda] = -wierda) system-tetex,
- (%type_raw[-wierda] != -wierda) tetex-base,
+ python%type_pkg[python] | python%type_pkg[python]-nox,
+ system-tetex | tetex-base,
  ghostscript | ghostscript-nox,
  ghostscript-fonts
 <<
-BuildDepends: <<
-(%type_raw[-wierda] = -wierda) system-tetex,
-(%type_raw[-wierda] != -wierda) tetex-dev
-<<
+BuildDepends: system-tetex | tetex-dev
 Source: mirror:sourceforge:pyx/PyX-%v.tar.gz
-Source-MD5: 5ee6e9f24e27ef8ac4c715420136d747
+Source-MD5: 5e751cef8d62774a6fc659cc9a03c231
 PatchScript: <<
  /usr/bin/sed -e 's|@PREFIX@|%p|g' -e 's|@PYTHON_FLAVOR@|%type_pkg[python]|g' 
< %a/pyx-py.patch | /usr/bin/patch -p1
 <<
 CompileScript:  <<
  #! /bin/bash -ev
- (cd manual/; ln -s %p/share/doc/python%type_pkg[python]/Doc/tools/mkhowto 
mkhowto; make pdf)
+ (cd manual/; ln -s %p/share/doc/python%type_pkg[python]/Doc/tools/mkhowto 
mkhowto; if [ "%type_raw[python]" == "2.4" ]; then mv graph.tex graph.tex.orig; 
echo "\\let\\e=\\textbackslash" > graph.tex; cat graph.tex.orig >> graph.tex; 
fi; make pdf)
  (cd faq/; make)
- (cd examples/; if [ "%type_raw[-wierda]" != "-wierda" ]; then ln -s 
%p/share//texmf/source/latex/listings/listings.sty listings.sty; fi; make pdf; 
rm -f examples.tex examples.log examples.aux examples.dvi examples.ps *.eps 
*/*.eps)
+ (mv pyxrc pyxrc-py%type_pkg[python])
 <<
 InstallScript: <<
  python%type_raw[python] setup.py install --root=%d
@@ -36,17 +32,13 @@
 <<
 DocFiles: README AUTHORS CHANGES INSTALL LICENSE PKG-INFO
 Description: <<
- Pyx is a Python package to create EPS figures
+  PyX - Python graphics package
 <<
 DescDetail: <<
-  PyX is a Python package for the creation of encapsulated PostScript figures.
-  It provides both an abstraction of PostScript and a TeX/LaTeX interface.
-  Complex tasks like 2d and 3d plots in publication-ready quality are built out
-  of these primitives.
-
-  Maintainer's note: in the example.pdf file the pattern example has been 
-  omitted, because of an incompatibility with Apple Preview.app. I hope to 
-  find the reason of this problem and fix it soon.
+  Pyx is a Python package for the creation of PostScript and PDF files.
+  It combines an abstraction of the PostScript drawing model with a TeX/LaTeX
+  interface. Complex tasks like 2d and 3d plots in publication-ready quality 
+  are built out of these primitives.
 <<
 License: GPL 
 Homepage: http://pyx.sourceforge.net/



-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP.  Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to