Update of /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14820/crypto/finkinfo

Modified Files:
        kdebase3-ssl.info kdelibs3-ssl.info kdenetwork3.info 
        kdepim3.info kdeutils3-ssl.info 
Log Message:
buildconflicts fix for unsermake and i18n files

Index: kdenetwork3.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/kdenetwork3.info,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- kdenetwork3.info    23 Mar 2005 12:47:54 -0000      1.16
+++ kdenetwork3.info    24 Mar 2005 22:43:09 -0000      1.17
@@ -7,6 +7,7 @@
 
 Depends: %N-misc (>= %v-%r), dcoprss (>= %v-%r), kget (>= %v-%r), knewsticker 
(>= %v-%r), kopete (>= %v-%r), kpf (>= %v-%r), krdc (>= %v-%r), krfb (>= 
%v-%r), ksirc (>= %v-%r), ktalk (>= %v-%r), lisa (>= %v-%r)
 BuildDepends: arts-dev (>= 1.4.0-11), autoconf2.5, automake1.9, cctools (>= 
446-1) | cctools-single-module, ekg-ssl-dev (>= 1.5-1), fink (>= 0.20.2.1-1), 
freetype2 (>= 2.1.3-23) | freetype2-hinting (>= 2.1.3-23), gettext-dev, 
gettext-bin, gettext-tools, gtk+, kdelibs3-ssl-dev (>= %v-11) | kdelibs3-dev 
(>= %v-11), libart2, libiconv-dev, libjpeg, libidn, libpng3 (>= 1.2.5-4), 
libxml2, libxslt, openslp-ssl-dev | openslp-dev, openssl097, openssl097-dev, 
pcre, qca, qt3 (>= 3.3.3-17), xmms (>= 1.2.7-3), x11-dev
+BuildConflicts: unsermake
 Replaces: %N-common (<< %v-%r), %N-dev (<< %v-%r), kmail (<< %v-1)
 GCC: 3.3
 
@@ -24,7 +25,7 @@
 
 PatchScript: <<
   sed -e 's,@FINKPREFIX@,%p,g' %a/%n.patch | patch -p1
-  perl -pi.bak -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; 
s,/usr/share/doc/packages/qt3/html,%p/share/doc/qt3/html,g' admin/*
+  perl -pi.bak -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; 
s,/usr/share/doc/packages/qt3/html,%p/share/doc/qt3/html,g; 
s,HAVE_GCC_VISIBILITY=1,HAVE_GCC_VISIBILITY=0,g; s,-fvisibility=hidden 
-fvisibility-inlines-hidden,,g;' admin/*
 <<
 
 NoSetCPPFLAGS: true

Index: kdelibs3-ssl.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/kdelibs3-ssl.info,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- kdelibs3-ssl.info   23 Mar 2005 19:51:18 -0000      1.22
+++ kdelibs3-ssl.info   24 Mar 2005 22:43:09 -0000      1.23
@@ -8,6 +8,7 @@
 Depends: %N-shlibs (>= %v-%r), aspell, default-icon-theme (>= 0.5-2), 
libart2-shlibs, libjpeg-shlibs, libpng3-shlibs (>= 1.2.5-4), pcre-shlibs, 
qt3-shlibs (>= 3.3.3-17), x11
 BuildDepends: arts-dev (>= 1.4.0-11), aspell-dev, audiofile, autoconf2.5, 
automake1.9, bzip2-dev, cctools (>= 446-1) | cctools-single-module, cups-dev, 
doxygen (>= 1.3.4-1), esound, fink (>= 0.20.2.1-1), flex-devel, freetype219, 
gettext-dev, gettext-bin, gettext-tools, glib2 (>= 2.2.1-4), glib2-dev (>= 
2.2.1-4), libart2, libiconv-dev, libidn (>= 0.5.1-1), libjpeg, libogg, libpng3 
(>= 1.2.5-4), libtiff, libvorbis0, libxml2, libxslt, libmad, openexr-dev, 
openslp-ssl-dev | openslp-dev, openssl097-dev, pcre, pcre-bin, qt3 (>= 
3.3.3-17), qt3-doc, x11-dev
 Conflicts: bundle-kde, kdelibs3, kdelibs3-shlibs, kdelibs3-dev, kdebase3, 
