Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv2012

Modified Files:
        kdesvn-kde4-x11.info 
Log Message:
oops #2

Index: kdesvn-kde4-x11.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/kdesvn-kde4-x11.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- kdesvn-kde4-x11.info        30 Nov 2009 21:47:12 -0000      1.13
+++ kdesvn-kde4-x11.info        30 Nov 2009 21:52:19 -0000      1.14
@@ -2,7 +2,6 @@
 Version: 1.4.0
 Revision: 1002
 Distribution: 10.4, 10.5
->>>>>>> 1.11
 Depends: kdelibs4-x11-shlibs (>= 4.2.4-1), libapr.0-shlibs (>= 1.3.3-6), 
libaprutil.0-shlibs (>= 1.3.4-8), qt4-x11-core-shlibs (>= 4.5.1-1), 
qt4-x11-gui-shlibs (>= 4.5.1-1), svn15-shlibs (>= 1.5.6-3), x11, x11-shlibs
 BuildDepends: fink (>= 0.29.7-1), gettext-tools-0.17 (>= 0.17-12), 
kdelibs4-x11-dev (>= 4.2.4-1), libapr.0-dev (>= 1.3.3-6), libaprutil.0-dev (>= 
1.3.4-8), qt4-x11 (>= 4.5.1-1), svn15-dev (>= 1.5.6-3), x11-dev, automoc-x11 
(>= 0.9.89-0), soprano-x11-dev (>= 2.2.3-7), cmake (>= 2.6.3-1)
 Conflicts: kde4-x11-ioslave


------------------------------------------------------------------------------
Join us December 9, 2009 for the Red Hat Virtual Experience,
a free event focused on virtualization and cloud computing. 
Attend in-depth sessions from your desk. Your couch. Anywhere.
http://p.sf.net/sfu/redhat-sfdev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to