Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv2939
Modified Files: libgeos2.info libgeos3.2.0.info libgeos3.2.2.info libgeos3.info Log Message: conflict/replace different versions of the same library Index: libgeos3.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libgeos3.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- libgeos3.info 24 Dec 2009 16:08:25 -0000 1.4 +++ libgeos3.info 12 Nov 2010 00:00:51 -0000 1.5 @@ -1,6 +1,6 @@ Package: libgeos3 Version: 3.2.0 -Revision: 1 +Revision: 2 Description: Geometry Engine - Open Source License: LGPL Homepage: http://geos.refractions.net/ @@ -15,8 +15,8 @@ << -Conflicts: libgeos2 -Replaces: libgeos2 +Conflicts: libgeos2, libgeos3.2.0, libgeos3.2.2 +Replaces: libgeos2, libgeos3.2.0, libgeos3.2.2 # Dependencies. Depends: %N-shlibs (= %v-%r), libgeosc1-shlibs (= %v-%r) @@ -78,6 +78,8 @@ SplitOff3: << Package: libgeosc1 BuildDependsOnly: true + Conflicts: libgeos2, libgeos3.2.0, libgeos3.2.2 + Replaces: libgeos2, libgeos3.2.0, libgeos3.2.2 Files: << include/geos.h lib/libgeos3/libgeos_c.a Index: libgeos2.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libgeos2.info,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- libgeos2.info 15 Mar 2009 11:05:30 -0000 1.13 +++ libgeos2.info 12 Nov 2010 00:00:51 -0000 1.14 @@ -1,6 +1,6 @@ Package: libgeos2 Version: 2.2.3 -Revision: 2007 +Revision: 2008 Description: Geometry Engine - Open Source License: LGPL Homepage: http://geos.refractions.net/ @@ -31,8 +31,8 @@ InstallScript: make -j1 install-strip DESTDIR=%d DocFiles: AUTHORS ChangeLog COPYING README TODO -Conflicts: libgeos3, libgeosc1 -Replaces: libgeos3, libgeosc1 +Conflicts: libgeos3, libgeosc1, libgeos3.2.0, libgeos3.2.2 +Replaces: libgeos3, libgeosc1, libgeos3.2.0, libgeos3.2.2 # Additional Phase. SplitOff: << Index: libgeos3.2.2.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libgeos3.2.2.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- libgeos3.2.2.info 27 Jul 2010 15:42:05 -0000 1.1 +++ libgeos3.2.2.info 12 Nov 2010 00:00:51 -0000 1.2 @@ -1,7 +1,7 @@ Info4: << Package: libgeos3.2.2 Version: 3.2.2 -Revision: 1 +Revision: 3 Description: Geometry Engine - Open Source License: LGPL Homepage: http://geos.refractions.net/ @@ -15,6 +15,9 @@ JTS topology functions such as IsValid(). << +Conflicts: libgeos2, libgeos3, libgeosc1, libgeos3.2.0 +Replaces: libgeos2, libgeos3, libgeosc1, libgeos3.2.0 + # Dependencies. Depends: %N-shlibs (>= %v-%r) BuildDepends: fink (>= 0.28.0-1) Index: libgeos3.2.0.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libgeos3.2.0.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- libgeos3.2.0.info 27 Mar 2010 16:27:25 -0000 1.1 +++ libgeos3.2.0.info 12 Nov 2010 00:00:51 -0000 1.2 @@ -1,7 +1,7 @@ Info4: << Package: libgeos3.2.0 Version: 3.2.0 -Revision: 4 +Revision: 5 Description: Geometry Engine - Open Source License: LGPL Homepage: http://geos.refractions.net/ @@ -14,6 +14,9 @@ JTS topology functions such as IsValid(). << +Conflicts: libgeos2, libgeos3, libgeosc1, libgeos3.2.2 +Replaces: libgeos2, libgeos3, libgeosc1, libgeos3.2.2 + # Dependencies. Depends: %N-shlibs (>= %v-%r) BuildDepends: fink (>= 0.28.0-1) ------------------------------------------------------------------------------ Centralized Desktop Delivery: Dell and VMware Reference Architecture Simplifying enterprise desktop deployment and management using Dell EqualLogic storage and VMware View: A highly scalable, end-to-end client virtualization framework. Read more! http://p.sf.net/sfu/dell-eql-dev2dev _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs