Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv1615

Modified Files:
        pyfits-py.info 
Log Message:
Fix a conflict between variants


Index: pyfits-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/pyfits-py.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pyfits-py.info      19 Apr 2011 15:15:31 -0000      1.6
+++ pyfits-py.info      8 Mar 2012 11:32:35 -0000       1.7
@@ -1,15 +1,14 @@
 Info2: <<
 Package: pyfits-py%type_pkg[python]
 Version: 2.4.0
-Revision: 1
+Revision: 2
 Distribution: (%type_pkg[python] = 23) 10.4, (%type_pkg[python] = 24) 10.4, 
(%type_pkg[python] = 24) 10.5
 Type: python(2.3 2.4 2.5 2.6 2.7)
 Description: Python interface to FITS formatted files
 License: OSI-Approved
 Maintainer: Sebastien Maret <bma...@users.sourceforge.net>
 Depends: <<
-  python%type_pkg[python] | python%type_pkg[python]-nox, 
-  numpy-py%type_pkg[python]
+  python%type_pkg[python], numpy-py%type_pkg[python]
 <<
 Source: 
http://www.stsci.edu/resources/software_hardware/pyfits/pyfits-%v.tar.gz
 Source-MD5: f6009137c060557ddd2ed244f2cb1b12
@@ -18,6 +17,13 @@
 <<
 InstallScript: <<
   python%type_raw[python] setup.py install --root=%d
+  mv %i/bin/fitscheck %i/bin/fitscheck-py%type_pkg[python]
+<<
+PostInstScript: <<
+  update-alternatives --install %p/bin/fitscheck fitscheck 
%p/bin/fitscheck-py%type_pkg[python] %type_pkg[python]
+<<
+PreRmScript: <<
+  update-alternatives --remove fitscheck %p/bin/fitscheck-py%type_pkg[python]
 <<
 DocFiles: lib/LICENSE.txt:LICENSE
 Homepage: http://www.stsci.edu/resources/software_hardware/pyfits


------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing 
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to