Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel
In directory sc8-pr-cvs17:/tmp/cvs-serv10415/main/finkinfo/devel

Modified Files:
      Tag: pangocairo-branch
        ant-optional.info maven.info monkeystudio.info 
Removed Files:
      Tag: pangocairo-branch
        avr-libc1.4.info 
Log Message:
merge from HEAD

--- avr-libc1.4.info DELETED ---

Index: ant-optional.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/ant-optional.info,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -d -r1.2.2.2 -r1.2.2.3
--- ant-optional.info   15 Jul 2007 14:45:44 -0000      1.2.2.2
+++ ant-optional.info   24 Jul 2007 17:36:42 -0000      1.2.2.3
@@ -1,10 +1,48 @@
 Package: ant-optional
 Version: 1.7.0
-Revision: 1
+Revision: 2
 Type: java(1.4)
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
-BuildDepends: ant-base (>= %v-1), antlr (>= 2.7.4-3), bcel, jakarta-bsf (>= 
2.3.0-3), jdepend, junit, log4j, jakarta-oro (>= 2.0.7-1), jakarta-regexp (>= 
1.4-1), jsch, jzlib, commons-logging, commons-net, javamail, jdepend (>= 
2.6-4), netrexx, xalan-j, stylebook, system-java-dev (>= 1.4-1)
-Depends: ant-base (>= %v-1), antlr (>= 2.7-1), bcel, jakarta-bsf (>= 2.3.0-3), 
log4j, jakarta-oro (>= 2.0.7-1), jakarta-regexp (>= 1.3-1), jdepend, jsch, 
jzlib, commons-logging, commons-net, javamail, jdepend (>= 2.6-4), netrexx, 
xalan-j, stylebook, system-java (>= 1.4-1)
+BuildDepends: <<
+       ant-base (>= %v-1),
+       antlr (>= 2.7.4-3),
+       bcel,
+       commons-logging,
+       commons-net,
+       jakarta-bsf (>= 2.3.0-3),
+       jakarta-oro (>= 2.0.7-1),
+       jakarta-regexp (>= 1.4-1),
+       javamail,
+       jdepend (>= 2.6-4),
+       jsch,
+       junit,
+       jzlib,
+       log4j,
+       netrexx,
+       stylebook,
+       xalan-j,
+       system-java-dev (>= 1.4-1)
+<<
+Depends: <<
+       ant-base (>= %v-1),
+       antlr (>= 2.7-1),
+       bcel,
+       commons-logging,
+       commons-net,
+       jakarta-bsf (>= 2.3.0-3),
+       jakarta-oro (>= 2.0.7-1),
+       jakarta-regexp (>= 1.3-1),
+       javamail,
+       jdepend (>= 2.6-4),
+       jsch,
+       junit,
+       jzlib,
+       log4j,
+       netrexx,
+       stylebook,
+       xalan-j,
+       system-java (>= 1.4-1)
+<<
 Conflicts: ant (<< 1.6.5-1)
 Replaces: ant (<< 1.6.5-1)
 

Index: monkeystudio.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/monkeystudio.info,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- monkeystudio.info   10 Jul 2007 01:13:01 -0000      1.1.2.3
+++ monkeystudio.info   24 Jul 2007 17:36:42 -0000      1.1.2.4
@@ -3,7 +3,7 @@
 Revision: 1004
 Source: mirror:sourceforge:%n/%n-src-2006.%v.zip
 Depends: libgettext3-shlibs, glib2-shlibs, libiconv, libpng3-shlibs, 
qt4-x11-core-shlibs, qt4-x11-designer-shlibs, qt4-x11-gui-shlibs, x11, 
x11-shlibs
-BuildDepends: libgettext3-dev, libiconv-dev, libpng3, qt4-x11-linguist, 
qt4-x11-designer, qt4-x11, x11-dev, glib2-dev (>= 2.12.0-1)
+BuildDepends: glib2-dev, libgettext3-dev, libiconv-dev, libpng3, 
qt4-x11-linguist, qt4-x11-designer, qt4-x11, x11-dev
 GCC: 4.0
 SourceDirectory: 2006.%v
 Maintainer: Jack Fink <[EMAIL PROTECTED]>

Index: maven.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/maven.info,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- maven.info  29 May 2007 20:21:37 -0000      1.1.2.1
+++ maven.info  24 Jul 2007 17:36:42 -0000      1.1.2.2
@@ -1,9 +1,9 @@
 Package: maven
-Version: 2.0.6
+Version: 2.0.7
 Revision: 1
 Type: java(1.4)
 Source: mirror:apache:%n/binaries/%n-%v-bin.tar.gz
-Source-MD5: c8239ebd1958a1df7fd9242c8ba08aa7
+Source-MD5: 794cca9b62d1e7aa946d294e63deb5d7
 SourceDirectory: %n-%v
 PatchScript: <<
        sed -e 's,@FINKPREFIX@,%p,g' < %a/%n.patch | patch -p1


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to