Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv3951/main/finkinfo/text

Modified Files:
        amyedit.info enchant.info gcin.info gcin.patch 
        lilypond-devel.info lilypond.info pybliographer.info 
        sagasu.info tetex-nox.info tetex.info 
Added Files:
        amyedit.patch 
Log Message:
Merge pangocairo back into trunk


Index: lilypond-devel.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/lilypond-devel.info,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- lilypond-devel.info 6 May 2008 17:35:26 -0000       1.29
+++ lilypond-devel.info 15 Jul 2008 01:41:22 -0000      1.30
@@ -1,19 +1,19 @@
 package: lilypond-devel
 Version: 2.11.45
-Revision: 1003
+Revision: 1004
 Maintainer: Matthias Neeracher <[EMAIL PROTECTED]>
 GCC: 4.0
 BuildDepends: <<
 guile18, guile18-dev, libkpathsea4,
 libgettext3-dev, gettext-bin, gettext-tools, texinfo (>= 4.8-2), 
 mftrace (>= 1.2.14-1002), freetype219 (>= 2.3.5-1), 
-pango1-xft2-ft219-dev (>= 1.18.2-1), glib2-dev (>= 2.12.0-1), bison (>= 
2.0-1), 
+pango1-xft2-ft219-dev (>= 1.18.4-4), glib2-dev (>= 2.14.0-1), bison (>= 
2.0-1), 
 fontconfig2-dev (>= 2.2.3-10), expat1, pkgconfig (>= 0.21-1), gmp
 <<
 BuildConflicts: ccache-default
 Depends: <<
 python25, guile18 (>= 1.8.2-1), ghostscript (>= 8.15-1), 
-freetype219-shlibs (>= 2.3.5-1), pango1-xft2-ft219 (>= 1.18.2-1), 
+freetype219-shlibs (>= 2.3.5-1), pango1-xft2-ft219 (>= 1.18.4-4), 
 fc-ghostscript-fonts, fontconfig2-shlibs, fondu, libkpathsea4-shlibs,
 tetex3-base, expat1-shlibs
 <<

Index: gcin.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/gcin.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gcin.info   6 Jun 2007 02:28:22 -0000       1.2
+++ gcin.info   15 Jul 2008 01:41:22 -0000      1.3
@@ -1,20 +1,35 @@
 Package: gcin
 Version: 1.3.4
-Revision: 2
+Revision: 4
 Patch: %n.patch
 Depends: <<
-  x11, gtk+2, gtk+2-shlibs, glib2-shlibs, libiconv, gettext-bin
+  x11, gtk+2 (>= 2.12.0-1), glib2-shlibs (>= 2.14.0-1), libiconv, gettext-bin
 <<
 BuildDepends: <<
-  gtk+2-dev, glib2-dev, atk1, pkgconfig, x11-dev, libiconv-dev,
-  intltool, gettext-bin, gettext-tools, pango1-xft2-dev, libgettext3-dev
+  cairo (>= 1.6-1), expat1, fontconfig2-dev (>= 2.4.1-1), freetype219 (>= 
2.3.5-1), glitz, libjpeg, libpng3, libtiff, xft2-dev,
+  gtk+2-dev (>= 2.12.0-1), glib2-dev (>= 2.14.0-1), atk1 (>= 1.20.0-1), 
pkgconfig (>= 0.21-1), x11-dev, libiconv-dev,
+  intltool (>= 0.36.0-1), gettext-bin, gettext-tools, pango1-xft2-ft219-dev 
(>= 1.18.4-4), pixman (>= 0.10.0-1), libgettext3-dev
 <<
-Recommends: mlterm, rxvt-ml
+Recommends: mlterm, rxvt (>= 2.7.10-2)
 Source: http://cle.linux.org.tw/gcin/download/gcin-%v.tar.bz2
 Source-MD5: 20ae604f49fd57c38b9395941ef66cc2
 
