Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv15034
Modified Files:
imagemagick-nox.info imagemagick.info
Log Message:
add BuildConflicts on cairo (until the pangocairo branch is ready)
Index: imagemagick.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/imagemagick.info,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- imagemagick.info 29 Apr 2008 05:00:20 -0000 1.23
+++ imagemagick.info 29 Apr 2008 23:24:30 -0000 1.24
@@ -27,6 +27,9 @@
(%type_raw[-nox] = .) pango1-xft2-shlibs (>= 1.10.1-1),
(%type_raw[-nox] = .) x11-shlibs
<<
+BuildConflicts: <<
+ (%type_raw[-nox] = .) cairo (>= 1.4.14-3)
+<<
BuildDepends: <<
lcms, libtiff, libjasper.1, libpng3 (>= 1:1.2.27-1), libdjvulibre15-dev,
libjpeg, fontconfig2-dev, expat1, bzip2-dev, libxml2, libiconv-dev,
freetype219,
openexr-dev,
Index: imagemagick-nox.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/imagemagick-nox.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- imagemagick-nox.info 29 Apr 2008 05:00:20 -0000 1.4
+++ imagemagick-nox.info 29 Apr 2008 23:24:30 -0000 1.5
@@ -27,6 +27,9 @@
(%type_raw[-nox] = .) pango1-xft2-shlibs (>= 1.10.1-1),
(%type_raw[-nox] = .) x11-shlibs
<<
+BuildConflicts: <<
+ (%type_raw[-nox] = .) cairo (>= 1.4.14-3)
+<<
BuildDepends: <<
lcms, libtiff, libjasper.1, libpng3 (>= 1:1.2.27-1), libdjvulibre15-dev,
libjpeg, fontconfig2-dev, expat1, bzip2-dev, libxml2, libiconv-dev,
freetype219,
openexr-dev,
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