kdebase3-shlibs, kdebase3-dev
+BuildConflicts: unsermake
 Replaces: kdelibs3, kdelibs3-ssl-dev, kdelibs3-dev, keramik, 
kde-icons-crystal, conectiva-crystal, kdeartwork3, kdebase3, kdebase3-ssl, 
kbabel (<< 3.1.90-1), korganizer (<< 3.3.1-1), kdepim3-common (<< %v-1), 
kdepim3 (<< %v-1), kde-extra-themes (<< 3.4.0-1)
 GCC: 3.3
 

Index: kdeutils3-ssl.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/kdeutils3-ssl.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kdeutils3-ssl.info  23 Mar 2005 12:47:54 -0000      1.1
+++ kdeutils3-ssl.info  24 Mar 2005 22:43:09 -0000      1.2
@@ -8,6 +8,7 @@
 Depends: kgpg (>= %v-%r), ksim-ssl (>= %v-%r), ark (>= %v-%r), kcalc (>= 
%v-%r), kcharselect (>= %v-%r), kdessh (>= %v-%r), kdf (>= %v-%r), kedit (>= 
%v-%r), kfloppy (>= %v-%r), khexedit (>= %v-%r), klaptopdaemon (>= %v-%r), 
kjots (>= %v-%r), ktimer (>= %v-%r), kwalletmanager (>= %v-%r), kwikdisk (>= 
%v-%r), kregexpeditor (>= %v-%r), kdelibs3-ssl (>= %v-11) | kdelibs3 (>= 
%v-11), kdeutils3-base (>= %v-10)
 BuildDepends: arts-dev (>= 1.4.0-11), autoconf2.5, automake1.9, cctools (>= 
446-1) | cctools-single-module, fink (>= 0.20.2.1-1), freetype219, gnupg, 
kdebase3-ssl-dev (>= %v-11) | kdebase3-dev (>= %v-11), kdelibs3-ssl-dev (>= 
%v-11) | kdelibs3-dev (>= %v-11), libart2, libidn, libjpeg, libpng3 (>= 
1.2.5-4), net-snmp-ssl-dev, net-snmp-ssl, qt3 (>= 3.3.3-17), x11-dev
 Replaces: %N-dev (<< %v-%r), kdeutils3
+BuildConflicts: unsermake
 Conflicts: kdeutils3
 GCC: 3.3
 
@@ -25,7 +26,7 @@
 
 PatchScript: <<
   sed -e 's,@FINKPREFIX@,%p,g' %a/%n.patch | patch -p1 
-  perl -pi.bak -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; 
s,/usr/share/doc/packages/qt3/html,%p/share/doc/qt3/html,g' admin/*
+  perl -pi.bak -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; 
s,/usr/share/doc/packages/qt3/html,%p/share/doc/qt3/html,g; 
s,HAVE_GCC_VISIBILITY=1,HAVE_GCC_VISIBILITY=0,g; s,-fvisibility=hidden 
-fvisibility-inlines-hidden,,g;' admin/*
 <<
 
 NoSetCPPFLAGS: true

Index: kdebase3-ssl.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/kdebase3-ssl.info,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- kdebase3-ssl.info   24 Mar 2005 15:15:32 -0000      1.23
+++ kdebase3-ssl.info   24 Mar 2005 22:43:09 -0000      1.24
@@ -8,6 +8,7 @@
 Depends: %N-shlibs (>= %v-%r), kdelibs3-ssl (>= %v-11), lesstif-shlibs (>= 
0.93.18-6), libart2-shlibs, libjpeg-shlibs, libpng3-shlibs (>= 1.2.5-4), 
qt3-shlibs (>= 3.3.3-17), remap-bad-apple-keys, x11, xfontpath
 BuildDepends: arts-dev (>= 1.4.0-11), audiofile, autoconf2.5, automake1.9, 
