Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv5434
Modified Files:
image-oct.info
Log Message:
Fix this red-haired step-package. (functions are now in Octave core)
Actually find and use libpng (3, not 14) and libjpeg8.
Fix PostInstScript to conform to other octave-forge packages to deal better
with being the first package installed.
Index: image-oct.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/image-oct.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- image-oct.info 29 Aug 2011 23:01:21 -0000 1.2
+++ image-oct.info 31 Aug 2011 01:56:37 -0000 1.3
@@ -2,7 +2,7 @@
Package: image-oct%type_pkg[oct]
Version: 1.0.7
Type: oct (3.0.5), forge (image)
-Revision: 2
+Revision: 3
Maintainer: Alexander Hansen <[email protected]>
# unfortunately, Homepage won't do types
Homepage: http://octave.sourceforge.net/general/index.html
@@ -24,11 +24,11 @@
BuildDepends: <<
octave%type_pkg[oct]-dev | octave%type_pkg[oct]-atlas-dev,
- fftw3, hdf5.7-oldapi, graphicsmagick-dev, libjpeg8, libpng14
+ fftw3, hdf5.7-oldapi, graphicsmagick-dev, libjpeg8, libpng3
<<
Depends: <<
octave%type_pkg[oct] | octave%type_pkg[oct]-atlas,
- graphicsmagick-shlibs, libjpeg8-shlibs, libpng14-shlibs
+ graphicsmagick-shlibs, libjpeg8-shlibs, libpng3-shlibs
<<
Conflicts: octave-forge, octave-forge-%type_raw[forge] (<< 1.0.7-999)
Replaces: octave-forge-%type_raw[forge] (<< 1.0.7-999)
@@ -41,10 +41,10 @@
Source: mirror:sourceforge:octave/%type_raw[forge]-%v.tar.gz
-NoSetCPPFLAGS: true
-NoSetLDFLAGS: true
SetLIBRARY_PATH: /usr/X11R6/lib:%p/lib
SetMAKEFLAGS: -j1
+SetCPPFLAGS: -I%p/opt/hdf5v1.6/include
+SetLDFLAGS: -L%p/opt/hdf5v1.6/lib
CompileScript: %p/share/octave/%type_raw[oct]/scripts/octave-forge-compile.sh
%type_raw[forge]-%v
InstallScript: <<
@@ -58,7 +58,7 @@
chmod a+x octave-forge*
<<
PostInstScript: <<
- if [ -f %p/var/octave/%type_raw[oct]/octave_packages ]
+ if [ -s %p/var/octave/%type_raw[oct]/octave_packages ] && [ -f
%p/var/octave/%type_raw[oct]/octave_packages ]
then
%p/share/octave/%type_raw[oct]/%type_raw[forge]-%v/octave-forge-postinst
else
------------------------------------------------------------------------------
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
