Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv10315

Modified Files:
        gimp2-help.info gimp2.info 
Log Message:
Move gimp2/-help to stable (requested)


Index: gimp2-help.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/gimp2-help.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gimp2-help.info     16 Jul 2008 03:01:30 -0000      1.1
+++ gimp2-help.info     26 Jan 2010 07:31:50 -0000      1.2
@@ -1,20 +1,26 @@
 Package: gimp2-help
-Version: 2.4.1
+Version: 2.6.0
 Revision: 1
 Description: GIMP documentation 
 License: GFDL
 Maintainer: Alexander Strange <astra...@ithinksw.com>
-Source: mirror:gimp:help/gimp-help-%v.tar.bz2
-Source-MD5: da505d7532b6e14713e04b6e79a11379
-BuildDepends: docbook-dtd, docbook-xsl, libxml2-bin, libxslt-bin
-Conflicts: gimp2 (<< 2.4), gimp2-svg (<< 2.4), gimp2-noprint (<< 2.4), 
gimp2-svg-noprint (<< 2.4)
-PatchScript: sed -i.bak -e 's|echo -n|/bin/echo -n|' Makefile.in
-ConfigureParams: --without-gimp --disable-network
-InstallScript: make install DESTDIR=%d top_builddir=`pwd`
-InfoTest: <<
-  TestScript: <<
-    make check || exit 2
-  <<
+Source: mirror:gimp:help/gimp-help-%v-html-en.tar.bz2
+Source-MD5: 81da262343316835ebdd3354ce8eab4f
+SourceDirectory: gimp-help-2
+BuildDepends: docbook-dtd, docbook-xsl, libxml2-bin, libxslt-bin, dblatex, 
docbook-utils, gnome-doc-utils, gimp2-dev | gimp2-svg-dev
+Conflicts: gimp2 (<< 2.6), gimp2-svg (<< 2.6), gimp2-noprint (<< 2.6), 
gimp2-svg-noprint (<< 2.6)
+PatchScript: <<
+       sed -i.bak -e 's/\.PHONY: help/.PHONY: help install/' Makefile
 <<
-DocFiles: AUTHORS COPYING ChangeLog HACKING NEWS README TERMINOLOGY
+CompileScript: <<
+<<
+InstallScript: <<
+       make help DESTDIR=%d
+       make install DESTDIR=%d
+<<
+DescPackaging: <<
+       The GIMP manual is available in several languages,
+       but only the English version is packaged here.
+<<
+DocFiles: AUTHORS COPYING HACKING MAINTAINERS README
 Homepage: http://docs.gimp.org/

Index: gimp2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/gimp2.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gimp2.info  30 Aug 2009 01:33:51 -0000      1.4
+++ gimp2.info  26 Jan 2010 07:31:50 -0000      1.5
@@ -1,62 +1,64 @@
 Info2: <<
 Package: gimp2%type_pkg[-svg]
 Type: -svg (boolean)
-Distribution: 10.4, 10.5
 
-Version: 2.4.5
-Revision: 1
+Version: 2.6.7
+Revision: 2
 
-Source: mirror:gimp:v2.4/gimp-%v.tar.bz2
-Depends: %N-shlibs (= %v-%r)
-Conflicts: gimp2,gimp2-svg,gimp2-noprint,gimp2-svg-noprint
-Replaces: gimp2,gimp2-svg,gimp2-noprint,gimp2-svg-noprint
+Source: mirror:gimp:v2.6/gimp-%v.tar.bz2
+Depends: %N-shlibs (= %v-%r), dbus-shlibs (>= 1.2.1-1), libbabl0.0.0-shlibs, 
libgegl0.0.0-shlibs
+Conflicts: <<
+ gimp2,gimp2-svg,gimp2-noprint,gimp2-svg-noprint
+<<
+Replaces: <<
+ gimp2,gimp2-svg,gimp2-noprint,gimp2-svg-noprint
+<<
 Recommends: %N-default (= %v-%r), gimp2-help
 BuildDepends: <<