cctools (>= 446-1) | cctools-single-module, cups-dev, esound, fink (>= 
0.20.2.1-1), freetype219, kdelibs3-ssl-dev (>= %v-11), gettext-dev, 
gettext-bin, gettext-tools, glib2 (>= 2.2.1-4), glib2-dev (>= 2.2.1-4), lesstif 
(>= 0.93.18-6), libart2, libiconv-dev, libidn, libjpeg, libogg, libpng3 (>= 
1.2.5-4), libusb, libvorbis0, libmad, openssl097-dev, pcre, qt3 (>= 3.3.3-17), 
qt3-doc, x11-dev, xfontpath
 Conflicts: bundle-kde, kdelibs3, kdelibs3-dev, kdebase3, kdebase3-dev, kio-fish
+BuildConflicts: unsermake
 Replaces: kdebase3-ssl, kdebase3-ssl-dev, kdebase3-ssl-shlibs, kio-fish, lisa, 
kdenetwork3 (<< 3.2.0-1), kdepasswd (<< 3.3.1-1), kde-extra-themes (<< 3.4.0-1)
 Provides: kate, kdm, konqueror, konsole, kwrite
 GCC: 3.3

Index: kdepim3.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/kdepim3.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kdepim3.info        23 Mar 2005 12:47:54 -0000      1.1
+++ kdepim3.info        24 Mar 2005 22:43:09 -0000      1.2
@@ -7,6 +7,7 @@
 
 Depends: %N-ioslaves (>= %v-%r), %N-kfile-plugins (>= %v-%r), %N-wizards (>= 
%v-%r), akregator (>= %v-%r), kleopatra (>= %v-%r), kaddressbook (>= %v-%r), 
kalarm (>= %v-%r), kandy (>= %v-%r), karm (>= %v-%r), kitchensync (>= %v-%r), 
kmail (>= %v-%r), knode (>= %v-%r), knotes (>= %v-%r), konsolekalendar (>= 
%v-%r), kontact (>= %v-%r), korganizer (>= %v-%r), korn (>= %v-%r), kpilot (>= 
%v-%r), ksync (>= %v-%r), ktnef (>= %v-%r)
 BuildDepends: arts-dev (>= 1.4.0-11), audiofile, autoconf2.5, automake1.9, 
cctools (>= 446-1) | cctools-single-module, fink (>= 0.20.2.1-1), freetype219, 
gtk+ (>= 1.2.10-12), glib (>= 1.2.10-8), gnokii2-dev, gpgme11 (>= 1.0.2-1), 
kdelibs3-ssl-dev (>= %v-11) | kdelibs3-dev (>= %v-11), libart2, libiconv-dev, 
libidn, libjpeg, libmal10, libpng3 (>= 1.2.5-4), libncurses5, pcre, pilot-link9 
(>= 0.11.7-12), readline, qt3 (>= 3.3.3-17), x11-dev
+BuildConflicts: unsermake
 Replaces: %N-dev (<< %v-1)
 GCC: 3.3
 
@@ -24,7 +25,7 @@
 
 PatchScript: <<
   sed -e 's,@FINKPREFIX@,%p,g' %a/%n.patch | patch -p1 
-  perl -pi.bak -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; 
s,/usr/share/doc/packages/qt3/html,%p/share/doc/qt3/html,g' admin/*
+  perl -pi.bak -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; 
s,/usr/share/doc/packages/qt3/html,%p/share/doc/qt3/html,g; 
s,HAVE_GCC_VISIBILITY=1,HAVE_GCC_VISIBILITY=0,g; s,-fvisibility=hidden 
-fvisibility-inlines-hidden,,g;' admin/*
   perl -pi.bak -e 's,#include <malloc.h>,,g' libkcal/versit/vcc*
 <<
 



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to