Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv15633/10.4/stable/main/finkinfo/sci
Modified Files:
octave-10.5-3.2.4.info octave-3.2.4.info
Log Message:
Missing Replaces on mkoctfile-oct324-gcc46, whose functionality has been
subsumed into octave324*-dev
Fix UMBJ in 10.5 package.
Index: octave-10.5-3.2.4.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/octave-10.5-3.2.4.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- octave-10.5-3.2.4.info 3 Nov 2011 03:22:55 -0000 1.3
+++ octave-10.5-3.2.4.info 10 Nov 2011 12:15:01 -0000 1.4
@@ -2,7 +2,7 @@
Package: octave%type_pkg[-atlas]%type_pkg[-x11]
Type: -atlas (boolean), oct(3.2.4), gcc (4.6), -x11 (boolean)
Version: 3.2.4
-Revision: 501
+Revision: 502
Distribution: 10.5
#atlas-only on x86_64
Architecture: (%type_raw[-atlas] != -atlas) i386, (%type_raw[-atlas] !=
-atlas) powerpc
@@ -134,7 +134,7 @@
<<
GCC: 4.0
-UseMaxBuildJobs: true
+UseMaxBuildJobs: false
SetCC: flag-sort -r gcc
SetCXX: flag-sort -r g++
SetLDFLAGS: -Wl,-dead_strip_dylibs
@@ -212,9 +212,8 @@
cp -R examples %i/share/%{Ni}/%v/doc/examples
# clear out hardcoded Fink sed.
pushd %i/bin
- # clear out hardcoded Fink sed.
- for file in mkoctfile-%v %{Ni}-bug-%v %{Ni}-config-%v
- do
+ for file in mkoctfile-%v %{Ni}-config-%v
+ do
perl -pi -e 's|%p/bin/sed|/usr/bin/sed|g' $file
done
popd
@@ -345,7 +344,9 @@
%{Ni} (<< 3.0.5-5),
%{Ni}-atlas (<< 3.0.5-5),
%{Ni}3.0.2 ( << 3.0.2-5),
- %{Ni}3.0.2-atlas ( << 3.0.2-5)
+ %{Ni}3.0.2-atlas ( << 3.0.2-5),
+ mkoctfile%type_pkg[oct]-gcc46,
+ mkoctfile%type_pkg[oct]-gcc46-atlas
<<
Provides: <<
@@ -355,6 +356,7 @@
(%type_raw[-x11] = -x11) liboctave%type_pkg[oct]-x11-dev,
(%type_raw[-x11] != -x11) liboctave%type_pkg[oct]-aqua-dev
<<
+
BuildDependsOnly: true
Files: <<
@@ -593,7 +595,7 @@
the information in oct-conf.h gets hardcoded into the Octave interpreter
executable, and some octave-forge packages get information from that.
-As of revision 226:
+As of revision 126:
Get rid of the ugly construction previously used for setting the BLAS and
LAPACK libraries.
Index: octave-3.2.4.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/octave-3.2.4.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- octave-3.2.4.info 9 Nov 2011 23:12:07 -0000 1.5
+++ octave-3.2.4.info 10 Nov 2011 12:15:01 -0000 1.6
@@ -2,7 +2,7 @@
Package: octave%type_pkg[-atlas]%type_pkg[-x11]
Type: -atlas (boolean), oct(3.2.4), gcc (4.6), -x11 (boolean)
Version: 3.2.4
-Revision: 601
+Revision: 602
Distribution: 10.6
#atlas-only on x86_64
Architecture: (%type_raw[-atlas] != -atlas) i386
@@ -210,9 +210,8 @@
cp -R examples %i/share/%{Ni}/%v/doc/examples
# clear out hardcoded Fink sed.
pushd %i/bin
- # clear out hardcoded Fink sed.
- for file in mkoctfile-%v %{Ni}-bug-%v %{Ni}-config-%v
- do
+ for file in mkoctfile-%v %{Ni}-config-%v
+ do
perl -pi -e 's|%p/bin/sed|/usr/bin/sed|g' $file
done
popd
@@ -341,7 +340,9 @@
%{Ni} (<< 3.0.5-5),
%{Ni}-atlas (<< 3.0.5-5),
%{Ni}3.0.2 ( << 3.0.2-5),
- %{Ni}3.0.2-atlas ( << 3.0.2-5)
+ %{Ni}3.0.2-atlas ( << 3.0.2-5),
+ mkoctfile%type_pkg[oct]-gcc46,
+ mkoctfile%type_pkg[oct]-gcc46-atlas
<<
Provides: <<
@@ -351,6 +352,7 @@
(%type_raw[-x11] = -x11) liboctave%type_pkg[oct]-x11-dev,
(%type_raw[-x11] != -x11) liboctave%type_pkg[oct]-aqua-dev
<<
+
BuildDependsOnly: true
Files: <<
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