-ConfigureParams:  --libexecdir=%p/lib/%n 
-InstallScript: make install DESTDIR=%d
+NoSetMAKEFLAGS: true
+SetMAKEFLAGS: -j1
+SetCPPFLAGS: -DX_LOCALE -I%p/lib/pango-ft219/include/pango-1.0 
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2 
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include
+NoSetLDFLAGS: true
+SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib 
-L%p/lib/fontconfig2/lib
+SetLIBS: -L%p/lib
+SetCFLAGS: -Os
+SetCXXFLAGS: -Os
+ConfigureParams:  --libexecdir=%p/lib/%n
+CompileScript: <<
+#!/bin/sh -ev
+       export 
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
+       ./configure %c
+       make
+<<
+InstallScript: make -j1 install DESTDIR=%d
 
 PostInstScript: <<
 if [ configure = "$1" ]; then
@@ -37,6 +52,10 @@
  Input method table format of gcin is almost as same as those of xcin and
  scim.
 <<
+DescPackaging: <<
+ Default input method if not specified is zh_TW.Big5, which would be a
+ surprise to 99% of gnome users out there; patched to be en_US.UTF-8. ;)
+<<
 Homepage: http://www.csie.nctu.edu.tw/~cp76/gcin/
 License: GPL
 Maintainer: Andrew Lee <[EMAIL PROTECTED]>

Index: pybliographer.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/pybliographer.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pybliographer.info  24 Jun 2006 21:26:56 -0000      1.4
+++ pybliographer.info  15 Jul 2008 01:41:22 -0000      1.5
@@ -1,9 +1,9 @@
 Package: pybliographer
 Version: 1.2.8
-Revision: 1
+Revision: 3
 Description: Tool for managing bibliographic databases
 License: GPL/GFDL
-Depends: python-bibtex, python24, scrollkeeper, gnome-python2-py24
+Depends: python-bibtex, python24, rarian-compat, gnome-python2-py24 (>= 
2.19.2-1)
 BuildDepends: gettext-tools
 Source: mirror:sourceforge:%n/%n-%v.tar.gz
 Source-MD5: 3a4eaa405ce26347cbc42f6fb7854303
@@ -33,4 +33,4 @@
 mechanism, direct insertion of references into LyX and Kile, direct
 queries on Medline, and more. It currently supports the following file
 formats: BibTeX, ISI, Medline, Ovid, Refer.
-<<
\ No newline at end of file
+<<

Index: tetex.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/tetex.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- tetex.info  1 May 2008 14:08:44 -0000       1.8
+++ tetex.info  15 Jul 2008 01:41:22 -0000      1.9
@@ -2,7 +2,7 @@
 Package: tetex%type_pkg[-nox]
 Type: -nox (boolean)
 Version: 3.0
-Revision: 1005
+Revision: 1006
 GCC: 4.0
 Description: Complete distribution of the TeX typesetting system
 Depends: %N-base (= %v-%r), texinfo, debianutils, texi2html
@@ -10,7 +10,10 @@
  libkpathsea4 (>= 3.5.6-1), t1lib5-nox, libpng3 (>= 1:1.2.8-1), libwww, 
libncurses5 (>= 5.4-20041023-1006), fink (>= 0.24.12),
  libjpeg, libiconv-dev,
  (%type_raw[-nox] = .)  t1lib5-x11, 
- (%type_raw[-nox] = .)  gd2 (>= 2.0.33-1), 
+ (%type_raw[-nox] = .)  gd2 (>= 2.0.35-2), 
+ (%type_raw[-nox] = .) expat1,
+ (%type_raw[-nox] = .) fontconfig2-dev,
+ (%type_raw[-nox] = .) freetype219,
  (%type_raw[-nox] = .) x11, 
  (%type_raw[-nox] = .) openmotif3
 <<
@@ -131,7 +134,7 @@
   (%type_raw[-nox] = .) t1lib5-x11-shlibs,
   (%type_raw[-nox] = -nox) ghostscript-nox, 
   (%type_raw[-nox] = .) ghostscript, 
-  (%type_raw[-nox] = .) gd2-shlibs (>= 2.0.33-1), 
+  (%type_raw[-nox] = .) gd2-shlibs (>= 2.0.35-2), 
   (%type_raw[-nox] = .) x11, 
   (%type_raw[-nox] = .) x11-shlibs,
   (%type_raw[-nox] = .) openmotif3-shlibs

Index: sagasu.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/sagasu.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- sagasu.info 20 Jul 2006 02:49:27 -0000      1.8
+++ sagasu.info 15 Jul 2008 01:41:22 -0000      1.9
@@ -1,14 +1,14 @@
 Package: sagasu 
 Version: 2.0.6
