Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv9922

Modified Files:
        libgeotiff.info libgeotiff2.info 
Log Message:
fix compatibility of libgeotiff; update the dependencies

Index: libgeotiff.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/libgeotiff.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libgeotiff.info     20 Jan 2010 19:09:15 -0000      1.2
+++ libgeotiff.info     13 Sep 2013 01:51:49 -0000      1.3
@@ -1,7 +1,7 @@
 Info2: <<
 Package: libgeotiff
 Version: 1.2.5
-Revision: 6
+Revision: 7
 Description: GeoTIFF handling library
 License: BSD
 Homepage: http://trac.osgeo.org/geotiff/
@@ -11,14 +11,15 @@
 
 Depends: <<
   %n-shlibs (= %v-%r),
-  libjpeg-shlibs, libtiff-shlibs, proj-shlibs
+  libjpeg9-shlibs, libtiff5-shlibs, proj-shlibs
 <<
 BuildDepends: <<
   fink (>= 0.28),
-  libjpeg, libtiff, proj
+  libjpeg9, libtiff5, proj
 <<
-Replaces: %n-shlibs (<< 1.2.6-1)
 BuildDependsOnly: True
+Conflicts: libgeotiff2
+Replaces: libgeotiff2, %n-shlibs (<< 1.2.6-1)
 
 PatchFile: %n.patch
 PatchFile-MD5: 364f5761fd4ebcd3db3f985625c985b1
@@ -64,6 +65,15 @@
   DocFiles: HOWTO-RELEASE LICENSE README README_BIN
 <<
 
+SplitOff2: <<
+  Package: %N-bin
+  Files: bin
+  Description: geotifcp and listgeo
+  Conflicts: libgeotiff2-bin
+  Replaces: libgeotiff2-bin
+  DocFiles: HOWTO-RELEASE LICENSE README README_BIN
+<<
+
 # End of Info2
 <<
 

Index: libgeotiff2.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/libgeotiff2.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libgeotiff2.info    11 Sep 2013 08:15:58 -0000      1.2
+++ libgeotiff2.info    13 Sep 2013 01:51:49 -0000      1.3
@@ -1,12 +1,12 @@
 Info2: <<
 Package: libgeotiff2
 Version: 1.4.0
-Revision: 3
+Revision: 2
 Description: GeoTIFF handling library
 License: BSD
 Homepage: http://trac.osgeo.org/geotiff/
 Maintainer: BABA Yoshihiko <babayoshih...@mac.com>
-Source: ftp://ftp.remotesensing.org/pub/geotiff/libgeotiff/libgeotiff-%v.tar.gz
+Source: http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-%v.tar.gz
 Source-MD5: efa7b418bc00228fcda4da63557e40c2
 
 Depends: <<
@@ -14,10 +14,9 @@
   libjpeg9-shlibs, libtiff5-shlibs, proj-shlibs
 <<
 BuildDepends: <<
-  fink-package-precedence,
+  fink (>= 0.28),
   libjpeg9, libtiff5, proj
 <<
-BuildConflicts: %n (<< %v-%r)
 Conflicts: libgeotiff
 Replaces: libgeotiff
 BuildDependsOnly: True
@@ -27,13 +26,12 @@
 
 SetCPPFLAGS: -Os -I%p/include
 SetDYLD_LIBRARY_PATH: %p/lib
-ConfigureParams: --with-zip=/usr/include --with-jpeg=%p/include 
--with-libtiff=%p/include --enable-incode-epsg
+ConfigureParams: --with-zip=/usr/include --with-jpeg=%p/include 
--with-libtiff=%p/include  --with-proj-lib=%p/include --enable-incode-epsg
 
 CompileScript: <<
 #!/bin/sh -xe
   ./configure %c
   make
-  fink-package-precedence --prohibit-bdep=%n .
 <<
 InstallScript: <<
 #!/bin/sh -xe
@@ -43,14 +41,7 @@
 
 SplitOff: <<
   Package: %N-shlibs
-  Depends: <<
-    libjpeg9-shlibs, libtiff5-shlibs, proj-shlibs
-  <<
-  Replaces: %N-bin
-  Files: <<
-    lib/libgeotiff.2.dylib
-    share/epsg_csv
-  <<
+  Files: lib/libgeotiff.2.dylib
   Shlibs: <<
     %p/lib/libgeotiff.2.dylib 4.0.0 %n (>= 1.4.0-1)
   <<
@@ -60,13 +51,10 @@
 
 SplitOff2: <<
   Package: %N-bin
-  Files: <<
-    bin
-    share/man/man1
-  <<
-  Description: Binary for libgeotiff package
-  Conflicts: libgeotiff
-  Replaces: libgeotiff, libgeotiff2
+  Files: bin
+  Description: geotifcp and listgeo
+  Conflicts: libgeotiff-bin
+  Replaces: libgeotiff-bin
   DocFiles: AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README README_BIN
 <<
 


------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. Consolidate legacy IT systems to a single system of record for IT
2. Standardize and globalize service processes across IT
3. Implement zero-touch automation to replace manual, redundant tasks
http://pubads.g.doubleclick.net/gampad/clk?id=51271111&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to