Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs
In directory 
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31753/10.4/stable/main/finkinfo/libs

Modified Files:
        wxcocoa29-shlibs.info wxcocoa292-shlibs.info 
        wxcocoa293-shlibs.info wxcocoa294-shlibs.info 
Log Message:
Fix Conflicts/Replaces to do the Right Thing (TM)


Index: wxcocoa294-shlibs.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/wxcocoa294-shlibs.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- wxcocoa294-shlibs.info      8 Aug 2013 23:45:37 -0000       1.1
+++ wxcocoa294-shlibs.info      9 Aug 2013 01:36:49 -0000       1.2
@@ -1,6 +1,6 @@
 Package: wxcocoa294-shlibs
 Version: 2.9.4
-Revision: 4
+Revision: 5
 GCC: 4.0
 Description: Cross-platform GUI API - mac/Cocoa version
 License: GPL2/LGPL
@@ -26,8 +26,8 @@
        libpng16,
        libtiff5
 <<
-Conflicts: wxgtk, wxcocoa, wxmac, wxgtk2.8, wxmac28, wxmac28-unicode, 
wxcocoa29, wxcocoa292, wxcocoa293, wxcocoa294, wxcocoa295
-Replaces: wxgtk, wxcocoa, wxmac, wxgtk2.8, wxmac28, wxmac28-unicode, 
wxcocoa29, wxcocoa292, wxcocoa293, wxcocoa294, wxcocoa295
+Conflicts: wxcocoa294
+Replaces: wxcocoa294
 
 Source: mirror:sourceforge:wxwindows/wxWidgets-%v.tar.bz2
 Source-MD5: f1348f740a569ce2945512d5b0e70e87

Index: wxcocoa293-shlibs.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/wxcocoa293-shlibs.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- wxcocoa293-shlibs.info      7 Aug 2013 02:25:15 -0000       1.1
+++ wxcocoa293-shlibs.info      9 Aug 2013 01:36:49 -0000       1.2
@@ -1,6 +1,6 @@
 Package: wxcocoa293-shlibs
 Version: 2.9.3
-Revision: 6
+Revision: 7
 GCC: 4.0
 Description: Cross-platform GUI API - mac/Cocoa version
 License: GPL2/LGPL
@@ -26,8 +26,8 @@
        libpng16,
        libtiff5
 <<
-Conflicts: wxgtk, wxcocoa, wxmac, wxgtk2.8, wxmac28, wxmac28-unicode, 
wxcocoa29, wxcocoa292, wxcocoa293, wxcocoa294, wxcocoa295
-Replaces: wxgtk, wxcocoa, wxmac, wxgtk2.8, wxmac28, wxmac28-unicode, 
wxcocoa29, wxcocoa292, wxcocoa293, wxcocoa294, wxcocoa295
+Conflicts: wxcocoa293
+Replaces: wxcocoa293
 
 Source: mirror:sourceforge:wxwindows/wxWidgets-%v.tar.bz2
 Source-MD5: 6b6003713289ea4d3cd9b49c5db5b721

Index: wxcocoa292-shlibs.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/wxcocoa292-shlibs.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- wxcocoa292-shlibs.info      7 Aug 2013 02:25:15 -0000       1.1
+++ wxcocoa292-shlibs.info      9 Aug 2013 01:36:49 -0000       1.2
@@ -1,6 +1,6 @@
 Package: wxcocoa292-shlibs
 Version: 2.9.2
-Revision: 6
+Revision: 7
 GCC: 4.0
 Description: Cross-platform GUI API - mac/Cocoa version
 License: GPL2/LGPL
@@ -26,8 +26,8 @@
        libpng16,
        libtiff5
 <<
-Conflicts: wxgtk, wxcocoa, wxmac, wxgtk2.8, wxmac28, wxmac28-unicode, 
wxcocoa29, wxcocoa292, wxcocoa293, wxcocoa294, wxcocoa295
-Replaces: wxgtk, wxcocoa, wxmac, wxgtk2.8, wxmac28, wxmac28-unicode, 
wxcocoa29, wxcocoa292, wxcocoa293, wxcocoa294, wxcocoa295
+Conflicts: wxcocoa292
+Replaces: wxcocoa292
 
 Source: mirror:sourceforge:wxwindows/wxWidgets-%v.tar.bz2
 Source-MD5: d6cec5bd331ba90b74c1e2fcb0563620

Index: wxcocoa29-shlibs.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/wxcocoa29-shlibs.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- wxcocoa29-shlibs.info       9 Aug 2013 01:16:16 -0000       1.2
+++ wxcocoa29-shlibs.info       9 Aug 2013 01:36:49 -0000       1.3
@@ -1,6 +1,6 @@
 Package: wxcocoa29-shlibs
 Version: 2.9.1
-Revision: 6
+Revision: 7
 Epoch: 1
 GCC: 4.0
 Description: Cross-platform GUI API - mac/Cocoa version
@@ -27,8 +27,8 @@
        libpng16,
        libtiff5
 <<
-Conflicts: wxgtk, wxcocoa, wxmac, wxgtk2.8, wxmac28, wxmac28-unicode, 
wxcocoa29, wxcocoa292, wxcocoa293, wxcocoa294, wxcocoa295
-Replaces: wxgtk, wxcocoa, wxmac, wxgtk2.8, wxmac28, wxmac28-unicode, 
wxcocoa29, wxcocoa292, wxcocoa293, wxcocoa294, wxcocoa295
+Conflicts: wxcocoa29
+Replaces: wxcocoa29
 
 Source: mirror:sourceforge:wxwindows/wxWidgets-%v.tar.bz2
 Source-MD5: 81c20d7b2ba31becb18e467dbe09be8f


------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead. 
Download for free and get started troubleshooting in minutes. 
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to