-Revision: 1003
+Revision: 1005
 Maintainer: Ben Hines <[EMAIL PROTECTED]>
-BuildDepends: libiconv-dev, libgettext3-dev, pkgconfig, x11-dev, popt (>= 
1.6.4-1), libgnomeui2-dev (>= 2.6.1.1-10), atk1 (>= 1.6.0-1), gconf2-dev (>= 
2.6.3-11), glib2-dev (>= 2.6.6-1111), dbus-dev (>= 0.60-1), libhowl-dev, 
gnome-vfs2-ssl-dev (>= 2.4.0-1) | gnome-vfs2-dev (>= 2.4.0-1), gtk+2-dev (>= 
2.4.9-9), libart2 (>= 2.3.16-3), libbonobo2-dev (>= 2.6.0-1), libbonoboui2-dev 
(>= 2.6.0-1), libgnome2-dev (>= 2.6.1.2-21), libgnomecanvas2-dev (>= 
2.6.1.1-8), libxml2 (>= 2.6.1-1), orbit2-dev (>= 2.4.0-1), pango1-xft2-dev (>= 
1.6.0-2), gnome-keyring-dev (>= 0.4.3-4), gettext-tools
-Depends: x11-shlibs, libgnomeui2-shlibs (>= 2.6.1.1-10), libbonoboui2-shlibs 
(>= 2.6.0-1), libxml2-shlibs (>= 2.6.1-1), libgnomecanvas2-shlibs (>= 
2.6.1.1-8), libgnome2-shlibs (>= 2.6.1.2-21), popt-shlibs (>= 1.6.4-1), 
libart2-shlibs (>= 2.3.16-3), pango1-xft2-shlibs (>= 1.6.0-2), gtk+2-shlibs (>= 
2.4.9-9), gtk+2 (>= 2.4.9-9), atk1-shlibs (>= 1.6.0-1), glib2-shlibs (>= 
2.6.6-1111), libbonobo2-shlibs (>= 2.6.0-1), gconf2-shlibs (>= 2.6.3-11), 
gnome-vfs2-ssl-shlibs (>= 2.6.1.1-1) | gnome-vfs2-shlibs (>= 2.6.1.1-1), 
libgettext3-shlibs, libiconv (>= 1.9.1-1), gnome-keyring-shlibs (>= 0.4.3-4)
+BuildDepends: glitz, expat1, libpng3, cairo (>= 1.6-1), fontconfig2-dev (>= 
2.4.1-1), freetype219 (>= 2.3.5-1), xft2-dev, libiconv-dev, libgettext3-dev, 
pkgconfig (>= 0.21-1), x11-dev, popt (>= 1.6.4-1), libgnomeui2-dev (>= 
2.20.0-1), atk1 (>= 1.20.0-1), gconf2-dev (>= 2.20.0-1), glib2-dev (>= 
2.14.0-1), dbus-dev (>= 1.0-1),  gnome-vfs2-unified-dev (>= 1:2.20.0-1), 
gtk+2-dev (>= 2.12.0-1), libart2 (>= 2.3.16-3), libbonobo2-dev (>= 2.20.0-1), 
libbonoboui2-dev (>= 2.20.0-1), libgnome2-dev (>= 2.20.0-1), 
libgnomecanvas2-dev (>= 2.20.0-1), libxml2 (>= 2.6.30-1), orbit2-dev (>= 
2.14.9-1), pango1-xft2-ft219-dev (>= 1.18.4-4), pixman (>= 0.10.0-1), 
gnome-keyring-dev (>= 0.8.1-1), gettext-tools, audiofile, esound, gail18-dev
+Depends: x11-shlibs, libgnomeui2-shlibs (>= 2.20.0-1), libbonoboui2-shlibs (>= 
2.20.0-1), libxml2-shlibs (>= 2.6.30-1), libgnomecanvas2-shlibs (>= 2.20.0-1), 
libgnome2-shlibs (>= 2.20.0-1), popt-shlibs (>= 1.6.4-1), libart2-shlibs (>= 
2.3.16-3), pango1-xft2-ft219-shlibs (>= 1.18.4-4), gtk+2-shlibs (>= 2.12.0-1), 
gtk+2 (>= 2.12.0-1), atk1-shlibs (>= 1.20.0-1), glib2-shlibs (>= 2.14.0-1), 
libbonobo2-shlibs (>= 2.20.0-1), gconf2-shlibs (>= 2.20.0-1), 
gnome-vfs2-unified-shlibs (>= 1:2.20.0-1), libgettext3-shlibs, libiconv (>= 
1.9.1-1), gnome-keyring-shlibs (>= 0.8.1-1)
 GCC: 4.0
 Source: http://www3.sympatico.ca/sarrazip/dev/%n-%v.tar.gz
 Source-MD5: aa76b9ecaf9be537d5485aad39c40437
 PatchScript: perl -ni.bak -e 'print unless /G(NOME|TK)_DISABLE_DEPRECATED/' 
