Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs17:/tmp/cvs-serv11003

Modified Files:
        scientificpython-py.info 
Log Message:
fixed conflict


Index: scientificpython-py.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/scientificpython-py.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- scientificpython-py.info    22 Sep 2007 16:16:47 -0000      1.9
+++ scientificpython-py.info    22 Sep 2007 21:17:08 -0000      1.10
@@ -25,7 +25,9 @@
  mkdir -p %i/share/doc/%n/HTML
  mkdir -p %i/share/doc/%n/PDF
  mv %i/bin/bsp_virtual %i/bin/bsp_virtual%type_raw[python]
+ mv %i/bin/task_manager %i/bin/task_manager%type_raw[python]
  ln -s %p/bin/bsp_virtual%type_raw[python] %i/bin/bsp_virtual
+ ln -s %p/bin/task_manager%type_raw[python] %i/bin/task_manager
  cp -R Examples %i/share/doc/%n
  cp -R Doc/* %i/share/doc/%n
 <<
@@ -34,7 +36,7 @@
   Conflicts: scientificpython-py22-bin, scientificpython-py23-bin, 
scientificpython-py24-bin
   Replaces: scientificpython-py22-bin, scientificpython-py23-bin, 
scientificpython-py24-bin
   Depends: scientificpython-py%type_pkg[python] (= %v-%r)
-  Files: bin/bsp_virtual
+  Files: bin/bsp_virtual bin/task_manager
   DocFiles: README LICENSE
 <<
 License: OSI-Approved


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to