-pkgconfig (>= 0.21-1), xft2-dev, glitz, cairo (>= 1.6-1), libpng3, libjpeg, 
libtiff, glib2-dev (>= 2.14.0-1), giflib, aalib (>= 1.4rc5-2), libgettext3-dev, 
gettext-bin, gettext-tools, libiconv-dev, gtk-doc (>= 1.8-1), x11-dev, 
libexif12, gtk+2-dev (>= 2.12.0-1), libart2, libmng2, expat1, fontconfig2-dev 
(>= 2.4.1-1), lcms, libwmf, pango1-xft2-ft219-dev (>= 1.18.4-4), pixman (>= 
0.10.0-1), atk1 (>= 1.20.0-1), intltool (>= 0.36.0-1), freetype219 (>= 2.3.5-1),
- (%type_raw[-svg] = -svg) librsvg2 (>= 2.18.0-1),
- (%type_raw[-svg] = -svg) audiofile,
- (%type_raw[-svg] = -svg) avahi-dev,
- (%type_raw[-svg] = -svg) esound,
- (%type_raw[-svg] = -svg) gail18-dev (>= 1.20.0-1),
- (%type_raw[-svg] = -svg) gconf2-dev (>= 2.20.0-1),
- (%type_raw[-svg] = -svg) dbus-dev (>= 1.0-1),
- (%type_raw[-svg] = -svg) gnome-vfs2-unified-dev (>= 1:2.20.0-1),
- (%type_raw[-svg] = -svg) gnome-keyring-dev,
- (%type_raw[-svg] = -svg) libavahi-glib1-dev,
- (%type_raw[-svg] = -svg) libbonobo2-dev (>= 2.20.0-1),
- (%type_raw[-svg] = -svg) libbonoboui2-dev (>= 2.20.0-1),
- (%type_raw[-svg] = -svg) libgnome2-dev (>= 2.20.0-1),
- (%type_raw[-svg] = -svg) libgnomecanvas2-dev (>= 2.20.0-1),
- (%type_raw[-svg] = -svg) libgnomeui2-dev (>= 2.20.0-1),
- (%type_raw[-svg] = -svg) libgsf1.114-dev (>= 1.14.5-1),
- (%type_raw[-svg] = -svg) libxml2 (>= 2.6.30-1),
- (%type_raw[-svg] = -svg) orbit2-dev (>= 2.14.9-1),
- (%type_raw[-svg] = -svg) libgtkhtml2 (>= 2.6.3-1013),
- (%type_raw[-svg] = -svg) libcroco3,
- (%type_raw[-svg] = -svg) popt,
- libxslt (>= 1.1.22-1), libncurses5, bzip2-dev
+ fink (>= 0.24.12-1),
+ pkgconfig (>= 0.23), xft2-dev, glitz, cairo (>= 1.8-1), libpng3, libjpeg, 
libtiff, 
+ glib2-dev (>= 2.20.5-1), giflib, aalib (>= 1.4rc5-2), libgettext3-dev, 
gettext-bin, gettext-tools (>= 0.17), 
+ libiconv-dev, gtk-doc (>= 1.11-6), x11-dev, libexif12, gtk+2-dev (>= 
2.16.6-1), libart2, libmng2,
+ expat1, fontconfig2-dev (>= 2.4.1-1), lcms, libwmf, pango1-xft2-ft219-dev (>= 
1.22.4-1),
+ pixman (>= 0.12.0-1), atk1 (>= 1.24.0-1), intltool40, freetype219 (>= 
2.3.8-2),
+ libxslt (>= 1.1.22-1), libncurses5, 
+ bzip2-dev, libbabl0.0.0-dev, libcurl4 (>= 7.18.2-1), libgegl0.0.0-dev, 
poppler4-glib, poppler4, libopenjpeg (>= 1.3-1),
+ webkit-1.0.2, system-openssl-dev, libssh2.1, dbus-dev (>= 1.2.1-1),
+ libsoup2.4.1-ssl, libicu32-dev | libicu36-dev,
+ enchant1-dev, libgcrypt, libgpg-error, libtasn1-3 (>= 2.2-2),
+ libxml2-bin, libxslt-bin, sqlite3-dev,
+ (%type_raw[-svg] = -svg) librsvg2 (>= 2.22.3-1),
+ (%type_raw[-svg] = -svg) libgsf1.114-dev (>= 1.14.11-1),
+ libxml2 (>= 2.6.30-1),
+ (%type_raw[-svg] = -svg) libcroco3 (>= 0.6.2-1),
+ (%m = x86_64) gcc4.2
 <<
