Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs
In directory
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19109/10.7/stable/main/finkinfo/libs
Modified Files:
libspatialindex2.info libspatialindex3.info
Log Message:
conflict solved
Index: libspatialindex3.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/libspatialindex3.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libspatialindex3.info 12 Jan 2013 00:03:59 -0000 1.1
+++ libspatialindex3.info 12 Jan 2013 00:12:45 -0000 1.2
@@ -4,7 +4,7 @@
BuildDependsOnly: True
Version: 1.8.0
-Revision: 1
+Revision: 2
Description: Headers for Spatial Index
License: BSD
Homepage: http://libspatialindex.github.com
@@ -32,6 +32,8 @@
# Dependencies.
Depends: %n-shlibs
BuildDepends:
+Conflicts: libspatialindex2
+Replaces: libspatialindex2
# Unpack Phase.
Source: http://download.osgeo.org/libspatialindex/spatialindex-src-%v.tar.gz
Index: libspatialindex2.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/libspatialindex2.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libspatialindex2.info 7 Dec 2012 01:53:19 -0000 1.1
+++ libspatialindex2.info 12 Jan 2013 00:12:45 -0000 1.2
@@ -1,14 +1,12 @@
Info2: <<
Package: libspatialindex2
-Architecture: powerpc, i386, x86_64
-Distribution: 10.5, 10.6, 10.7
BuildDependsOnly: True
Version: 1.7.1
-Revision: 1
+Revision: 2
Description: Headers for Spatial Index
-License: GPL
+License: BSD
Homepage: http://libspatialindex.github.com
Maintainer: BABA Yoshihiko <babayoshih...@mac.com>
DescDetail: <<
@@ -34,6 +32,8 @@
# Dependencies.
Depends: %n-shlibs
BuildDepends:
+Conflicts: libspatialindex3
+Replaces: libspatialindex3
# Unpack Phase.
Source: http://download.osgeo.org/libspatialindex/spatialindex-src-%v.tar.gz
@@ -54,10 +54,10 @@
SplitOff: <<
Package: %N-shlibs
Description: Libraries for Spatial Index
- Files: lib/*.2.dylib
+ Files: lib/*.3.dylib
Shlibs: <<
- %p/lib/libspatialindex.2.dylib 3.0.0 %n (>= 1.7.1-1)
- %p/lib/libspatialindex_c.2.dylib 3.0.0 %n (>= 1.7.1-1)
+ %p/lib/libspatialindex.3.dylib 4.0.0 %n (>= 1.8.0-1)
+ %p/lib/libspatialindex_c.3.dylib 4.0.0 %n (>= 1.8.0-1)
<<
<<
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. SALE $99.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122912
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
