Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv27510/main/finkinfo/x11
Modified Files:
Tag: pangocairo-branch
pcb.info xfontpath.info
Log Message:
fixes for some conflicts
Index: xfontpath.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/xfontpath.info,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- xfontpath.info 7 Oct 2007 20:32:52 -0000 1.3.2.1
+++ xfontpath.info 5 Mar 2008 16:11:44 -0000 1.3.2.2
@@ -1,8 +1,8 @@
Package: xfontpath
Version: 0.4
-Revision: 14
-BuildDepends: x11-dev, fink (>= 0.24.12-1)
-Depends: x11
+Revision: 16
+BuildDepends: x11-dev
+Depends: x11, xinitrc
Source: http://hp.vector.co.jp/authors/VA008857/macosx/fink/%n-%v.tar.gz
Source-MD5: f0d7a4f376db063a29ff7368a79f0c19
PatchFile: %n.patch
@@ -17,8 +17,18 @@
<<
Description: X font path manager for fink
License: GPL
-Maintainer: None <[EMAIL PROTECTED]>
+Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
DescPackaging: <<
Originally packaged by Masanori Sekino.
+
+ Since xfontpath (>= 0.4-15), %p/etc/profile.d/xfontpath.* have been moved
+ to %p/etc/xinitrc.d/20xfontpath.sh. This change is needed for Leopard.
+<<
+Descusage: <<
+ If you want to keep maintaining the font path manually, change your
~/.xinitrc
+ like this:
+
+ xinitrc_xfontpath_enable=NO
+ . %p/bin/xinitrc.sh
<<
Homepage: http://hp.vector.co.jp/authors/VA008857/macosx/fink/
Index: pcb.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/pcb.info,v
retrieving revision 1.6.2.18
retrieving revision 1.6.2.19
diff -u -d -r1.6.2.18 -r1.6.2.19
--- pcb.info 20 Feb 2008 15:39:44 -0000 1.6.2.18
+++ pcb.info 5 Mar 2008 16:11:44 -0000 1.6.2.19
@@ -1,10 +1,45 @@
Package: pcb
# Remember to change snapshot version below as well:
Version: 1.99.20080202
-Revision: 11
+Revision: 13
-Depends: libstroke-shlibs, app-defaults, tcltk, gtk+2-shlibs (>= 2.12.0-1),
glib2-shlibs (>= 2.14.0-1), x11-shlibs, gd2-shlibs, libjpeg-shlibs,
libpng3-shlibs, libgettext3-shlibs, desktop-file-utils, shared-mime-info
-BuildDepends: glitz, expat1, cairo (>= 1.2-1), fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.5-1), xft2-dev, libstroke, gawk, gtk+2-dev (>= 2.12.0-1),
x11-dev, atk1 (>= 1.20.0-1), glib2-dev (>= 2.14.0-1), pango1-xft2-ft219-dev (>=
1.18.2-1), gd2 (>= 2.0.33-3), libjpeg, libpng3, netpbm-bin, libgettext3-dev,
libiconv-dev
+Depends: <<
+ app-defaults,
+ desktop-file-utils,
+ gd2-shlibs,
+ glib2-shlibs (>= 2.14.0-1),
+ gtk+2-shlibs (>= 2.12.0-1),
+ libgettext3-shlibs,
+ libjpeg-shlibs,
+ libpng3-shlibs,
+ libstroke-shlibs,
+ shared-mime-info,
+ tcltk,
+ x11-shlibs
+<<
+
+BuildDepends: <<
+ atk1 (>= 1.20.0-1),
+ cairo (>= 1.2-1),
+ expat1,
+ fontconfig2-dev (>= 2.4.1-1),
+ freetype219 (>= 2.3.5-1),
+ gawk,
+ gd2 (>= 2.0.33-3),
+ glib2-dev (>= 2.14.0-1),
+ glitz,
+ gtk+2-dev (>= 2.12.0-1),
+ intltool,
+ libgettext3-dev,
+ libiconv-dev,
+ libjpeg,
+ libpng3,
+ libstroke,
+ netpbm-bin,
+ pango1-xft2-ft219-dev (>= 1.18.2-1),
+ x11-dev,
+ xft2-dev
+<<
### For documentation:
# Bdep: tetex-base, texinfo
@@ -67,7 +102,7 @@
Stroke support is included, but largely untested on OS X. You will probably
need a 3-button mouse for this.
-$LastChangedRevision: 483 $ in my local SVN repository.
+$LastChangedRevision: 496 $ in my local SVN repository.
<<
License: GPL
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