-Source-MD5: 162e264dc5f0c7e4de8794e78818381f
-SetCC: gcc -I%p/lib/fontconfig2/include -L%p/lib/fontconfig2/lib 
-I%p/lib/freetype219/include -L%p/lib/freetype219/lib
-SetLIBS: -liconv -lintl -lexpat
-SetLDFLAGS: -Wl,-search_paths_first
+Source-MD5: 77ed86a8de9b48587efb24f2b115ad38
 DocFiles: COPYING AUTHORS LICENSE NEWS* README*
-ConfigureParams: --disable-print --without-libcurl --without-poppler 
--disable-python --disable-dependency-tracking --enable-altivec --enable-mp 
--enable-gtk-doc --with-shm=posix --with-aa --with-sendmail=/usr/sbin/sendmail 
--mandir=%p/share/man --disable-mmx 
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
+SetCPPFLAGS: -I%p/lib/system-openssl/include -I%p/lib/fontconfig2/include
+SetLDFLAGS: -L%p/lib/system-openssl/lib -L%p/lib/fontconfig2/lib
+SetCFLAGS: -O2
+ConfigureParams: --disable-python --disable-dependency-tracking --without-hal 
--enable-gimp-remote --mandir=%p/share/man --x-includes=/usr/X11R6/include 
--x-libraries=/usr/X11R6/lib 
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH" 
--enable-gtk-doc --without-gnomevfs --build=%m-apple-darwin`uname -r|cut -f1 
-d.` --host=%m-apple-darwin`uname -r|cut -f1 -d.`
 
 PatchScript: <<
 #!/bin/sh -ev
-if [ "%type_raw[-svg]" != "-svg" ]; then
- sed 's;SVG = @SVG@;SVG = ;' < plug-ins/common/Makefile.in > tmp
- mv tmp plug-ins/common/Makefile.in
-fi
-sed -i.bak -e 's|# (web-browser "firefox|(web-browser "open|' etc/gimprc
+ sed -i.bak -e 's|# (web-browser "firefox|(web-browser "open|' etc/gimprc
+ sed -i.bak -e 's|mac_twain_ok=yes|mac_twain_ok=no|' configure
 <<
 
 CompileScript: <<
 #!/bin/sh -ev
-export F77=no
-./configure %c
-make
+ export F77=no
+ if [ "%m" == "x86_64" ]; then
+       export CC=gcc-4.2
+ fi
+ 
+ if [ "%type_raw[-svg]" != "-svg" ]; then
+  ./configure %c --without-librsvg
+ else
+  ./configure %c
+ fi
+ make
 <<
 
 InstallScript: <<
@@ -68,52 +70,85 @@
    rm -f %i/lib/gimp/2.0/plug-ins/helpbrowser
   fi
 
