Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv27704
Modified Files:
qtoctave.info
Log Message:
only Replaces (not Conflicts) the old version of the now-bundle...otherwise
deadlock when upgrading that one
Index: qtoctave.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/qtoctave.info,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- qtoctave.info 1 Jun 2010 22:03:06 -0000 1.18
+++ qtoctave.info 15 Jun 2011 08:44:28 -0000 1.19
@@ -1,7 +1,7 @@
Info2: <<
Package: qtoctave%type_pkg[-ui]
Version: 0.9.1
-Revision: 1004
+Revision: 1005
Type: -ui (-x11 -mac)
Source: http://forja.rediris.es/frs/download.php/1760/%{ni}-%v.tar.bz2
##PatchFile: %{ni}.patch
@@ -10,7 +10,7 @@
Depends: qt4%type_pkg[-ui]-core-shlibs (>= 4.6-1),
qt4%type_pkg[-ui]-gui-shlibs (>= 4.6-1), fontconfig2-shlibs
BuildDepends: (type_pkg[-ui] = -x11) x11-dev, qt4%type_pkg[-ui] (>= 4.6-1),
cmake (>= 2.6.1-2), fink (>= 0.24.12-1), fontconfig2-dev
Suggests: octave | octave-atlas
-Conflicts: qtoctave (<< 0.7.4-1006), qtoctave-x11, qtoctave-mac
+Conflicts: qtoctave-x11, qtoctave-mac
Replaces: qtoctave (<< 0.7.4-1006), qtoctave-x11, qtoctave-mac
Maintainer: Jack Fink <jackf...@users.sourceforge.net>
Homepage: http://qtoctave.wordpress.com
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
