Update of /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv4220

Modified Files:
        firefox.info firefox1.5.info 
Log Message:
coexistence with seamonkey

Index: firefox.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/firefox.info,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- firefox.info        7 Jul 2006 15:58:11 -0000       1.7
+++ firefox.info        25 Sep 2006 20:48:55 -0000      1.8
@@ -1,6 +1,6 @@
 Package: firefox
 Version: 1.0.8
-Revision: 1003
+Revision: 1004
 Architecture: powerpc
 Description: Lightweight browser from mozilla.org
 License: OSI-Approved
@@ -90,17 +90,19 @@
        libgettext3-shlibs,
        libiconv
   <<
-  Conflicts: <<
-       mozilla-dev,
-       firefox-dev,
-       firefox1.5-dev,
-       firefox2-dev
-  <<
+#  cf seamonkey.info for the absence of conflicts
+#  Conflicts: <<
+#      mozilla-dev,
+#      firefox-dev,
+#      firefox1.5-dev,
+#      firefox2-dev
+#  <<
   Replaces: <<
        mozilla-dev,
        firefox-dev,
        firefox1.5-dev,
-       firefox2-dev
+       firefox2-dev,
+       seamonkey-dev
   <<
   BuildDependsOnly: true
   Description: Lightweight browser from mozilla.org

Index: firefox1.5.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/firefox1.5.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- firefox1.5.info     23 Sep 2006 21:49:39 -0000      1.4
+++ firefox1.5.info     25 Sep 2006 20:48:55 -0000      1.5
@@ -1,6 +1,6 @@
 Package: firefox1.5
 Version: 1.5.0.7
-Revision: 1001
+Revision: 1003
 Description: Lightweight browser from mozilla.org
 License: OSI-Approved
 Maintainer: Hanspeter Niederstrasser <[EMAIL PROTECTED]>
@@ -85,18 +85,20 @@
        libiconv,
        libidl2-shlibs (>= 0.8.7-1)
   <<
-  Conflicts: <<
-       mozilla-dev,
-       firefox-dev,
-       firefox1.5-dev,
-       firefox2-dev
-  <<
+#  cf seamonkey.info for the absence of conflicts
+#  Conflicts: <<
+#      mozilla-dev,
+#      firefox-dev,
+#      firefox1.5-dev,
+#      firefox2-dev
+#  <<
   Replaces: <<
        mozilla-dev,
        firefox-dev,
        firefox1.5-dev,
        firefox2-dev
-  <<
+       seamonkey-dev 
+ <<
   BuildDependsOnly: true
   Description: Lightweight browser from mozilla.org
   DocFiles: LEGAL LICENSE README.txt


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to