Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory
fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13958/unstable/main/finkinfo/sci
Modified Files:
qtiplot-qt4-mac.info qtiplot-qt4-x11.info
Log Message:
For qwt: Can't have doc splitoffs Depend on the main package, so Recommend that
(having the main Conflict/Replace the "opposite" doc would work, but
doesn't seem exactly like what we'd want)
Dependency and flag order cleanups for qtiplot
Index: qtiplot-qt4-mac.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/qtiplot-qt4-mac.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- qtiplot-qt4-mac.info 25 Jun 2009 08:01:20 -0000 1.2
+++ qtiplot-qt4-mac.info 26 Jun 2009 10:51:52 -0000 1.3
@@ -1,13 +1,14 @@
Package: qtiplot-qt4-mac
Version: 0.9.7.6
-Revision: 2
+Revision: 3
Maintainer: Alexandre Vial <[email protected]>
Depends: qt4-mac-core-shlibs (>=4.5.1-1), qt4-mac-gui-shlibs(>=4.5.1-1),
gsl-shlibs, muparser-shlibs, boost1.35.nopython-shlibs, qwt-qt4-mac-shlibs
(>=5.2.0), libpng3-shlibs
-BuildDepends: qt4-mac, gsl, muparser, libpng3, boost1.35.nopython, qwt-qt4-mac
(>=5.2.0), fink (>= 0.28), libgettext3-dev, glib2-dev
+BuildDepends: qt4-mac, gsl, muparser, libpng3, boost1.35.nopython, qwt-qt4-mac
(>=5.2.0), fink (>= 0.28), libgettext3-dev, glib2-dev, flag-sort,
system-openssl-dev
BuildConflicts: labplot, labplot-shlibs, liborigin, liborigin-shlibs
Conflicts: qtiplot-aqua
+Replaces: qtiplot-aqua
Description: Data analysis and scientific plotting
Homepage: http://soft.proindependent.com/qtiplot.html
@@ -21,13 +22,21 @@
PatchFile: %n.patch
PatchFile-MD5: 3d4f7fbef64803f53db5d0906c9cef05
-PatchScript: sed 's,@PREFIX@,%p,g' < %{PatchFile} | patch -p1
+PatchScript: <<
+#!/bin/sh -ev
+sed 's,@PREFIX@,%p,g' < %{PatchFile} | patch -p1
+echo '#!/bin/sh -ev
+name=`basename $0`
+flag-sort -v /usr/bin/$name $@' >> ../c++
+chmod a+x ../c++
+ln ../c++ ../cc
+<<
CompileScript: <<
#!/bin/sh -ev
unset QMAKESPEC
export QTDIR=%p/lib/qt4-mac
-export PATH="$QTDIR/bin:%p/lib/freetype219/bin:$PATH"
+export PATH="%b/..:$QTDIR/bin:$PATH"
%p/lib/qt4-mac/bin/qmake qtiplot.pro
make
<<
@@ -41,6 +50,10 @@
<<
DescPackaging: <<
-Requires qt4-mac in Depends, while it should only be BuildDepends, but fails
otherwise
+AKH: 20090626
+uses the new "flag-order" package and a hack courtesy of jfmertens
+to reset its flag ordering.
+Links to the system's openssl, so there's a BuildDepend on that--this seems to
+be robust regardless of whether a fink openssl*-dev is installed or not.
<<
Index: qtiplot-qt4-x11.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/qtiplot-qt4-x11.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- qtiplot-qt4-x11.info 25 Jun 2009 08:01:20 -0000 1.9
+++ qtiplot-qt4-x11.info 26 Jun 2009 10:51:52 -0000 1.10
@@ -1,13 +1,14 @@
Package: qtiplot-qt4-x11
Version: 0.9.7.6
-Revision: 2
+Revision: 3
Maintainer: Alexandre Vial <[email protected]>
-Depends: x11, qt4-x11-core-shlibs, gsl-shlibs, muparser-shlibs,
boost1.35.nopython-shlibs, qwt-qt4-x11-shlibs (>=5.2.0), libpng3-shlibs
-BuildDepends: x11-dev, qt4-x11, gsl, muparser, boost1.35.nopython, qwt-qt4-x11
(>=5.2.0), fink (>= 0.28), libgettext3-dev, glib2-dev
+Depends: x11, qt4-x11-core-shlibs, gsl-shlibs, muparser-shlibs,
boost1.35.nopython-shlibs, qwt-qt4-x11-shlibs (>=5.2.0), libpng3-shlibs, ,
freetype219-shlibs (>=2.3.8-2)
+BuildDepends: x11-dev, qt4-x11, gsl, muparser, boost1.35.nopython, qwt-qt4-x11
(>=5.2.0), fink (>= 0.28), libgettext3-dev, glib2-dev, flag-sort, freetype219
(>=2.3.8-2), system-openssl-dev
BuildConflicts: labplot, labplot-shlibs, liborigin, liborigin-shlibs
Conflicts: qtiplot
+Replaces: qtiplot
Description: Data analysis and scientific plotting
Homepage: http://soft.proindependent.com/qtiplot.html
@@ -21,13 +22,21 @@
PatchFile: %n.patch
PatchFile-MD5: 01cda00df83eda91e467eda1da118858
-PatchScript: sed 's,@PREFIX@,%p,g' < %{PatchFile} | patch -p1
+PatchScript: <<
+#!/bin/sh -ev
+sed 's,@PREFIX@,%p,g' < %{PatchFile} | patch -p1
+echo '#!/bin/sh -ev
+name=`basename $0`
+flag-sort -v /usr/bin/$name $@' >> ../c++
+chmod a+x ../c++
+ln ../c++ ../cc
+<<
CompileScript: <<
#!/bin/sh -ev
unset QMAKESPEC
export QTDIR=%p/lib/qt4-x11
-export PATH="$QTDIR/bin:%p/lib/freetype219/bin:$PATH"
+export PATH="%b/..:$QTDIR/bin:$PATH"
%p/lib/qt4-x11/bin/qmake qtiplot.pro
make
<<
@@ -50,6 +59,14 @@
DescDetail: <<
Data analysis and scientific plotting program
+DescPackaging: <<
+AKH: 20090626
+uses the new "flag-order" package and a hack courtesy of jfmertens
+to reset its flag ordering, which conviently also makes it not link
+to X11's libpng and freetype in preference to Fink's.
+Links to the system's openssl, so there's a BuildDepend on that--this seems to
+be robust regardless of whether a fink openssl*-dev is installed or not.
+<<
<<
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