src/Makefile.in
-ConfigureParams: --mandir=%p/share/man
+ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking 
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
 Installscript: make install-strip datadir=%p/share DESTDIR=%d
 DocFiles: AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO
 Description: GNOME tool to find strings in files

--- NEW FILE: amyedit.patch ---
diff -uNr amyedit-1.0/src/Makefile.in amyedit-1.0-new/src/Makefile.in
--- amyedit-1.0/src/Makefile.in 2006-03-14 16:18:54.000000000 -0500
+++ amyedit-1.0-new/src/Makefile.in     2007-09-18 22:27:34.000000000 -0400
@@ -59,7 +59,7 @@
        TextListViewListBox.$(OBJEXT) Utils.$(OBJEXT) main.$(OBJEXT) \
        sourcebuffer.$(OBJEXT) sourcelanguage.$(OBJEXT) \
        sourcelanguagesmanager.$(OBJEXT) sourceview.$(OBJEXT) \
-       init.$(OBJEXT) keyfile.$(OBJEXT)
+       init.$(OBJEXT)
 am__objects_2 =
 am_amyedit_OBJECTS = $(am__objects_1) $(am__objects_2) \
        $(am__objects_2)
@@ -256,8 +256,7 @@
                gtksourceviewmm/sourcelanguage.cpp           \
                gtksourceviewmm/sourcelanguagesmanager.cpp   \
                gtksourceviewmm/sourceview.cpp               \
-               gtksourceviewmm/init.cc                      \
-               gtkmm_extra/keyfile.cc
+               gtksourceviewmm/init.cc
 
 headers = \
                AboutDialog.hh               \
@@ -280,15 +279,13 @@
                gtksourceviewmm/sourcelanguage.h            \
                gtksourceviewmm/sourcelanguagesmanager.h    \
                gtksourceviewmm/sourceview.h                \
-               gtksourceviewmm/init.hh                     \
-               gtkmm_extra/keyfile.h
+               gtksourceviewmm/init.hh
 
 privateheaders = \
                gtksourceviewmm/private/sourcebuffer_p.h            \
                gtksourceviewmm/private/sourcelanguage_p.h          \
                gtksourceviewmm/private/sourcelanguagesmanager_p.h  \
                gtksourceviewmm/private/sourceview_p.h              \
-               gtkmm_extra/private/keyfile_p.h                     \
                Utils_p.hh
 
 @[EMAIL PROTECTED] = 
@@ -399,7 +396,6 @@
 @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
 @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
 @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
[EMAIL PROTECTED]@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
 @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
 @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
 @AMDEP_TRUE@@am__include@ @[EMAIL PROTECTED]/$(DEPDIR)/[EMAIL PROTECTED]@
@@ -497,20 +493,6 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o init.obj `if test 
-f 'gtksourceviewmm/init.cc'; then $(CYGPATH_W) 'gtksourceviewmm/init.cc'; else 
$(CYGPATH_W) '$(srcdir)/gtksourceviewmm/init.cc'; fi`
 
