Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/base
In directory
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29226/10.4/stable/main/finkinfo/base
Modified Files:
dpkg.info gettext-tools.info libgettext3-shlibs.info
libgettext8-shlibs.info
Log Message:
Oops, lost the gcc4N BuildConflicts.
While we're at it, add gcc48 to the no-no list.
Index: libgettext3-shlibs.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/base/libgettext3-shlibs.info,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- libgettext3-shlibs.info 30 Mar 2013 00:12:13 -0000 1.11
+++ libgettext3-shlibs.info 31 Mar 2013 00:44:37 -0000 1.12
@@ -15,6 +15,12 @@
Depends: libiconv, libiconv-bin, base-files
BuildDepends: libiconv-dev, fink (>= 0.24.12)
Conflicts: libgettext3
+BuildConflicts: <<
+ ( %m = powerpc ) gcc45,
+ ( %m = powerpc ) gcc46,
+ ( %m = powerpc ) gcc47,
+ ( %m = powerpc ) gcc48
+<<
Replaces: gettext-bin (<< 0.14-1), libgettext3
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
Index: gettext-tools.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/base/gettext-tools.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- gettext-tools.info 30 Mar 2013 00:12:13 -0000 1.14
+++ gettext-tools.info 31 Mar 2013 00:44:37 -0000 1.15
@@ -28,6 +28,12 @@
libncurses5 (>= 5.4-20041023-1011)
<<
Conflicts: gettext-tools-0.17
+BuildConflicts: <<
+ ( %m = powerpc ) gcc45,
+ ( %m = powerpc ) gcc46,
+ ( %m = powerpc ) gcc47,
+ ( %m = powerpc ) gcc48
+<<
Replaces: gettext-dev (<= 0.10.40-20), gettext (<= 0.10.40-4), gettext-bin (<=
0.10.40-20), libgettext3-shlibs (<< 0.14.5-1), libgettextpo2-shlibs (<<
0.14.5-2), gettext-tools-0.17
### When gettext-tools gets updated, make sure these ./configure parameters
Index: libgettext8-shlibs.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/base/libgettext8-shlibs.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- libgettext8-shlibs.info 30 Mar 2013 00:12:13 -0000 1.6
+++ libgettext8-shlibs.info 31 Mar 2013 00:44:37 -0000 1.7
@@ -13,6 +13,12 @@
Essential: yes
Depends: libiconv, libiconv-bin, base-files
BuildDepends: libiconv-dev, fink (>= 0.24.12)
+BuildConflicts: <<
+ ( %m = powerpc ) gcc45,
+ ( %m = powerpc ) gcc46,
+ ( %m = powerpc ) gcc47,
+ ( %m = powerpc ) gcc48
+<<
#UseMaxBuildJobs: false
SetCFLAGS: -Os
ConfigureParams: <<
Index: dpkg.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/base/dpkg.info,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- dpkg.info 30 Mar 2013 00:12:13 -0000 1.22
+++ dpkg.info 31 Mar 2013 00:44:37 -0000 1.23
@@ -3,6 +3,12 @@
Revision: 1236
GCC: 4.0
BuildDepends: fink (>= 0.30.0)
+BuildConflicts: <<
+ ( %m = powerpc ) gcc45,
+ ( %m = powerpc ) gcc46,
+ ( %m = powerpc ) gcc47,
+ ( %m = powerpc ) gcc48
+<<
Depends: libgettext8-shlibs (>= 0.18.2.1-1), libiconv (>= 1.11-1), gzip, tar,
libncurses5-shlibs (>= 5.4-20041023-1006)
Essential: yes
UseMaxBuildJobs: false
------------------------------------------------------------------------------
Own the Future-Intel(R) Level Up Game Demo Contest 2013
Rise to greatness in Intel's independent game demo contest. Compete
for recognition, cash, and the chance to get your game on Steam.
$5K grand prize plus 10 genre and skill prizes. Submit your demo
by 6/6/13. http://altfarm.mediaplex.com/ad/ck/12124-176961-30367-2
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