-  strip -S %i/bin/gimp-2.4  %i/lib/libgimp*-2.0.0.400.5.dylib || true
-  strip -S %i/lib/gimp/2.0/plug-ins/* || true
-  strip -S %i/lib/gimp/2.0/modules/* || true
 <<
 
-SplitOff: <<
- Package: %N-ghostscript
- Depends: %N-shlibs (= %v-%r), ghostscript, libwmf-shlibs
- Conflicts: 
gimp2-ghostscript,gimp2-svg-ghostscript,gimp2-noprint-ghostscript,gimp2-svg-noprint-ghostscript
- Replaces: 
gimp2-ghostscript,gimp2-svg-ghostscript,gimp2-noprint-ghostscript,gimp2-svg-noprint-ghostscript
- Files: lib/gimp/2.0/plug-ins/wmf lib/gimp/2.0/plug-ins/postscript
+SplitOff2: <<
+ Package: %N-dev
+ Depends: %N-shlibs (= %v-%r), pkgconfig (>= 0.23)
+ Conflicts: gimp2-dev,gimp2-svg-dev,gimp2-noprint-dev,gimp2-svg-noprint-dev, 
gimp-dev (<= 2.0.0-5)
+ Replaces: gimp2-dev,gimp2-svg-dev,gimp2-noprint-dev,gimp2-svg-noprint-dev, 
gimp-dev (<= 2.0.0-5)
+ BuildDependsOnly: true
+ Files: <<
+ include
+ lib/*.la lib/libgimp*-2.0.dylib
+ lib/pkgconfig share/aclocal share/gtk-doc bin/gimptool-2.0 
+ <<
  DocFiles: COPYING AUTHORS LICENSE NEWS* README*
 <<
 
-SplitOff2: <<
+SplitOff3: <<
  Package: %N-shlibs
- Depends: libpng3-shlibs, libjpeg-shlibs, libtiff-shlibs, glib2-shlibs (>= 
2.14.0-1), gtk+2-shlibs (>= 2.12.0-1), giflib-shlibs, aalib-shlibs, 
libgettext3-shlibs, libiconv, libexif12-shlibs, libart2-shlibs, libmng2-shlibs, 
expat1-shlibs, lcms-shlibs, (%type_raw[-svg] = -svg) librsvg2-shlibs (>= 
2.18.0-1), (%type_raw[-svg] = -svg) libgtkhtml2-shlibs, atk1-shlibs (>= 
1.20.0-1), pango1-xft2-ft219-shlibs (>= 1.18.4-4), libncurses5-shlibs, 
freetype219-shlibs (>= 2.3.5-1), fontconfig2-shlibs (>= 2.4.1-1)
- Conflicts: 
gimp2-shlibs,gimp2-svg-shlibs,gimp2-noprint-shlibs,gimp2-svg-noprint-shlibs
+ Depends: <<
+  aalib-shlibs (>= 1.4rc5-1024), 
+  atk1-shlibs (>= 1.24.0-1), 
+  bzip2-shlibs (>= 1.0.5-2), 
+  cairo-shlibs (>= 1.8.6-1), 
+  expat1-shlibs (>= 2.0.1-1), 
+  fontconfig2-shlibs (>= 2.4.1-1),
+  freetype219-shlibs (>= 2.3.8-2), 
+  glib2-shlibs (>= 2.18.4-2), 
+  glitz-shlibs (>= 0.5.6-3), 
+  gtk+2-shlibs (>= 2.14.7-2), 
+  lcms-shlibs (>= 1.17-1), 
+  (%type_raw[-svg] = -svg) libcroco3-shlibs (>= 0.6.2-1),
+  libcurl4-shlibs (>= 7.19.3-1), 
+  libexif12-shlibs (>= 0.6.16-1), 
+  libgettext3-shlibs (>= 0.14.5-2), 
+  (%type_raw[-svg] = -svg) libgsf1.114-shlibs (>= 1.14.11-1), 
+  libiconv (>= 1.12-3), 
+  libjpeg-shlibs (>= 6b-17), 
+  libmng2-shlibs (>= 1.0.9-10), 
+  libncurses5-shlibs (>= 5.4-20041023-1010), 
+  libopenjpeg-shlibs (>= 1.3-1), 
+  libpng3-shlibs (>= 1:1.2.33-1), 
+  (%type_raw[-svg] = -svg) librsvg2-shlibs (>= 2.22.3-1), 
+  libsoup2.4.1-ssl-shlibs,
+  libtiff-shlibs (>= 3.8.2-1002), 
+  libwmf-shlibs (>= 0.2.8.2-9), 
+  libxml2-shlibs (>= 2.6.32-1), 
+  libxslt-shlibs (>= 1.1.24-1), 
+  pango1-xft2-ft219-shlibs (>= 1.22.4-1), 
+  pixman-shlibs (>= 0.12.0-1), 
+  poppler4-glib-shlibs (>= 0.10.2-1), 
+  poppler4-shlibs (>= 0.10.2-1), 
+  sqlite3-shlibs (>= 3.6.9-1004), 
+  webkit-1.0.2-shlibs,
+  iso-codes
+ <<
+ Conflicts: <<
+       
gimp2-shlibs,gimp2-svg-shlibs,gimp2-noprint-shlibs,gimp2-svg-noprint-shlibs,
+       
gimp2-ghostscript,gimp2-svg-ghostscript,gimp2-noprint-ghostscript,gimp2-svg-noprint-ghostscript
+ <<
  Replaces: <<
    gimp2,gimp2-svg,gimp2-noprint,gimp2-svg-noprint,
-   gimp2-shlibs,gimp2-svg-shlibs,gimp2-noprint-shlibs,gimp2-svg-noprint-shlibs
+   gimp2-shlibs,gimp2-svg-shlibs,gimp2-noprint-shlibs,gimp2-svg-noprint-shlibs,
+   
gimp2-ghostscript,gimp2-svg-ghostscript,gimp2-noprint-ghostscript,gimp2-svg-noprint-ghostscript
  <<
  Files: <<
  lib/gimp
- lib/libgimp-2.0.0.400.5.dylib        lib/libgimp-2.0.0.dylib
- lib/libgimpbase-2.0.0.400.5.dylib    lib/libgimpbase-2.0.0.dylib
- lib/libgimpcolor-2.0.0.400.5.dylib   lib/libgimpcolor-2.0.0.dylib
- lib/libgimpconfig-2.0.0.400.5.dylib  lib/libgimpconfig-2.0.0.dylib
- lib/libgimpmath-2.0.0.400.5.dylib    lib/libgimpmath-2.0.0.dylib
- lib/libgimpmodule-2.0.0.400.5.dylib  lib/libgimpmodule-2.0.0.dylib
- lib/libgimpthumb-2.0.0.400.5.dylib   lib/libgimpthumb-2.0.0.dylib
- lib/libgimpui-2.0.0.400.5.dylib      lib/libgimpui-2.0.0.dylib
- lib/libgimpwidgets-2.0.0.400.5.dylib lib/libgimpwidgets-2.0.0.dylib
+ lib/libgimp*-2.0.0*.dylib
  share/gimp
- share/locale
  <<
  Shlibs: <<
- %p/lib/libgimp-2.0.0.dylib        401.0.0 %n (>= 2.4.5-1)
- %p/lib/libgimpbase-2.0.0.dylib    401.0.0 %n (>= 2.4.5-1)
- %p/lib/libgimpcolor-2.0.0.dylib   401.0.0 %n (>= 2.4.5-1)
- %p/lib/libgimpconfig-2.0.0.dylib  401.0.0 %n (>= 2.4.5-1)
- %p/lib/libgimpmath-2.0.0.dylib    401.0.0 %n (>= 2.4.5-1)
- %p/lib/libgimpmodule-2.0.0.dylib  401.0.0 %n (>= 2.4.5-1)
- %p/lib/libgimpthumb-2.0.0.dylib   401.0.0 %n (>= 2.4.5-1)
- %p/lib/libgimpui-2.0.0.dylib      401.0.0 %n (>= 2.4.5-1)
- %p/lib/libgimpwidgets-2.0.0.dylib 401.0.0 %n (>= 2.4.5-1)
+ %p/lib/libgimp-2.0.0.dylib        601.0.0 %n (>= 2.6.4-1)
+ %p/lib/libgimpbase-2.0.0.dylib    601.0.0 %n (>= 2.6.4-1)
+ %p/lib/libgimpcolor-2.0.0.dylib   601.0.0 %n (>= 2.6.4-1)
+ %p/lib/libgimpconfig-2.0.0.dylib  601.0.0 %n (>= 2.6.4-1)
+ %p/lib/libgimpmath-2.0.0.dylib    601.0.0 %n (>= 2.6.4-1)
+ %p/lib/libgimpmodule-2.0.0.dylib  601.0.0 %n (>= 2.6.4-1)
+ %p/lib/libgimpthumb-2.0.0.dylib   601.0.0 %n (>= 2.6.4-1)
+ %p/lib/libgimpui-2.0.0.dylib      601.0.0 %n (>= 2.6.4-1)
+ %p/lib/libgimpwidgets-2.0.0.dylib 601.0.0 %n (>= 2.6.4-1)
  <<
  DocFiles: COPYING AUTHORS LICENSE NEWS* README*
  DescPackaging: <<
@@ -121,16 +156,6 @@
  <<
 <<
 
-SplitOff3: <<
- Package: %N-dev
- Depends: %N-shlibs (= %v-%r), pkgconfig (>= 0.21-1)
- Conflicts: gimp2-dev,gimp2-svg-dev,gimp2-noprint-dev,gimp2-svg-noprint-dev, 
gimp-dev (<= 2.0.0-5)
- Replaces: gimp2-dev,gimp2-svg-dev,gimp2-noprint-dev,gimp2-svg-noprint-dev, 
gimp-dev (<= 2.0.0-5)
- BuildDependsOnly: true
- Files: include lib/*.la lib/libgimp-2.0.dylib lib/libgimpbase-2.0.dylib 
lib/libgimpcolor-2.0.dylib lib/libgimpconfig-2.0.dylib 
lib/libgimpmath-2.0.dylib lib/libgimpmodule-2.0.dylib 
lib/libgimpthumb-2.0.dylib lib/libgimpui-2.0.dylib lib/libgimpwidgets-2.0.dylib 
lib/pkgconfig share/aclocal share/gtk-doc bin/gimptool-2.0 
- DocFiles: COPYING AUTHORS LICENSE NEWS* README*
-<<
-
 SplitOff4: <<
  Package: %N-default
  Depends: %N (= %v-%r)
@@ -140,8 +165,6 @@
  DocFiles: COPYING AUTHORS LICENSE NEWS* README*
 <<
 
-
-
 ConfFiles: <<
  %p/etc/gimp/2.0/gimprc %p/etc/gimp/2.0/sessionrc
  %p/etc/gimp/2.0/gtkrc %p/etc/gimp/2.0/templaterc
@@ -153,21 +176,19 @@
 #
 Description: The GNU Image Manipulation Program 2.0
 DescUsage: <<
-rsvg2 and gtkhtml are disabled by default, as they are very large.
-Compiling gimp2-svg will enable them.
-
-If you did not install "Gimp-Print Printer Drivers" when installing OS
-X, you need -noprint. Note that printing is disabled on 10.4 even in the
-variant that is not -noprint (in fact, it is identical to the -noprint
-variant). "only -noprint will work until gimp-print7-dev exist"
+rsvg is disabled by default, as its requirements are very large.
+Compiling gimp2-svg will enable it.
 
-The -ghostscript splitoff contains the WMF and PostScript plugins;
-this allows you to run Gimp without libwmf and ghostscript installed.
+The "gimp2-default" package contains the "gimp" binary.
+<<
+DescPackaging: <<
+Fink's glib has gio/gvfs so use that and don't even bother checking
+for gnomevfs fallback. (which entails gnome-keyring and libgnomeui too)
 
-The main program is installed as "gimp-2.0" in the main gimp2 package
-(including the -svg and/or -noprint variants). To install it as "gimp"
-also, install the package tagged -default associated with your chosen
-gimp2 variant main package.
+"TWAIN Mac support" is disabled on all architectures
+as it doesn't work on 64-bit. This support consists
+entirely of a dock icon progress bar.
+GIMP bug: https://bugzilla.gnome.org/show_bug.cgi?id=555525
 <<
 License: GPL/LGPL
 Homepage: http://www.gimp.org/


------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to