-keyfile.o: gtkmm_extra/keyfile.cc
[EMAIL PROTECTED]@      if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT keyfile.o -MD -MP -MF 
"$(DEPDIR)/keyfile.Tpo" -c -o keyfile.o `test -f 'gtkmm_extra/keyfile.cc' || 
echo '$(srcdir)/'`gtkmm_extra/keyfile.cc; \
[EMAIL PROTECTED]@      then mv -f "$(DEPDIR)/keyfile.Tpo" 
"$(DEPDIR)/keyfile.Po"; else rm -f "$(DEPDIR)/keyfile.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@        source='gtkmm_extra/keyfile.cc' 
object='keyfile.o' libtool=no @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@        DEPDIR=$(DEPDIR) $(CXXDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@      $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o keyfile.o `test -f 
'gtkmm_extra/keyfile.cc' || echo '$(srcdir)/'`gtkmm_extra/keyfile.cc
-
-keyfile.obj: gtkmm_extra/keyfile.cc
[EMAIL PROTECTED]@      if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT keyfile.obj -MD -MP 
-MF "$(DEPDIR)/keyfile.Tpo" -c -o keyfile.obj `if test -f 
'gtkmm_extra/keyfile.cc'; then $(CYGPATH_W) 'gtkmm_extra/keyfile.cc'; else 
$(CYGPATH_W) '$(srcdir)/gtkmm_extra/keyfile.cc'; fi`; \
[EMAIL PROTECTED]@      then mv -f "$(DEPDIR)/keyfile.Tpo" 
"$(DEPDIR)/keyfile.Po"; else rm -f "$(DEPDIR)/keyfile.Tpo"; exit 1; fi
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@        source='gtkmm_extra/keyfile.cc' 
object='keyfile.obj' libtool=no @AMDEPBACKSLASH@
[EMAIL PROTECTED]@@am__fastdepCXX_FALSE@        DEPDIR=$(DEPDIR) $(CXXDEPMODE) 
$(depcomp) @AMDEPBACKSLASH@
[EMAIL PROTECTED]@      $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o keyfile.obj `if 
test -f 'gtkmm_extra/keyfile.cc'; then $(CYGPATH_W) 'gtkmm_extra/keyfile.cc'; 
else $(CYGPATH_W) '$(srcdir)/gtkmm_extra/keyfile.cc'; fi`
-
 .cpp.o:
 @am__fastdepCXX_TRUE@  if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" 
-c -o $@ $<; \
 @am__fastdepCXX_TRUE@  then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else 
rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
diff -uNr amyedit-1.0/src/main.cc amyedit-1.0-new/src/main.cc
--- amyedit-1.0/src/main.cc     2006-03-13 18:08:32.000000000 -0500
+++ amyedit-1.0-new/src/main.cc 2007-09-18 22:24:35.000000000 -0400
@@ -65,7 +65,6 @@
        
        Gtk::Main m(&argc, &argv);
        Gtk::SourceViewmm_init();
-       Glib::keyfile_init();
 
        /* TODO This should probably be removed and created on demand */
        

Index: lilypond.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/lilypond.info,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- lilypond.info       25 May 2008 18:56:33 -0000      1.24
+++ lilypond.info       15 Jul 2008 01:41:22 -0000      1.25
@@ -1,21 +1,21 @@
 Package: lilypond
 Version: 2.10.33
-Revision: 1004
+Revision: 1005
 Maintainer: Matthias Neeracher <[EMAIL PROTECTED]>
 GCC: 4.0
 BuildDepends: <<
-guile16-dev (>= 1.6.7-1010), libkpathsea4 | system-tetex, 
+guile16 (>= 1.6.7-1010), guile16-dev (>= 1.6.7-1010), libkpathsea4 | 
system-tetex, 
 libgettext3-dev, gettext-bin, gettext-tools, texinfo (>= 4.8-2), 
-mftrace (>= 1.2.4-1002), freetype219 (>= 2.2.1-4), 
-pango1-xft2-ft219-dev (>= 1.8.1-5), glib2-dev, bison (>= 2.0-1), 
+mftrace (>= 1.2.4-1002), freetype219 (>= 2.3.5-1), 
+pango1-xft2-ft219-dev (>= 1.18.4-4), glib2-dev (>= 2.14.0-1), bison (>= 
2.0-1), 
 fontconfig2-dev (>= 2.2.3-10), expat1, pkgconfig
 <<
 BuildConflicts: ccache-default
 Depends: <<
 python25, guile16 (>= 1.6.7-1010), ghostscript (>= 8.15-1), 
-freetype219-shlibs (>= 2.1.9-1), pango1-xft2-ft219 (>= 1.8.1-5), 
+freetype219-shlibs (>= 2.3.5-1), pango1-xft2-ft219 (>= 1.18.4-4), 
 fc-ghostscript-fonts, fontconfig2-shlibs, fondu, libkpathsea4-shlibs,
-tetex3-base, expat1-shlibs, scrollkeeper
+tetex3-base, expat1-shlibs, rarian-compat
 <<
 Conflicts: lilypond, lilypond-unstable, lilypond-devel, lilypond-devel-tex
 Replaces: lilypond-devel, lilypond-unstable

Index: enchant.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/enchant.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- enchant.info        21 Jul 2006 19:42:24 -0000      1.3
+++ enchant.info        15 Jul 2008 01:41:22 -0000      1.4
@@ -1,38 +1,54 @@
 Package: enchant
-Version: 1.2.6
-Revision: 1002
+Version: 1.3.0
+Revision: 1
 
 Source: http://www.abisource.com/downloads/%n/%v/%n-%v.tar.gz
-Source-MD5: 617cfe8910245cc0c4d363b54dd6d207
+Source-MD5: f7edafae875616b83e7a17a7e5c2d585
 
-BuildDepends: pkgconfig, glib2-dev, libgettext3-dev, gettext-tools, 
libiconv-dev, aspell-dev (>= 0.50.5-1002), aspell (>= 0.50.5-1002)
-Depends: glib2-shlibs, libgettext3-shlibs, libiconv, ispell, aspell-shlibs (>= 
0.50.5-1002), %N1-shlibs (>= %v-%r)
+BuildDepends: <<
+       aspell (>= 0.60.5-1001),
+       aspell-dev (>= 0.60.5-1001),
+       gettext-tools,
+       glib2-dev (>= 2.14.0-1),
+       libgettext3-dev,
+       libiconv-dev,
+       pkgconfig (>= 0.21-1)
+<<
+Depends: <<
+       %N1-shlibs (>= %v-%r),
+       aspell-shlibs (>= 0.60.5-1001),
+       glib2-shlibs (>= 2.14.0-1),
+       ispell,
+       libgettext3-shlibs,
+       libiconv
+<<
 GCC: 4.0
 
-PatchScript: <<
-  perl -pi -e 's/(-avoid-version)/-module \1/' src/*/Makefile.in
-<<
 ConfigureParams: --enable-ispell --with-ispell-dir=%p/lib --disable-myspell 
--enable-aspell --with-aspell-dir=%p --disable-uspell --disable-hspell 
--disable-dependency-tracking --mandir=%p/share/man
 InstallScript: <<
-  MKDIRPROG="mkdir -p" make install DESTDIR=%d
+       MKDIRPROG="mkdir -p" make install DESTDIR=%d
 <<  
 DocFiles: AUTHORS BUGS COPYING.LIB ChangeLog HACKING MAINTAINERS NEWS README 
TODO
 
 SplitOff: <<
-  Package: %N1-shlibs
-  Depends: glib2-shlibs, libgettext3-shlibs, libiconv
-  Files: lib/libenchant.*.dylib
-  Shlibs: %p/lib/libenchant.1.dylib 4.0.0 %n (>= 1.2.6-1)
-  DocFiles: AUTHORS BUGS COPYING.LIB ChangeLog HACKING MAINTAINERS NEWS README 
TODO
-  Suggests: %N
+       Package: %N1-shlibs
+       Depends: <<
+               glib2-shlibs (>= 2.14.0-1),
+               libgettext3-shlibs,
+               libiconv
+       <<
+       Files: lib/libenchant.*.dylib
+       Shlibs: %p/lib/libenchant.1.dylib 5.0.0 %n (>= 1.3.0-1)
+       DocFiles: AUTHORS BUGS COPYING.LIB ChangeLog HACKING MAINTAINERS NEWS 
README TODO
+       Suggests: %N
 <<
 
 SplitOff2: <<
-  Package: %N1-dev
-  Depends: %N1-shlibs (= %v-%r)
-  BuildDependsOnly: true
-  Files: include lib/libenchant* lib/pkgconfig
-  DocFiles: AUTHORS BUGS COPYING.LIB ChangeLog HACKING MAINTAINERS NEWS README 
TODO
+       Package: %N1-dev
+       Depends: %N1-shlibs (= %v-%r)
+       BuildDependsOnly: true
+       Files: include lib/libenchant* lib/pkgconfig
+       DocFiles: AUTHORS BUGS COPYING.LIB ChangeLog HACKING MAINTAINERS NEWS 
README TODO
 <<
 
 Description: Generic spell-checking dictionary
@@ -54,10 +70,6 @@
 library. Everything should "just work" for any and every definition of
 "just working."
 <<
-DescPort: <<
-  Fix compiling of modules to have correct extension for gmodule.
-  See: http://bugzilla.abisource.com/show_bug.cgi?id=10398
-<<
 License: LGPL
 Maintainer: Daniel Macks <[EMAIL PROTECTED]>
 Homepage: http://www.abisource.com/projects/enchant

Index: gcin.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/gcin.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gcin.patch  5 Jun 2007 11:24:02 -0000       1.1
+++ gcin.patch  15 Jul 2008 01:41:22 -0000      1.2
@@ -138,3 +138,15 @@
  #endif
    pango_font_description_set_size(desc, 9 * PANGO_SCALE);
  
+diff -uNr gcin-1.3.4/gcin.c gcin-1.3.4-new/gcin.c
+--- gcin-1.3.4/gcin.c  2007-02-26 20:46:43.000000000 -0500
++++ gcin-1.3.4-new/gcin.c      2007-09-27 11:20:25.000000000 -0400
+@@ -436,7 +436,7 @@
+     lc_ctype = lc_all;
+ 
+   if (!lc_ctype)
+-    lc_ctype = "zh_TW.Big5";
++    lc_ctype = "en_US.UTF-8";
+ 
+   char *lc;
+ 

Index: amyedit.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/amyedit.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- amyedit.info        20 Jun 2007 05:01:57 -0000      1.5
+++ amyedit.info        15 Jul 2008 01:41:22 -0000      1.6
@@ -1,12 +1,58 @@
 Package: amyedit
 Version: 1.0
-Revision: 1002
+Revision: 1004
 GCC: 4.0
 Source: mirror:sourceforge:%n/%n-%v.tar.bz2
 Source-MD5: 662f5d6cc37c5838e2dc5a4a6abb812d
-Depends: gtkmm2.4-shlibs (>= 2.6.4-1001), glibmm2.4-shlibs (>= 2.6.1-1001),   
libsigc++2-shlibs (>= 2.0.11-1003), gtksourceview-shlibs (>= 1.4.1-1), 
gtk+2-shlibs (>=2.6.10-1), libgnomeprint2.2-shlibs (>= 2.12.1-1), 
libgnomeprint2.2 (>= 2.12.1-1), x11-shlibs, atk1-shlibs (>= 1.11.4-1), 
pango1-xft2-shlibs (>= 1.10.1-1), libart2-shlibs (>= 2.3.17-1), libxml2-shlibs 
(>= 2.6.22-1), glib2-shlibs (>= 2.6.6-1111), libgettext3-shlibs (>= 0.14.5-1), 
libiconv (>= 1.10-6), aspell-shlibs (>= 0.50.5-1002), aspell (>= 0.50.5-1002)
-BuildDepends: pkgconfig (>= 0.9.0), gtkmm2.4-dev (>= 2.6.4-1001), 
glibmm2.4-dev (>= 2.6.1-1001), libsigc++2 (>= 2.0.11-1003), gtksourceview-dev 
(>= 1.4.1-1), gtk+2-dev (>=2.6.10-1), libgnomeprint2.2-dev (>= 2.12.1-1), 
x11-dev, atk1 (>= 1.11.4-1), pango1-xft2-dev (>= 1.10.1-1), libart2 (>= 
2.3.17-1), libxml2 (>= 2.6.22-1),  glib2-dev (>= 2.6.6-1111), libgettext3-dev 
(>= 0.14.5-1), gettext-tools (>= 0.14.5-1), gettext-bin (>= 0.14.5-1), 
libiconv-dev (>= 1.10-6), aspell-shlibs (>= 0.50.5-1002), aspell-dev (>= 
0.50.5-1002), intltool
-ConfigureParams: --disable-dependency-tracking
+Depends: <<
+       aspell (>= 0.50.5-1002),
+       gtkmm2.4-shlibs (>= 2.12.0-1),
+       gtk+2-shlibs (>= 2.12.0-1),
+       gtksourceview-shlibs (>= 1.8.5-1),
+       libart2-shlibs (>= 2.3.17-1),
+       libgnomeprint2.2-shlibs (>= 2.18.2-1),
+       libsigc++2-shlibs (>= 2.1.0-1),
+       libxml2-shlibs (>= 2.6.30-1),
+       x11-shlibs
+<<
+BuildDepends: <<
+       aspell-dev (>= 0.50.5-1002),
+       atk1 (>= 1.20.0-1),
+       cairo (>= 1.6-1),
+       cairomm1,
+       expat1,
+       fink (>= 0.24.12-1),
+       fontconfig2-dev (>= 2.4.1-1),
+       freetype219 (>= 2.3.5-1),
+       gettext-bin (>= 0.14.5-1),
+       gettext-tools (>= 0.14.5-1),
+       glib2-dev (>= 2.14.0-1),
+       glitz,
+       glibmm2.4-dev (>= 2.13.9-1),
+       gtk+2-dev (>= 2.12.0-1),
+       gtkmm2.4-dev (>= 2.12.0-1),
+       gtksourceview-dev (>= 1.8.5-1),
+       intltool (>= 0.36.0-1),
+       libart2 (>= 2.3.17-1),
+       libgettext3-dev (>= 0.14.5-1),
+       libgnomeprint2.2-dev (>= 2.18.2-1),
+       libiconv-dev (>= 1.10-6),
+       libpng3,
+       libsigc++2 (>= 2.1.0-1),
+       libxml2 (>= 2.6.30-1),
+       pango1-xft2-ft219-dev (>= 1.18.4-4),
+       pixman (>= 0.10.0-1),
+       pkgconfig (>= 0.21-1),
+       x11-dev,
+       xft2-dev
+<<
+PatchFile: %n.patch
+PatchFile-MD5: 3cd68ada36bfd78e4b773c22ee91b85a
+PatchScript: <<
+       %{default_script}
+       perl -pi -e 's,SigC::Signal,sigc::signal,g' src/*.cc
+<<
+ConfigureParams: --disable-dependency-tracking 
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
 CompileScript: <<
   PERL_PATH=/usr/bin/perl ./configure %c
   make
@@ -37,7 +83,7 @@
 file per user. 
 <<  
 DescPort: <<
-Use of pkgconfig
+       Can this be migrated to gtksourceview2?
 <<
 DocFiles: AUTHORS COPYING ChangeLog NEWS README TODO
 DescPackaging: Formerly maintained by Michele Garoche

Index: tetex-nox.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/tetex-nox.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tetex-nox.info      16 May 2007 00:10:18 -0000      1.1
+++ tetex-nox.info      15 Jul 2008 01:41:22 -0000      1.2
@@ -6,7 +6,7 @@
 Type: -nox (-nox)
 #Type: -nox (boolean)
 Version: 3.0
-Revision: 1003
+Revision: 1004
 GCC: 4.0
 Description: Complete distribution of the TeX typesetting system
 Depends: %N-base (= %v-%r), texinfo, debianutils, texi2html
@@ -14,7 +14,10 @@
  libkpathsea4, t1lib5-nox, libpng3 (>= 1:1.2.8-1), libwww, libncurses5 (>= 
5.4-20041023-1006), fink (>= 0.24.12),
  libjpeg, libiconv-dev,
  (%type_raw[-nox] = .)  t1lib5-x11, 
- (%type_raw[-nox] = .)  gd2 (>= 2.0.33-1), 
+ (%type_raw[-nox] = .)  gd2 (>= 2.0.35-2), 
+ (%type_raw[-nox] = .) expat1,
+ (%type_raw[-nox] = .) fontconfig2-dev,
+ (%type_raw[-nox] = .) freetype219,
  (%type_raw[-nox] = .) x11, 
  (%type_raw[-nox] = .) openmotif3
 <<
@@ -106,7 +109,7 @@
   (%type_raw[-nox] = .) t1lib5-x11-shlibs,
   (%type_raw[-nox] = -nox) ghostscript-nox, 
   (%type_raw[-nox] = .) ghostscript, 
-  (%type_raw[-nox] = .) gd2-shlibs (>= 2.0.33-1), 
+  (%type_raw[-nox] = .) gd2-shlibs (>= 2.0.35-2), 
   (%type_raw[-nox] = .) x11, 
   (%type_raw[-nox] = .) x11-shlibs,
   (%type_raw[-nox] = .) openmotif3-shlibs


-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to