Update of /cvsroot/fink/experimental/alexkhansen/10.4/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv1958
Modified Files:
fltk-backend.info octave-3.2.4.info
Log Message:
Fails with imagemagick10-dev present
Index: octave-3.2.4.info
===================================================================
RCS file:
/cvsroot/fink/experimental/alexkhansen/10.4/finkinfo/sci/octave-3.2.4.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- octave-3.2.4.info 31 Aug 2011 21:23:37 -0000 1.4
+++ octave-3.2.4.info 31 Aug 2011 23:33:02 -0000 1.5
@@ -18,9 +18,10 @@
(%type_raw[-atlas] = atlas) atlas
<<
Depends: %{Ni}%type_pkg[oct]%type_pkg[-atlas] (=%v-%r)
-BuildConflicts: coot-dev, broken-gcc, lammpi-dev, fort77, 4ti2-dev
+BuildConflicts: coot-dev, broken-gcc, lammpi-dev, fort77, 4ti2-dev,
imagemagick10-dev
Suggests: %{Ni}%type_pkg[oct]-docs
GCC: 4.0
+
Conflicts: <<
(%type_raw[-atlas] = atlas) %{Ni}, (%type_raw[-atlas] != -atlas)
%{Ni}-atlas,
%{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5)
Index: fltk-backend.info
===================================================================
RCS file:
/cvsroot/fink/experimental/alexkhansen/10.4/finkinfo/sci/fltk-backend.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fltk-backend.info 31 Aug 2011 21:23:37 -0000 1.1
+++ fltk-backend.info 31 Aug 2011 23:33:02 -0000 1.2
@@ -29,7 +29,7 @@
(%type_pkg[ui] = x11) x11,
(%type_pkg[ui] = aqua) fltk13-aqua-shlibs,
<<
-BuildConflicts: coot-dev, broken-gcc, lammpi-dev, fort77, 4ti2-dev
+BuildConflicts: coot-dev, broken-gcc, lammpi-dev, fort77, 4ti2-dev,
imagemagick-dev
GCC: 4.0
Conflicts: fltk-backend-aqua-oct%type_pkg[oct],
fltk-backend-x11-oct%type_pkg[oct]
Replaces: fltk-backend-aqua-oct%type_pkg[oct],
fltk-backend-x11-oct%type_pkg[oct]
------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
