update to 0.19.1

changes:
The CinePaint versin 0.19-1 is a minor release.
Overall stability has improved. Instant colourmanaging is more convenient.
Memory handling for plug-ins is better. Portablility has improved and many bugs where fixed.
Some plug-ins where added to the release:
The print plug-in utilises Gutenprint for throughout 16-bit colourmanaged printing. Note Gutenprint will be colour stable once it lefts behind beta status.
The collect plug-in allows for selecting a number of images with the same bit depth and building a layered image from them.
The new ICC Examin plug-in allowes visualisation of actual ICC profiles tags.
The new ICC Watch plug-in allowes viewing image colours in the actual colour gamut. Note the last two plug-ins need the "ICC Examin" application downloadable from www.behrmann.name .
The 'zoom in' shortcut has changed from '=', which was not available for many non us keyboard layouts, to '+' .

4 files changed, 453 insertions, 455 deletions

diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile
index ded30cdd95e..9102768e65c 100644
--- a/graphics/cinepaint/Makefile
+++ b/graphics/cinepaint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:01 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/04 19:57:01 drochner Exp $
 
-DISTNAME=	cinepaint-0.19-0
-PKGNAME=	cinepaint-0.19.0
+DISTNAME=	cinepaint-0.19-1
+PKGNAME=	cinepaint-0.19.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cinepaint/}
 
@@ -20,5 +20,6 @@ BUILDLINK_DEPENDS.lcms+=	lcms>=1.13 # needs _cmsLCMScolorSpace
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
+.include "../../x11/fltk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/cinepaint/PLIST b/graphics/cinepaint/PLIST
index feebeae30d3..b132fa32f55 100644
--- a/graphics/cinepaint/PLIST
+++ b/graphics/cinepaint/PLIST
@@ -1,410 +1,410 @@
-@comment $NetBSD: PLIST,v 1.2 2005/01/17 13:38:37 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/07/04 19:57:01 drochner Exp $
 bin/cinepaint
 bin/cinepainttool
-lib/cinepaint/0.19-0/plug-ins/blur
-lib/cinepaint/0.19-0/plug-ins/bmp
-lib/cinepaint/0.19-0/plug-ins/cineon
-lib/cinepaint/0.19-0/plug-ins/compose
-lib/cinepaint/0.19-0/plug-ins/dbbrowser
-lib/cinepaint/0.19-0/plug-ins/decompose
-lib/cinepaint/0.19-0/plug-ins/dicom
-lib/cinepaint/0.19-0/plug-ins/edge
-lib/cinepaint/0.19-0/plug-ins/fits
-lib/cinepaint/0.19-0/plug-ins/gauss_rle
-lib/cinepaint/0.19-0/plug-ins/gbr
-lib/cinepaint/0.19-0/plug-ins/gifload
-lib/cinepaint/0.19-0/plug-ins/guash
-lib/cinepaint/0.19-0/plug-ins/hdr
-lib/cinepaint/0.19-0/plug-ins/iff
-lib/cinepaint/0.19-0/plug-ins/jpeg
-lib/cinepaint/0.19-0/plug-ins/mblur
-lib/cinepaint/0.19-0/plug-ins/noisify
-lib/cinepaint/0.19-0/plug-ins/openexr
-lib/cinepaint/0.19-0/plug-ins/pic
-lib/cinepaint/0.19-0/plug-ins/png
-lib/cinepaint/0.19-0/plug-ins/psd
-lib/cinepaint/0.19-0/plug-ins/psd_save
-lib/cinepaint/0.19-0/plug-ins/rawphoto
-lib/cinepaint/0.19-0/plug-ins/rotate
-lib/cinepaint/0.19-0/plug-ins/screenshot
-lib/cinepaint/0.19-0/plug-ins/sgi
-lib/cinepaint/0.19-0/plug-ins/sharpen
-lib/cinepaint/0.19-0/plug-ins/snoise
-lib/cinepaint/0.19-0/plug-ins/sobel
-lib/cinepaint/0.19-0/plug-ins/spread
-lib/cinepaint/0.19-0/plug-ins/tga
-lib/cinepaint/0.19-0/plug-ins/tiff
-lib/cinepaint/0.19-0/plug-ins/unsharp
-lib/cinepaint/0.19-0/plug-ins/xwd
+lib/cinepaint/0.19-1/plug-ins/blur
+lib/cinepaint/0.19-1/plug-ins/bmp
+lib/cinepaint/0.19-1/plug-ins/cineon
+lib/cinepaint/0.19-1/plug-ins/compose
+lib/cinepaint/0.19-1/plug-ins/dbbrowser
+lib/cinepaint/0.19-1/plug-ins/decompose
+lib/cinepaint/0.19-1/plug-ins/dicom
+lib/cinepaint/0.19-1/plug-ins/edge
+lib/cinepaint/0.19-1/plug-ins/fits
+lib/cinepaint/0.19-1/plug-ins/gauss_rle
+lib/cinepaint/0.19-1/plug-ins/gbr
+lib/cinepaint/0.19-1/plug-ins/gifload
+lib/cinepaint/0.19-1/plug-ins/guash
+lib/cinepaint/0.19-1/plug-ins/hdr
+lib/cinepaint/0.19-1/plug-ins/iff
+lib/cinepaint/0.19-1/plug-ins/jpeg
+lib/cinepaint/0.19-1/plug-ins/mblur
+lib/cinepaint/0.19-1/plug-ins/noisify
+lib/cinepaint/0.19-1/plug-ins/openexr
+lib/cinepaint/0.19-1/plug-ins/pic
+lib/cinepaint/0.19-1/plug-ins/png
+lib/cinepaint/0.19-1/plug-ins/psd
+lib/cinepaint/0.19-1/plug-ins/psd_save
+lib/cinepaint/0.19-1/plug-ins/rawphoto
+lib/cinepaint/0.19-1/plug-ins/rotate
+lib/cinepaint/0.19-1/plug-ins/screenshot
+lib/cinepaint/0.19-1/plug-ins/sgi
+lib/cinepaint/0.19-1/plug-ins/sharpen
+lib/cinepaint/0.19-1/plug-ins/snoise
+lib/cinepaint/0.19-1/plug-ins/sobel
+lib/cinepaint/0.19-1/plug-ins/spread
+lib/cinepaint/0.19-1/plug-ins/tga
+lib/cinepaint/0.19-1/plug-ins/tiff
+lib/cinepaint/0.19-1/plug-ins/unsharp
+lib/cinepaint/0.19-1/plug-ins/xwd
 lib/libcinepaint.la
 man/man1/cinepaint.1
 man/man1/cinepainttool.1
 share/aclocal/cinepaint.m4
-share/cinepaint/0.19-0/brushes/10x10square.gbr
-share/cinepaint/0.19-0/brushes/10x10square16.gbr
-share/cinepaint/0.19-0/brushes/10x10squareBlur.gbr
-share/cinepaint/0.19-0/brushes/10x10squareBlur16.gbr
-share/cinepaint/0.19-0/brushes/10x10squareBlurf16.gbr
-share/cinepaint/0.19-0/brushes/10x10squaref16.gbr
-share/cinepaint/0.19-0/brushes/11circle.gbr
-share/cinepaint/0.19-0/brushes/11circle16.gbr
-share/cinepaint/0.19-0/brushes/11circlef16.gbr
-share/cinepaint/0.19-0/brushes/11fcircle.gbr
-share/cinepaint/0.19-0/brushes/11fcirclef16.gbr
-share/cinepaint/0.19-0/brushes/13circle.gbr
-share/cinepaint/0.19-0/brushes/13circle16.gbr
-share/cinepaint/0.19-0/brushes/13circlef16.gbr
-share/cinepaint/0.19-0/brushes/13fcircle.gbr
-share/cinepaint/0.19-0/brushes/13fcirclef16.gbr
-share/cinepaint/0.19-0/brushes/15circle.gbr
-share/cinepaint/0.19-0/brushes/15circle16.gbr
-share/cinepaint/0.19-0/brushes/15circlef16.gbr
-share/cinepaint/0.19-0/brushes/15fcircle.gbr
-share/cinepaint/0.19-0/brushes/15fcirclef16.gbr
-share/cinepaint/0.19-0/brushes/17circle.gbr
-share/cinepaint/0.19-0/brushes/17circle16.gbr
-share/cinepaint/0.19-0/brushes/17circlef16.gbr
-share/cinepaint/0.19-0/brushes/17fcircle.gbr
-share/cinepaint/0.19-0/brushes/17fcirclef16.gbr
-share/cinepaint/0.19-0/brushes/19circle.gbr
-share/cinepaint/0.19-0/brushes/19circle16.gbr
-share/cinepaint/0.19-0/brushes/19circlef16.gbr
-share/cinepaint/0.19-0/brushes/19fcircle.gbr
-share/cinepaint/0.19-0/brushes/19fcirclef16.gbr
-share/cinepaint/0.19-0/brushes/1circle.gbr
-share/cinepaint/0.19-0/brushes/1circlef16.gbr
-share/cinepaint/0.19-0/brushes/20x20square.gbr
-share/cinepaint/0.19-0/brushes/20x20square16.gbr
-share/cinepaint/0.19-0/brushes/20x20squareBlur.gbr
-share/cinepaint/0.19-0/brushes/20x20squareBlur16.gbr
-share/cinepaint/0.19-0/brushes/20x20squareBlurf16.gbr
-share/cinepaint/0.19-0/brushes/20x20squaref16.gbr
-share/cinepaint/0.19-0/brushes/3circle.gbr
-share/cinepaint/0.19-0/brushes/3circle16.gbr
-share/cinepaint/0.19-0/brushes/3circlef16.gbr
-share/cinepaint/0.19-0/brushes/3fcircle.gbr
-share/cinepaint/0.19-0/brushes/3fcirclef16.gbr
-share/cinepaint/0.19-0/brushes/5circle.gbr
-share/cinepaint/0.19-0/brushes/5circle16.gbr
-share/cinepaint/0.19-0/brushes/5circlef16.gbr
-share/cinepaint/0.19-0/brushes/5fcircle.gbr
-share/cinepaint/0.19-0/brushes/5fcirclef16.gbr
-share/cinepaint/0.19-0/brushes/5x5square.gbr
-share/cinepaint/0.19-0/brushes/5x5square16.gbr
-share/cinepaint/0.19-0/brushes/5x5squareBlur.gbr
-share/cinepaint/0.19-0/brushes/5x5squareBlur16.gbr
-share/cinepaint/0.19-0/brushes/5x5squareBlurf16.gbr
-share/cinepaint/0.19-0/brushes/5x5squaref16.gbr
-share/cinepaint/0.19-0/brushes/7circle.gbr
-share/cinepaint/0.19-0/brushes/7circle16.gbr
-share/cinepaint/0.19-0/brushes/7circlef16.gbr
-share/cinepaint/0.19-0/brushes/7fcircle.gbr
-share/cinepaint/0.19-0/brushes/7fcirclef16.gbr
-share/cinepaint/0.19-0/brushes/9circle.gbr
-share/cinepaint/0.19-0/brushes/9circle16.gbr
-share/cinepaint/0.19-0/brushes/9circlef16.gbr
-share/cinepaint/0.19-0/brushes/9fcircle.gbr
-share/cinepaint/0.19-0/brushes/9fcirclef16.gbr
-share/cinepaint/0.19-0/brushes/DStar11.gbr
-share/cinepaint/0.19-0/brushes/DStar17.gbr
-share/cinepaint/0.19-0/brushes/DStar25.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal01.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal02.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal03.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal04.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal05.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal06.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal07.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal08.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal09.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal10.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal11.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal12.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal13.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal14.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal15.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal16.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal17.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal18.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal19.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal20.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal21.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal22.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal23.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal24.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal25.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal26.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal27.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal28.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal29.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal30.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal31.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal32.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal33.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal34.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal35.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal36.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal37.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal38.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal39.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal40.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal41.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal42.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal43.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal44.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal45.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal46.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal47.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal48.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal49.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal50.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal51.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal52.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal53.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal54.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal55.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal56.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal57.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal58.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal59.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal60.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal61.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal62.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal63.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal64.gbr
-share/cinepaint/0.19-0/brushes/NS1-Charcoal65.gbr
-share/cinepaint/0.19-0/brushes/SketchBrush-16.gih
-share/cinepaint/0.19-0/brushes/SketchBrush-32.gih
-share/cinepaint/0.19-0/brushes/SketchBrush-64.gih
-share/cinepaint/0.19-0/brushes/callig1.gbr
-share/cinepaint/0.19-0/brushes/callig116.gbr
-share/cinepaint/0.19-0/brushes/callig1f16.gbr
-share/cinepaint/0.19-0/brushes/callig2.gbr
-share/cinepaint/0.19-0/brushes/callig216.gbr
-share/cinepaint/0.19-0/brushes/callig2f16.gbr
-share/cinepaint/0.19-0/brushes/callig3.gbr
-share/cinepaint/0.19-0/brushes/callig316.gbr
-share/cinepaint/0.19-0/brushes/callig3f16.gbr
-share/cinepaint/0.19-0/brushes/callig4.gbr
-share/cinepaint/0.19-0/brushes/callig416.gbr
-share/cinepaint/0.19-0/brushes/callig4f16.gbr
-share/cinepaint/0.19-0/brushes/confetti.gbr
-share/cinepaint/0.19-0/brushes/confetti.gih
-share/cinepaint/0.19-0/brushes/confetti16.gbr
-share/cinepaint/0.19-0/brushes/confettif16.gbr
-share/cinepaint/0.19-0/brushes/dunes.gbr
-share/cinepaint/0.19-0/brushes/dunes16.gbr
-share/cinepaint/0.19-0/brushes/dunesf16.gbr
-share/cinepaint/0.19-0/brushes/feltpen.gih
-share/cinepaint/0.19-0/brushes/galaxy.gbr
-share/cinepaint/0.19-0/brushes/galaxy16.gbr
-share/cinepaint/0.19-0/brushes/galaxy_big.gbr
-share/cinepaint/0.19-0/brushes/galaxy_big16.gbr
-share/cinepaint/0.19-0/brushes/galaxy_bigf16.gbr
-share/cinepaint/0.19-0/brushes/galaxy_small.gbr
-share/cinepaint/0.19-0/brushes/galaxy_small16.gbr
-share/cinepaint/0.19-0/brushes/galaxy_smallf16.gbr
-share/cinepaint/0.19-0/brushes/galaxyf16.gbr
-share/cinepaint/0.19-0/brushes/hsparks.gih
-share/cinepaint/0.19-0/brushes/pepper.gbr
-share/cinepaint/0.19-0/brushes/pixel.gbr
-share/cinepaint/0.19-0/brushes/pixel16.gbr
-share/cinepaint/0.19-0/brushes/pixelf16.gbr
-share/cinepaint/0.19-0/brushes/thegimp.gbr
-share/cinepaint/0.19-0/brushes/thegimp16.gbr
-share/cinepaint/0.19-0/brushes/thegimpf16.gbr
-share/cinepaint/0.19-0/brushes/vine.gih
-share/cinepaint/0.19-0/brushes/xcf.gbr
-share/cinepaint/0.19-0/brushes/xcf16.gbr
-share/cinepaint/0.19-0/brushes/xcff16.gbr
-share/cinepaint/0.19-0/gimprc
-share/cinepaint/0.19-0/gimprc_user
-share/cinepaint/0.19-0/gradients/Abstract_1
-share/cinepaint/0.19-0/gradients/Abstract_2
-share/cinepaint/0.19-0/gradients/Abstract_3
-share/cinepaint/0.19-0/gradients/Aneurism
-share/cinepaint/0.19-0/gradients/Blinds
-share/cinepaint/0.19-0/gradients/Blue_Green
-share/cinepaint/0.19-0/gradients/Browns
-share/cinepaint/0.19-0/gradients/Brushed_Aluminium
-share/cinepaint/0.19-0/gradients/Burning_Paper
-share/cinepaint/0.19-0/gradients/Burning_Transparency
-share/cinepaint/0.19-0/gradients/CD
-share/cinepaint/0.19-0/gradients/CD_Half
-share/cinepaint/0.19-0/gradients/Caribbean_Blues
-share/cinepaint/0.19-0/gradients/Coffee
-share/cinepaint/0.19-0/gradients/Cold_Steel
-share/cinepaint/0.19-0/gradients/Cold_Steel_2
-share/cinepaint/0.19-0/gradients/Crown_molding
-share/cinepaint/0.19-0/gradients/Danish_flag
-share/cinepaint/0.19-0/gradients/Dark_1
-share/cinepaint/0.19-0/gradients/Deep_Sea
-share/cinepaint/0.19-0/gradients/Default
-share/cinepaint/0.19-0/gradients/Flare_Glow_Angular_1
-share/cinepaint/0.19-0/gradients/Flare_Glow_Radial_1
-share/cinepaint/0.19-0/gradients/Flare_Glow_Radial_2
-share/cinepaint/0.19-0/gradients/Flare_Glow_Radial_3
-share/cinepaint/0.19-0/gradients/Flare_Glow_Radial_4
-share/cinepaint/0.19-0/gradients/Flare_Radial_101
-share/cinepaint/0.19-0/gradients/Flare_Radial_102
-share/cinepaint/0.19-0/gradients/Flare_Radial_103
-share/cinepaint/0.19-0/gradients/Flare_Rays_Radial_1
-share/cinepaint/0.19-0/gradients/Flare_Rays_Radial_2
-share/cinepaint/0.19-0/gradients/Flare_Rays_Size_1
-share/cinepaint/0.19-0/gradients/Flare_Sizefac_101
-share/cinepaint/0.19-0/gradients/Four_bars
-share/cinepaint/0.19-0/gradients/French_flag
-share/cinepaint/0.19-0/gradients/French_flag_smooth
-share/cinepaint/0.19-0/gradients/Full_saturation_spectrum_CCW
-share/cinepaint/0.19-0/gradients/Full_saturation_spectrum_CW
-share/cinepaint/0.19-0/gradients/German_flag
-share/cinepaint/0.19-0/gradients/German_flag_smooth
-share/cinepaint/0.19-0/gradients/Golden
-share/cinepaint/0.19-0/gradients/Greens
-share/cinepaint/0.19-0/gradients/Horizon_1
-share/cinepaint/0.19-0/gradients/Horizon_2
-share/cinepaint/0.19-0/gradients/Incandescent
-share/cinepaint/0.19-0/gradients/Land_1
-share/cinepaint/0.19-0/gradients/Land_and_Sea
-share/cinepaint/0.19-0/gradients/Metallic_Something
-share/cinepaint/0.19-0/gradients/Mexican_flag
-share/cinepaint/0.19-0/gradients/Mexican_flag_smooth
-share/cinepaint/0.19-0/gradients/Nauseating_Headache
-share/cinepaint/0.19-0/gradients/Neon_Cyan
-share/cinepaint/0.19-0/gradients/Neon_Green
-share/cinepaint/0.19-0/gradients/Neon_Yellow
-share/cinepaint/0.19-0/gradients/Pastel_Rainbow
-share/cinepaint/0.19-0/gradients/Pastels
-share/cinepaint/0.19-0/gradients/Purples
-share/cinepaint/0.19-0/gradients/Radial_Eyeball_Blue
-share/cinepaint/0.19-0/gradients/Radial_Eyeball_Brown
-share/cinepaint/0.19-0/gradients/Radial_Eyeball_Green
-share/cinepaint/0.19-0/gradients/Radial_Glow_1
-share/cinepaint/0.19-0/gradients/Radial_Rainbow_Hoop
-share/cinepaint/0.19-0/gradients/Romanian_flag
-share/cinepaint/0.19-0/gradients/Romanian_flag_smooth
-share/cinepaint/0.19-0/gradients/Rounded_edge
-share/cinepaint/0.19-0/gradients/Shadows_1
-share/cinepaint/0.19-0/gradients/Shadows_2
-share/cinepaint/0.19-0/gradients/Shadows_3
-share/cinepaint/0.19-0/gradients/Skyline
-share/cinepaint/0.19-0/gradients/Skyline_polluted
-share/cinepaint/0.19-0/gradients/Square_Wood_Frame
-share/cinepaint/0.19-0/gradients/Sunrise
-share/cinepaint/0.19-0/gradients/Three_bars_sin
-share/cinepaint/0.19-0/gradients/Tropical_Colors
-share/cinepaint/0.19-0/gradients/Tube_Red
-share/cinepaint/0.19-0/gradients/Wood_1
-share/cinepaint/0.19-0/gradients/Wood_2
-share/cinepaint/0.19-0/gradients/Yellow_Contrast
-share/cinepaint/0.19-0/gradients/Yellow_Orange
-share/cinepaint/0.19-0/gtkrc
-share/cinepaint/0.19-0/gtkrc.forest2
-share/cinepaint/0.19-0/palettes/Bears
-share/cinepaint/0.19-0/palettes/Bgold
-share/cinepaint/0.19-0/palettes/Blues
-share/cinepaint/0.19-0/palettes/Borders
-share/cinepaint/0.19-0/palettes/Browns_And_Yellows
-share/cinepaint/0.19-0/palettes/Caramel
-share/cinepaint/0.19-0/palettes/Cascade
-share/cinepaint/0.19-0/palettes/China
-share/cinepaint/0.19-0/palettes/Coldfire
-share/cinepaint/0.19-0/palettes/Cool_Colors
-share/cinepaint/0.19-0/palettes/Cranes
-share/cinepaint/0.19-0/palettes/Dark_pastels
-share/cinepaint/0.19-0/palettes/Default
-share/cinepaint/0.19-0/palettes/Ega
-share/cinepaint/0.19-0/palettes/Firecode
-share/cinepaint/0.19-0/palettes/Gold
-share/cinepaint/0.19-0/palettes/GrayViolet
-share/cinepaint/0.19-0/palettes/Grayblue
-share/cinepaint/0.19-0/palettes/Grays
-share/cinepaint/0.19-0/palettes/Greens
-share/cinepaint/0.19-0/palettes/Hilite
-share/cinepaint/0.19-0/palettes/Kahki
-share/cinepaint/0.19-0/palettes/Lights
-share/cinepaint/0.19-0/palettes/Muted
-share/cinepaint/0.19-0/palettes/Named_Colors
-share/cinepaint/0.19-0/palettes/News3
-share/cinepaint/0.19-0/palettes/Op2
-share/cinepaint/0.19-0/palettes/Paintjet
-share/cinepaint/0.19-0/palettes/Pastels
-share/cinepaint/0.19-0/palettes/Plasma
-share/cinepaint/0.19-0/palettes/Reds
-share/cinepaint/0.19-0/palettes/Reds_And_Purples
-share/cinepaint/0.19-0/palettes/Royal
-share/cinepaint/0.19-0/palettes/Topographic
-share/cinepaint/0.19-0/palettes/Visibone
-share/cinepaint/0.19-0/palettes/Visibone2
-share/cinepaint/0.19-0/palettes/Volcano
-share/cinepaint/0.19-0/palettes/Warm_Colors
-share/cinepaint/0.19-0/palettes/Web
-share/cinepaint/0.19-0/patterns/3dgreen.pat
-share/cinepaint/0.19-0/patterns/Craters.pat
-share/cinepaint/0.19-0/patterns/Moonfoot.pat
-share/cinepaint/0.19-0/patterns/amethyst.pat
-share/cinepaint/0.19-0/patterns/bark.pat
-share/cinepaint/0.19-0/patterns/blue.pat
-share/cinepaint/0.19-0/patterns/bluegrid.pat
-share/cinepaint/0.19-0/patterns/bluesquares.pat
-share/cinepaint/0.19-0/patterns/blueweb.pat
-share/cinepaint/0.19-0/patterns/brick.pat
-share/cinepaint/0.19-0/patterns/burlap.pat
-share/cinepaint/0.19-0/patterns/burlwood.pat
-share/cinepaint/0.19-0/patterns/choc_swirl.pat
-share/cinepaint/0.19-0/patterns/corkboard.pat
-share/cinepaint/0.19-0/patterns/cracked.pat
-share/cinepaint/0.19-0/patterns/crinklepaper.pat
-share/cinepaint/0.19-0/patterns/electric.pat
-share/cinepaint/0.19-0/patterns/fibers.pat
-share/cinepaint/0.19-0/patterns/granite1.pat
-share/cinepaint/0.19-0/patterns/ground1.pat
-share/cinepaint/0.19-0/patterns/ice.pat
-share/cinepaint/0.19-0/patterns/java.pat
-share/cinepaint/0.19-0/patterns/leather.pat
-share/cinepaint/0.19-0/patterns/leaves.pat
-share/cinepaint/0.19-0/patterns/leopard.pat
-share/cinepaint/0.19-0/patterns/lightning.pat
-share/cinepaint/0.19-0/patterns/marble1.pat
-share/cinepaint/0.19-0/patterns/marble2.pat
-share/cinepaint/0.19-0/patterns/marble3.pat
-share/cinepaint/0.19-0/patterns/nops.pat
-share/cinepaint/0.19-0/patterns/paper.pat
-share/cinepaint/0.19-0/patterns/parque1.pat
-share/cinepaint/0.19-0/patterns/parque2.pat
-share/cinepaint/0.19-0/patterns/parque3.pat
-share/cinepaint/0.19-0/patterns/pastel.pat
-share/cinepaint/0.19-0/patterns/pine.pat
-share/cinepaint/0.19-0/patterns/pink_marble.pat
-share/cinepaint/0.19-0/patterns/pool.pat
-share/cinepaint/0.19-0/patterns/qube1.pat
-share/cinepaint/0.19-0/patterns/rain.pat
-share/cinepaint/0.19-0/patterns/recessed.pat
-share/cinepaint/0.19-0/patterns/redcube.pat
-share/cinepaint/0.19-0/patterns/rock.pat
-share/cinepaint/0.19-0/patterns/sky.pat
-share/cinepaint/0.19-0/patterns/slate.pat
-share/cinepaint/0.19-0/patterns/sm_squares.pat
-share/cinepaint/0.19-0/patterns/starfield.pat
-share/cinepaint/0.19-0/patterns/stone33.pat
-share/cinepaint/0.19-0/patterns/terra.pat
-share/cinepaint/0.19-0/patterns/walnut.pat
-share/cinepaint/0.19-0/patterns/warning.pat
-share/cinepaint/0.19-0/patterns/wood1.pat
-share/cinepaint/0.19-0/patterns/wood2.pat
-share/cinepaint/0.19-0/patterns/wood3.pat
-share/cinepaint/0.19-0/patterns/wood4.pat
-share/cinepaint/0.19-0/patterns/wood5.pat
-share/cinepaint/0.19-0/ps-menurc
-share/cinepaint/0.19-0/spot.splash.ppm
-share/cinepaint/0.19-0/tips.txt
-share/cinepaint/0.19-0/user_install
-@dirrm share/cinepaint/0.19-0/patterns
-@dirrm share/cinepaint/0.19-0/palettes
-@dirrm share/cinepaint/0.19-0/gradients
-@dirrm share/cinepaint/0.19-0/brushes
-@dirrm share/cinepaint/0.19-0
+share/cinepaint/0.19-1/brushes/10x10square.gbr
+share/cinepaint/0.19-1/brushes/10x10square16.gbr
+share/cinepaint/0.19-1/brushes/10x10squareBlur.gbr
+share/cinepaint/0.19-1/brushes/10x10squareBlur16.gbr
+share/cinepaint/0.19-1/brushes/10x10squareBlurf16.gbr
+share/cinepaint/0.19-1/brushes/10x10squaref16.gbr
+share/cinepaint/0.19-1/brushes/11circle.gbr
+share/cinepaint/0.19-1/brushes/11circle16.gbr
+share/cinepaint/0.19-1/brushes/11circlef16.gbr
+share/cinepaint/0.19-1/brushes/11fcircle.gbr
+share/cinepaint/0.19-1/brushes/11fcirclef16.gbr
+share/cinepaint/0.19-1/brushes/13circle.gbr
+share/cinepaint/0.19-1/brushes/13circle16.gbr
+share/cinepaint/0.19-1/brushes/13circlef16.gbr
+share/cinepaint/0.19-1/brushes/13fcircle.gbr
+share/cinepaint/0.19-1/brushes/13fcirclef16.gbr
+share/cinepaint/0.19-1/brushes/15circle.gbr
+share/cinepaint/0.19-1/brushes/15circle16.gbr
+share/cinepaint/0.19-1/brushes/15circlef16.gbr
+share/cinepaint/0.19-1/brushes/15fcircle.gbr
+share/cinepaint/0.19-1/brushes/15fcirclef16.gbr
+share/cinepaint/0.19-1/brushes/17circle.gbr
+share/cinepaint/0.19-1/brushes/17circle16.gbr
+share/cinepaint/0.19-1/brushes/17circlef16.gbr
+share/cinepaint/0.19-1/brushes/17fcircle.gbr
+share/cinepaint/0.19-1/brushes/17fcirclef16.gbr
+share/cinepaint/0.19-1/brushes/19circle.gbr
+share/cinepaint/0.19-1/brushes/19circle16.gbr
+share/cinepaint/0.19-1/brushes/19circlef16.gbr
+share/cinepaint/0.19-1/brushes/19fcircle.gbr
+share/cinepaint/0.19-1/brushes/19fcirclef16.gbr
+share/cinepaint/0.19-1/brushes/1circle.gbr
+share/cinepaint/0.19-1/brushes/1circlef16.gbr
+share/cinepaint/0.19-1/brushes/20x20square.gbr
+share/cinepaint/0.19-1/brushes/20x20square16.gbr
+share/cinepaint/0.19-1/brushes/20x20squareBlur.gbr
+share/cinepaint/0.19-1/brushes/20x20squareBlur16.gbr
+share/cinepaint/0.19-1/brushes/20x20squareBlurf16.gbr
+share/cinepaint/0.19-1/brushes/20x20squaref16.gbr
+share/cinepaint/0.19-1/brushes/3circle.gbr
+share/cinepaint/0.19-1/brushes/3circle16.gbr
+share/cinepaint/0.19-1/brushes/3circlef16.gbr
+share/cinepaint/0.19-1/brushes/3fcircle.gbr
+share/cinepaint/0.19-1/brushes/3fcirclef16.gbr
+share/cinepaint/0.19-1/brushes/5circle.gbr
+share/cinepaint/0.19-1/brushes/5circle16.gbr
+share/cinepaint/0.19-1/brushes/5circlef16.gbr
+share/cinepaint/0.19-1/brushes/5fcircle.gbr
+share/cinepaint/0.19-1/brushes/5fcirclef16.gbr
+share/cinepaint/0.19-1/brushes/5x5square.gbr
+share/cinepaint/0.19-1/brushes/5x5square16.gbr
+share/cinepaint/0.19-1/brushes/5x5squareBlur.gbr
+share/cinepaint/0.19-1/brushes/5x5squareBlur16.gbr
+share/cinepaint/0.19-1/brushes/5x5squareBlurf16.gbr
+share/cinepaint/0.19-1/brushes/5x5squaref16.gbr
+share/cinepaint/0.19-1/brushes/7circle.gbr
+share/cinepaint/0.19-1/brushes/7circle16.gbr
+share/cinepaint/0.19-1/brushes/7circlef16.gbr
+share/cinepaint/0.19-1/brushes/7fcircle.gbr
+share/cinepaint/0.19-1/brushes/7fcirclef16.gbr
+share/cinepaint/0.19-1/brushes/9circle.gbr
+share/cinepaint/0.19-1/brushes/9circle16.gbr
+share/cinepaint/0.19-1/brushes/9circlef16.gbr
+share/cinepaint/0.19-1/brushes/9fcircle.gbr
+share/cinepaint/0.19-1/brushes/9fcirclef16.gbr
+share/cinepaint/0.19-1/brushes/DStar11.gbr
+share/cinepaint/0.19-1/brushes/DStar17.gbr
+share/cinepaint/0.19-1/brushes/DStar25.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal01.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal02.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal03.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal04.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal05.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal06.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal07.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal08.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal09.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal10.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal11.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal12.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal13.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal14.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal15.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal16.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal17.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal18.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal19.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal20.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal21.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal22.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal23.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal24.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal25.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal26.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal27.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal28.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal29.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal30.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal31.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal32.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal33.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal34.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal35.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal36.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal37.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal38.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal39.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal40.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal41.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal42.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal43.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal44.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal45.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal46.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal47.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal48.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal49.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal50.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal51.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal52.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal53.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal54.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal55.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal56.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal57.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal58.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal59.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal60.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal61.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal62.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal63.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal64.gbr
+share/cinepaint/0.19-1/brushes/NS1-Charcoal65.gbr
+share/cinepaint/0.19-1/brushes/SketchBrush-16.gih
+share/cinepaint/0.19-1/brushes/SketchBrush-32.gih
+share/cinepaint/0.19-1/brushes/SketchBrush-64.gih
+share/cinepaint/0.19-1/brushes/callig1.gbr
+share/cinepaint/0.19-1/brushes/callig116.gbr
+share/cinepaint/0.19-1/brushes/callig1f16.gbr
+share/cinepaint/0.19-1/brushes/callig2.gbr
+share/cinepaint/0.19-1/brushes/callig216.gbr
+share/cinepaint/0.19-1/brushes/callig2f16.gbr
+share/cinepaint/0.19-1/brushes/callig3.gbr
+share/cinepaint/0.19-1/brushes/callig316.gbr
+share/cinepaint/0.19-1/brushes/callig3f16.gbr
+share/cinepaint/0.19-1/brushes/callig4.gbr
+share/cinepaint/0.19-1/brushes/callig416.gbr
+share/cinepaint/0.19-1/brushes/callig4f16.gbr
+share/cinepaint/0.19-1/brushes/confetti.gbr
+share/cinepaint/0.19-1/brushes/confetti.gih
+share/cinepaint/0.19-1/brushes/confetti16.gbr
+share/cinepaint/0.19-1/brushes/confettif16.gbr
+share/cinepaint/0.19-1/brushes/dunes.gbr
+share/cinepaint/0.19-1/brushes/dunes16.gbr
+share/cinepaint/0.19-1/brushes/dunesf16.gbr
+share/cinepaint/0.19-1/brushes/feltpen.gih
+share/cinepaint/0.19-1/brushes/galaxy.gbr
+share/cinepaint/0.19-1/brushes/galaxy16.gbr
+share/cinepaint/0.19-1/brushes/galaxy_big.gbr
+share/cinepaint/0.19-1/brushes/galaxy_big16.gbr
+share/cinepaint/0.19-1/brushes/galaxy_bigf16.gbr
+share/cinepaint/0.19-1/brushes/galaxy_small.gbr
+share/cinepaint/0.19-1/brushes/galaxy_small16.gbr
+share/cinepaint/0.19-1/brushes/galaxy_smallf16.gbr
+share/cinepaint/0.19-1/brushes/galaxyf16.gbr
+share/cinepaint/0.19-1/brushes/hsparks.gih
+share/cinepaint/0.19-1/brushes/pepper.gbr
+share/cinepaint/0.19-1/brushes/pixel.gbr
+share/cinepaint/0.19-1/brushes/pixel16.gbr
+share/cinepaint/0.19-1/brushes/pixelf16.gbr
+share/cinepaint/0.19-1/brushes/thegimp.gbr
+share/cinepaint/0.19-1/brushes/thegimp16.gbr
+share/cinepaint/0.19-1/brushes/thegimpf16.gbr
+share/cinepaint/0.19-1/brushes/vine.gih
+share/cinepaint/0.19-1/brushes/xcf.gbr
+share/cinepaint/0.19-1/brushes/xcf16.gbr
+share/cinepaint/0.19-1/brushes/xcff16.gbr
+share/cinepaint/0.19-1/gimprc
+share/cinepaint/0.19-1/gimprc_user
+share/cinepaint/0.19-1/gradients/Abstract_1
+share/cinepaint/0.19-1/gradients/Abstract_2
+share/cinepaint/0.19-1/gradients/Abstract_3
+share/cinepaint/0.19-1/gradients/Aneurism
+share/cinepaint/0.19-1/gradients/Blinds
+share/cinepaint/0.19-1/gradients/Blue_Green
+share/cinepaint/0.19-1/gradients/Browns
+share/cinepaint/0.19-1/gradients/Brushed_Aluminium
+share/cinepaint/0.19-1/gradients/Burning_Paper
+share/cinepaint/0.19-1/gradients/Burning_Transparency
+share/cinepaint/0.19-1/gradients/CD
+share/cinepaint/0.19-1/gradients/CD_Half
+share/cinepaint/0.19-1/gradients/Caribbean_Blues
+share/cinepaint/0.19-1/gradients/Coffee
+share/cinepaint/0.19-1/gradients/Cold_Steel
+share/cinepaint/0.19-1/gradients/Cold_Steel_2
+share/cinepaint/0.19-1/gradients/Crown_molding
+share/cinepaint/0.19-1/gradients/Danish_flag
+share/cinepaint/0.19-1/gradients/Dark_1
+share/cinepaint/0.19-1/gradients/Deep_Sea
+share/cinepaint/0.19-1/gradients/Default
+share/cinepaint/0.19-1/gradients/Flare_Glow_Angular_1
+share/cinepaint/0.19-1/gradients/Flare_Glow_Radial_1
+share/cinepaint/0.19-1/gradients/Flare_Glow_Radial_2
+share/cinepaint/0.19-1/gradients/Flare_Glow_Radial_3
+share/cinepaint/0.19-1/gradients/Flare_Glow_Radial_4
+share/cinepaint/0.19-1/gradients/Flare_Radial_101
+share/cinepaint/0.19-1/gradients/Flare_Radial_102
+share/cinepaint/0.19-1/gradients/Flare_Radial_103
+share/cinepaint/0.19-1/gradients/Flare_Rays_Radial_1
+share/cinepaint/0.19-1/gradients/Flare_Rays_Radial_2
+share/cinepaint/0.19-1/gradients/Flare_Rays_Size_1
+share/cinepaint/0.19-1/gradients/Flare_Sizefac_101
+share/cinepaint/0.19-1/gradients/Four_bars
+share/cinepaint/0.19-1/gradients/French_flag
+share/cinepaint/0.19-1/gradients/French_flag_smooth
+share/cinepaint/0.19-1/gradients/Full_saturation_spectrum_CCW
+share/cinepaint/0.19-1/gradients/Full_saturation_spectrum_CW
+share/cinepaint/0.19-1/gradients/German_flag
+share/cinepaint/0.19-1/gradients/German_flag_smooth
+share/cinepaint/0.19-1/gradients/Golden
+share/cinepaint/0.19-1/gradients/Greens
+share/cinepaint/0.19-1/gradients/Horizon_1
+share/cinepaint/0.19-1/gradients/Horizon_2
+share/cinepaint/0.19-1/gradients/Incandescent
+share/cinepaint/0.19-1/gradients/Land_1
+share/cinepaint/0.19-1/gradients/Land_and_Sea
+share/cinepaint/0.19-1/gradients/Metallic_Something
+share/cinepaint/0.19-1/gradients/Mexican_flag
+share/cinepaint/0.19-1/gradients/Mexican_flag_smooth
+share/cinepaint/0.19-1/gradients/Nauseating_Headache
+share/cinepaint/0.19-1/gradients/Neon_Cyan
+share/cinepaint/0.19-1/gradients/Neon_Green
+share/cinepaint/0.19-1/gradients/Neon_Yellow
+share/cinepaint/0.19-1/gradients/Pastel_Rainbow
+share/cinepaint/0.19-1/gradients/Pastels
+share/cinepaint/0.19-1/gradients/Purples
+share/cinepaint/0.19-1/gradients/Radial_Eyeball_Blue
+share/cinepaint/0.19-1/gradients/Radial_Eyeball_Brown
+share/cinepaint/0.19-1/gradients/Radial_Eyeball_Green
+share/cinepaint/0.19-1/gradients/Radial_Glow_1
+share/cinepaint/0.19-1/gradients/Radial_Rainbow_Hoop
+share/cinepaint/0.19-1/gradients/Romanian_flag
+share/cinepaint/0.19-1/gradients/Romanian_flag_smooth
+share/cinepaint/0.19-1/gradients/Rounded_edge
+share/cinepaint/0.19-1/gradients/Shadows_1
+share/cinepaint/0.19-1/gradients/Shadows_2
+share/cinepaint/0.19-1/gradients/Shadows_3
+share/cinepaint/0.19-1/gradients/Skyline
+share/cinepaint/0.19-1/gradients/Skyline_polluted
+share/cinepaint/0.19-1/gradients/Square_Wood_Frame
+share/cinepaint/0.19-1/gradients/Sunrise
+share/cinepaint/0.19-1/gradients/Three_bars_sin
+share/cinepaint/0.19-1/gradients/Tropical_Colors
+share/cinepaint/0.19-1/gradients/Tube_Red
+share/cinepaint/0.19-1/gradients/Wood_1
+share/cinepaint/0.19-1/gradients/Wood_2
+share/cinepaint/0.19-1/gradients/Yellow_Contrast
+share/cinepaint/0.19-1/gradients/Yellow_Orange
+share/cinepaint/0.19-1/gtkrc
+share/cinepaint/0.19-1/gtkrc.forest2
+share/cinepaint/0.19-1/palettes/Bears
+share/cinepaint/0.19-1/palettes/Bgold
+share/cinepaint/0.19-1/palettes/Blues
+share/cinepaint/0.19-1/palettes/Borders
+share/cinepaint/0.19-1/palettes/Browns_And_Yellows
+share/cinepaint/0.19-1/palettes/Caramel
+share/cinepaint/0.19-1/palettes/Cascade
+share/cinepaint/0.19-1/palettes/China
+share/cinepaint/0.19-1/palettes/Coldfire
+share/cinepaint/0.19-1/palettes/Cool_Colors
+share/cinepaint/0.19-1/palettes/Cranes
+share/cinepaint/0.19-1/palettes/Dark_pastels
+share/cinepaint/0.19-1/palettes/Default
+share/cinepaint/0.19-1/palettes/Ega
+share/cinepaint/0.19-1/palettes/Firecode
+share/cinepaint/0.19-1/palettes/Gold
+share/cinepaint/0.19-1/palettes/GrayViolet
+share/cinepaint/0.19-1/palettes/Grayblue
+share/cinepaint/0.19-1/palettes/Grays
+share/cinepaint/0.19-1/palettes/Greens
+share/cinepaint/0.19-1/palettes/Hilite
+share/cinepaint/0.19-1/palettes/Kahki
+share/cinepaint/0.19-1/palettes/Lights
+share/cinepaint/0.19-1/palettes/Muted
+share/cinepaint/0.19-1/palettes/Named_Colors
+share/cinepaint/0.19-1/palettes/News3
+share/cinepaint/0.19-1/palettes/Op2
+share/cinepaint/0.19-1/palettes/Paintjet
+share/cinepaint/0.19-1/palettes/Pastels
+share/cinepaint/0.19-1/palettes/Plasma
+share/cinepaint/0.19-1/palettes/Reds
+share/cinepaint/0.19-1/palettes/Reds_And_Purples
+share/cinepaint/0.19-1/palettes/Royal
+share/cinepaint/0.19-1/palettes/Topographic
+share/cinepaint/0.19-1/palettes/Visibone
+share/cinepaint/0.19-1/palettes/Visibone2
+share/cinepaint/0.19-1/palettes/Volcano
+share/cinepaint/0.19-1/palettes/Warm_Colors
+share/cinepaint/0.19-1/palettes/Web
+share/cinepaint/0.19-1/patterns/3dgreen.pat
+share/cinepaint/0.19-1/patterns/Craters.pat
+share/cinepaint/0.19-1/patterns/Moonfoot.pat
+share/cinepaint/0.19-1/patterns/amethyst.pat
+share/cinepaint/0.19-1/patterns/bark.pat
+share/cinepaint/0.19-1/patterns/blue.pat
+share/cinepaint/0.19-1/patterns/bluegrid.pat
+share/cinepaint/0.19-1/patterns/bluesquares.pat
+share/cinepaint/0.19-1/patterns/blueweb.pat
+share/cinepaint/0.19-1/patterns/brick.pat
+share/cinepaint/0.19-1/patterns/burlap.pat
+share/cinepaint/0.19-1/patterns/burlwood.pat
+share/cinepaint/0.19-1/patterns/choc_swirl.pat
+share/cinepaint/0.19-1/patterns/corkboard.pat
+share/cinepaint/0.19-1/patterns/cracked.pat
+share/cinepaint/0.19-1/patterns/crinklepaper.pat
+share/cinepaint/0.19-1/patterns/electric.pat
+share/cinepaint/0.19-1/patterns/fibers.pat
+share/cinepaint/0.19-1/patterns/granite1.pat
+share/cinepaint/0.19-1/patterns/ground1.pat
+share/cinepaint/0.19-1/patterns/ice.pat
+share/cinepaint/0.19-1/patterns/java.pat
+share/cinepaint/0.19-1/patterns/leather.pat
+share/cinepaint/0.19-1/patterns/leaves.pat
+share/cinepaint/0.19-1/patterns/leopard.pat
+share/cinepaint/0.19-1/patterns/lightning.pat
+share/cinepaint/0.19-1/patterns/marble1.pat
+share/cinepaint/0.19-1/patterns/marble2.pat
+share/cinepaint/0.19-1/patterns/marble3.pat
+share/cinepaint/0.19-1/patterns/nops.pat
+share/cinepaint/0.19-1/patterns/paper.pat
+share/cinepaint/0.19-1/patterns/parque1.pat
+share/cinepaint/0.19-1/patterns/parque2.pat
+share/cinepaint/0.19-1/patterns/parque3.pat
+share/cinepaint/0.19-1/patterns/pastel.pat
+share/cinepaint/0.19-1/patterns/pine.pat
+share/cinepaint/0.19-1/patterns/pink_marble.pat
+share/cinepaint/0.19-1/patterns/pool.pat
+share/cinepaint/0.19-1/patterns/qube1.pat
+share/cinepaint/0.19-1/patterns/rain.pat
+share/cinepaint/0.19-1/patterns/recessed.pat
+share/cinepaint/0.19-1/patterns/redcube.pat
+share/cinepaint/0.19-1/patterns/rock.pat
+share/cinepaint/0.19-1/patterns/sky.pat
+share/cinepaint/0.19-1/patterns/slate.pat
+share/cinepaint/0.19-1/patterns/sm_squares.pat
+share/cinepaint/0.19-1/patterns/starfield.pat
+share/cinepaint/0.19-1/patterns/stone33.pat
+share/cinepaint/0.19-1/patterns/terra.pat
+share/cinepaint/0.19-1/patterns/walnut.pat
+share/cinepaint/0.19-1/patterns/warning.pat
+share/cinepaint/0.19-1/patterns/wood1.pat
+share/cinepaint/0.19-1/patterns/wood2.pat
+share/cinepaint/0.19-1/patterns/wood3.pat
+share/cinepaint/0.19-1/patterns/wood4.pat
+share/cinepaint/0.19-1/patterns/wood5.pat
+share/cinepaint/0.19-1/ps-menurc
+share/cinepaint/0.19-1/spot.splash.ppm
+share/cinepaint/0.19-1/tips.txt
+share/cinepaint/0.19-1/user_install
+@dirrm share/cinepaint/0.19-1/patterns
+@dirrm share/cinepaint/0.19-1/palettes
+@dirrm share/cinepaint/0.19-1/gradients
+@dirrm share/cinepaint/0.19-1/brushes
+@dirrm share/cinepaint/0.19-1
 @dirrm share/cinepaint
-@dirrm lib/cinepaint/0.19-0/plug-ins
-@dirrm lib/cinepaint/0.19-0
+@dirrm lib/cinepaint/0.19-1/plug-ins
+@dirrm lib/cinepaint/0.19-1
 @dirrm lib/cinepaint
diff --git a/graphics/cinepaint/distinfo b/graphics/cinepaint/distinfo
index 169ef03d6a0..e8c773b88dd 100644
--- a/graphics/cinepaint/distinfo
+++ b/graphics/cinepaint/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.4 2005/03/16 18:32:50 rillig Exp $
+$NetBSD: distinfo,v 1.5 2005/07/04 19:57:01 drochner Exp $
 
-SHA1 (cinepaint-0.19-0.tar.gz) = ce3f3cb9cc26bacd8a9b99b6059caad967e59297
-RMD160 (cinepaint-0.19-0.tar.gz) = eec10941ae75c6ef7213ea4f5649bbb6937f4bcc
-Size (cinepaint-0.19-0.tar.gz) = 7218293 bytes
+SHA1 (cinepaint-0.19-1.tar.gz) = fb8a04d9a4dd0959a75a4b9c9a927e1ca2c0700f
+RMD160 (cinepaint-0.19-1.tar.gz) = 71337ea41ecec71fed8827c4aed0dcc3176910eb
+Size (cinepaint-0.19-1.tar.gz) = 7317730 bytes
 SHA1 (patch-aa) = 2259896756f3371589b4a83655e4c118d0247302
 SHA1 (patch-ab) = 1e03ffb0deab12b229f2604083bd3515a80747ac
 SHA1 (patch-ac) = 106b4569e627692566abc1f2d2175df01ae76fea
-SHA1 (patch-ad) = 86e3677cea5bf24c749f1771943ef18808eb1d14
+SHA1 (patch-ad) = 4d36cc56b32a04fdcc4428a778ff8d88435fea3a
 SHA1 (patch-ae) = 188e453a0a2b5fdf7ce3ec7db889d08071a57bd3
 SHA1 (patch-af) = 313f9fe908217de89ba9b02bd98cb28761d188ba
 SHA1 (patch-ag) = 25dff8ba05f414d4dde3356dfc71624f6fdb8a60
diff --git a/graphics/cinepaint/patches/patch-ad b/graphics/cinepaint/patches/patch-ad
index 24a0f6dd8c6..178235042bb 100644
--- a/graphics/cinepaint/patches/patch-ad
+++ b/graphics/cinepaint/patches/patch-ad
@@ -1,10 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2005/03/16 18:32:50 rillig Exp $
+$NetBSD: patch-ad,v 1.2 2005/07/04 19:57:01 drochner Exp $
 
-gcc-2.95.3 cannot handle declarations intermixed with code.
-
---- app/cms.c.orig	Tue Nov 23 12:58:15 2004
-+++ app/cms.c	Wed Mar 16 18:11:19 2005
-@@ -202,7 +202,12 @@ erase_alpha_from_4th_color (CMSTransform
+--- app/cms.c.orig	2005-05-24 20:51:25.000000000 +0200
++++ app/cms.c
+@@ -208,7 +208,12 @@ erase_alpha_from_4th_color (CMSTransform
   * called from app_procs.c:app_init()
   */
  void cms_init()
@@ -18,7 +16,7 @@ gcc-2.95.3 cannot handle declarations intermixed with code.
      transform_cache = g_hash_table_new(g_str_hash, g_str_equal);         
      profile_info_buffer = g_new(CMSProfileInfo, 1);
      profile_info_buffer->manufacturer = NULL;
-@@ -216,9 +221,6 @@ void cms_init()
+@@ -222,9 +227,6 @@ void cms_init()
      /* suppress lcms errors while checking */
      cmsErrorAction(LCMS_ERROR_IGNORE);     
  
@@ -28,7 +26,7 @@ gcc-2.95.3 cannot handle declarations intermixed with code.
  
      /* 1. image profile */
      if (cms_default_image_profile_name != NULL)
-@@ -476,11 +478,12 @@ cms_read_icc_profile_dir(gchar *path, ic
+@@ -525,11 +527,12 @@ cms_read_icc_profile_dir(gchar *path, ic
      while ((entry = readdir (dir)))
      {   char *file_name = entry->d_name;
          cmsHPROFILE profile;
@@ -42,7 +40,7 @@ gcc-2.95.3 cannot handle declarations intermixed with code.
  	g_string_sprintf (file_path, "%s/%s", path, file_name);
  
  	/* Open the file and try to read it using the lcms library
-@@ -517,6 +520,7 @@ cms_read_standard_profile_dirs(icProfile
+@@ -566,6 +569,7 @@ cms_read_standard_profile_dirs(icProfile
      const char *home = GetDirHome();
      char *directories = g_strdup(cms_profile_path);
      GString *file_path = g_string_new(NULL);
@@ -50,7 +48,7 @@ gcc-2.95.3 cannot handle declarations intermixed with code.
  
      /* process path by path, paths are separated by : */
      char *remaining_directories = directories;    
-@@ -531,7 +535,7 @@ cms_read_standard_profile_dirs(icProfile
+@@ -580,7 +584,7 @@ cms_read_standard_profile_dirs(icProfile
          {   path = strdup(token);
  	} 
  
@@ -59,24 +57,24 @@ gcc-2.95.3 cannot handle declarations intermixed with code.
  	return_list = g_slist_concat(return_list, sub_list);
  
  	g_free(path);
-@@ -673,6 +677,7 @@ cms_load_profile_to_mem (char* filename,
+@@ -729,6 +733,7 @@ cms_load_profile_to_mem (char* filename,
  CMSProfile *
  cms_get_profile_from_file(char *file_name)
  {   CMSProfile *return_value;
 +    ProfileCacheEntry *cache_entry;
-     
-     /* get profile information */ 
-     cmsHPROFILE profile = cmsOpenProfileFromFile (file_name, "r");
-@@ -682,7 +687,7 @@ cms_get_profile_from_file(char *file_nam
-     }
+     size_t size_order = 128;
+     char *mem = 0;
+     const char *keyname = 0; 
+@@ -743,7 +748,7 @@ cms_get_profile_from_file(char *file_nam
+     keyname = cms_get_profile_keyname (profile, mem);
   
      /* check hash table for profile */ 
 -    ProfileCacheEntry *cache_entry = g_hash_table_lookup(profile_cache, 
 +    cache_entry = g_hash_table_lookup(profile_cache, 
- 							 (gpointer) cms_get_long_profile_info(profile));
+ 							 (gpointer) cms_get_profile_keyname(profile,mem));
      if (cache_entry != NULL) 
      {   cache_entry->ref_count ++;
-@@ -719,7 +724,8 @@ cms_get_profile_from_file(char *file_nam
+@@ -783,7 +788,8 @@ cms_get_profile_from_file(char *file_nam
  CMSProfile *
  cms_get_profile_from_mem(void *mem_pointer, DWORD size)
  {   CMSProfile *return_value;
@@ -86,16 +84,16 @@ gcc-2.95.3 cannot handle declarations intermixed with code.
      /* get profile information */ 
      cmsHPROFILE profile = cmsOpenProfileFromMem (mem_pointer, size);
      if (profile == NULL)
-@@ -728,7 +734,7 @@ cms_get_profile_from_mem(void *mem_point
+@@ -792,7 +798,7 @@ cms_get_profile_from_mem(void *mem_point
      }   
  
      /* check hash table for profile */ 
 -    ProfileCacheEntry *cache_entry = g_hash_table_lookup(profile_cache, 
 +    cache_entry = g_hash_table_lookup(profile_cache, 
- 							 (gpointer) cms_get_long_profile_info(profile));
+ 							 (gpointer) cms_get_profile_keyname(profile,mem_pointer));
      if (cache_entry != NULL) 
      {   cache_entry->ref_count ++;
-@@ -788,6 +794,7 @@ cms_get_profile_data(CMSProfile *profile
+@@ -852,6 +858,7 @@ cms_get_profile_data(CMSProfile *profile
  CMSProfile *
  cms_get_lab_profile(LPcmsCIExyY white_point) 
  {   CMSProfile *return_value;
@@ -103,7 +101,7 @@ gcc-2.95.3 cannot handle declarations intermixed with code.
  
      GString *hash_key = g_string_new(NULL); 
      if (white_point) 
-@@ -797,7 +804,7 @@ cms_get_lab_profile(LPcmsCIExyY white_po
+@@ -861,7 +868,7 @@ cms_get_lab_profile(LPcmsCIExyY white_po
      {   g_string_sprintf(hash_key, "###LAB###");
      }
  
@@ -112,7 +110,7 @@ gcc-2.95.3 cannot handle declarations intermixed with code.
      if (cache_entry != NULL) 
      {   cache_entry->ref_count ++;
          return_value = cache_entry->profile;
-@@ -970,12 +977,13 @@ cms_return_profile(CMSProfile *profile)
+@@ -1034,12 +1041,13 @@ cms_return_profile(CMSProfile *profile)
  {   /* search the cache for the profile 
       * decreate ref_counter + possibly close profile 
       */  
@@ -127,7 +125,7 @@ gcc-2.95.3 cannot handle declarations intermixed with code.
      if (entry == NULL)
      {   g_warning("cms_return_profile: profile not found in cache");
          return FALSE;
-@@ -1008,7 +1016,18 @@ cms_get_transform(GSList *profiles,
+@@ -1072,7 +1080,18 @@ cms_get_transform(GSList *profiles,
  {   /* turn profiles into an array as needed by lcms + 
         check all profiles are registered with the profile cache + 
         create hash key to check transform cache */
@@ -146,7 +144,7 @@ gcc-2.95.3 cannot handle declarations intermixed with code.
      if (num_profiles == 0)
      {   g_warning("cms_get_transform: profile list is empty, cannot create transfrom");
          return NULL;
-@@ -1028,12 +1047,9 @@ cms_get_transform(GSList *profiles,
+@@ -1092,12 +1111,9 @@ cms_get_transform(GSList *profiles,
          return NULL;
      }
  
@@ -161,7 +159,7 @@ gcc-2.95.3 cannot handle declarations intermixed with code.
      for (i=0; ((i<num_profiles) && (iterator !=NULL)); i++) 
      {   current_profile = (CMSProfile *)iterator->data;
          if (g_hash_table_lookup(profile_cache, (gpointer)current_profile->cache_key) == NULL) 
-@@ -1050,7 +1066,7 @@ cms_get_transform(GSList *profiles,
+@@ -1114,7 +1130,7 @@ cms_get_transform(GSList *profiles,
                                             lcms_intent, lcms_flags);
  
      /* now check the cache */
@@ -170,7 +168,7 @@ gcc-2.95.3 cannot handle declarations intermixed with code.
  
      /* if it was in the disc cache */
      if (cache_entry != NULL) 
-@@ -1079,7 +1095,6 @@ cms_get_transform(GSList *profiles,
+@@ -1143,7 +1159,6 @@ cms_get_transform(GSList *profiles,
      }
  
      /* if no cache hit, create transform */
@@ -178,7 +176,7 @@ gcc-2.95.3 cannot handle declarations intermixed with code.
          transform = cmsCreateMultiprofileTransform  (profile_array,
  						     num_profiles,
  						     lcms_input_format,
-@@ -1093,8 +1108,8 @@ cms_get_transform(GSList *profiles,
+@@ -1157,8 +1172,8 @@ cms_get_transform(GSList *profiles,
      }							     
  
      /* save it to disk */
@@ -189,7 +187,7 @@ gcc-2.95.3 cannot handle declarations intermixed with code.
      _cmsSaveProfile(devicelink, file_name);
      cmsCloseProfile(devicelink);
  
-@@ -1218,6 +1233,12 @@ cms_set_display_profile(CMSProfile *prof
+@@ -1282,6 +1297,12 @@ cms_set_display_profile(CMSProfile *prof
  void 
  cms_transform_area(CMSTransform *transform, PixelArea *src_area, PixelArea *dest_area) 
  {   TransformFunc transform_func;
@@ -202,7 +200,7 @@ gcc-2.95.3 cannot handle declarations intermixed with code.
      Tag src_tag = pixelarea_tag(src_area); 
      Tag dest_tag = pixelarea_tag(dest_area); 
      if (tag_precision(src_tag) != tag_precision(dest_tag)) 
-@@ -1245,12 +1266,6 @@ cms_transform_area(CMSTransform *transfo
+@@ -1309,12 +1330,6 @@ cms_transform_area(CMSTransform *transfo
      }
  
  
@@ -215,17 +213,16 @@ gcc-2.95.3 cannot handle declarations intermixed with code.
      for (pag = pixelarea_register (1, src_area, dest_area);
  	 pag != NULL;
  	 pag = pixelarea_process (pag))
-@@ -1321,6 +1336,9 @@ void
+@@ -1385,6 +1400,8 @@ void
  cms_transform_float(CMSTransform *transform, void *src_data, void *dest_data, int num_pixels) 
  {   /* need to convert data to double for lcms's convenience */
      int i;
 +    float *src_fbuffer, *dest_fbuffer;
 +    double *dbuffer;
-+
-     if (transform <= 1 || !transform->handle)
+     if (!transform || !transform->handle)
          g_warning ("%s:%d %s() transform not allocated\n",
                     __FILE__,__LINE__,__func__);
-@@ -1328,9 +1346,9 @@ cms_transform_float(CMSTransform *transf
+@@ -1392,9 +1409,9 @@ cms_transform_float(CMSTransform *transf
          g_warning ("%s:%d %s() array not allocated\n",
                     __FILE__,__LINE__,__func__);
  
@@ -238,7 +235,7 @@ gcc-2.95.3 cannot handle declarations intermixed with code.
      for (i=0; i < num_pixels * 4; i++) 
      {   dbuffer[i]=(double)src_fbuffer[i];
      }
-@@ -1371,10 +1389,14 @@ static GtkWidget *cms_profile_menu_new(G
+@@ -1463,10 +1480,14 @@ static GtkWidget *cms_profile_menu_new(G
  {   GtkWidget *menu;
      GtkWidget *menuitem;
      GtkWidget *optionmenu;
@@ -254,7 +251,7 @@ gcc-2.95.3 cannot handle declarations intermixed with code.
  
      if (can_select_none)
      {   menuitem = gtk_menu_item_new_with_label("[none]");
-@@ -1382,9 +1404,6 @@ static GtkWidget *cms_profile_menu_new(G
+@@ -1474,9 +1495,6 @@ static GtkWidget *cms_profile_menu_new(G
  	gtk_object_set_data(GTK_OBJECT(menuitem), "value", NULL);      
      }
  
@@ -264,7 +261,7 @@ gcc-2.95.3 cannot handle declarations intermixed with code.
      while (iterator != NULL)
      {   current_filename = iterator->data;
          current_profile = cms_get_profile_from_file(current_filename);
-@@ -1414,8 +1433,8 @@ static GtkWidget *cms_intent_menu_new(Gt
+@@ -1506,8 +1524,8 @@ static GtkWidget *cms_intent_menu_new(Gt
      GtkWidget *menuitem = NULL;
      GtkWidget *optionmenu = NULL;
        
@@ -274,7 +271,7 @@ gcc-2.95.3 cannot handle declarations intermixed with code.
  
      menuitem = gtk_menu_item_new_with_label ("Perceptual");
      gtk_menu_append (GTK_MENU (menu), menuitem);
-@@ -1593,6 +1612,8 @@ cms_assign_dialog(GImage *image)
+@@ -1685,6 +1703,8 @@ cms_assign_dialog(GImage *image)
      GtkWidget *label = NULL; 
      GtkWidget *vbox = NULL;
      GtkWidget *alignment = NULL;
@@ -283,7 +280,7 @@ gcc-2.95.3 cannot handle declarations intermixed with code.
  
      CMSAssignDialogData *data=g_new(CMSAssignDialogData,1); 
      data->image = image;
-@@ -1608,8 +1629,8 @@ cms_assign_dialog(GImage *image)
+@@ -1700,8 +1720,8 @@ cms_assign_dialog(GImage *image)
      table = gtk_table_new(3, 1, FALSE);
      gtk_box_pack_start (GTK_BOX (vbox), table, TRUE, TRUE, 0);
      
@@ -294,7 +291,7 @@ gcc-2.95.3 cannot handle declarations intermixed with code.
      
      if (current_profile == NULL)
      {   g_string_sprintf (profile_string, "[The currently assigned profile is: [none]]");
-@@ -1700,6 +1721,7 @@ cms_open_assign_dialog(GImage *image)
+@@ -1792,6 +1812,7 @@ cms_open_assign_dialog(GImage *image)
      GSList *radiogroup = NULL;
      GtkWidget *vbox = NULL;
      GtkWidget *alignment = NULL;
@@ -302,7 +299,7 @@ gcc-2.95.3 cannot handle declarations intermixed with code.
  
      CMSOpenAssignDialogData *data=g_new(CMSOpenAssignDialogData,1); 
      data->image = image;
-@@ -1729,7 +1751,7 @@ cms_open_assign_dialog(GImage *image)
+@@ -1821,7 +1842,7 @@ cms_open_assign_dialog(GImage *image)
  						  
      data->profile_menu = cms_profile_menu_new(GTK_TABLE(table), 1, 0, TRUE);
  
@@ -311,7 +308,7 @@ gcc-2.95.3 cannot handle declarations intermixed with code.
      if (cms_default_image_profile_name == NULL)
      {   g_string_sprintf (profile_string, "The default image profile: [none]");
      }
-@@ -1796,9 +1818,10 @@ cms_open_assign_dialog_ok_callback(GtkWi
+@@ -1888,9 +1909,10 @@ cms_open_assign_dialog_ok_callback(GtkWi
      
      /* update cms_open_action (global preference variable) */
      if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->always_default_check)))
@@ -323,7 +320,7 @@ gcc-2.95.3 cannot handle declarations intermixed with code.
  	update_settings = g_list_append(update_settings, "cms-open-action");
  	save_gimprc(&update_settings, &remove_settings); 
  	g_list_free(update_settings);
-@@ -1847,6 +1870,7 @@ cms_convert_on_open_prompt(GImage *image
+@@ -1939,6 +1961,7 @@ cms_convert_on_open_prompt(GImage *image
      GtkWidget *table;
      GtkWidget *vbox;
      GtkWidget *alignment;
@@ -331,7 +328,7 @@ gcc-2.95.3 cannot handle declarations intermixed with code.
  
      CMSConvertOnOpenPromptData *data = g_new(CMSConvertOnOpenPromptData, 1);
  
-@@ -1918,7 +1942,7 @@ cms_convert_on_open_prompt(GImage *image
+@@ -2010,7 +2033,7 @@ cms_convert_on_open_prompt(GImage *image
      data->event_loop = g_main_new(FALSE);    
      g_main_run(data->event_loop);
  
@@ -340,7 +337,7 @@ gcc-2.95.3 cannot handle declarations intermixed with code.
      g_main_destroy(data->event_loop);
      g_free(data);
  
-@@ -1931,9 +1955,9 @@ cms_convert_on_open_prompt_yes_callback 
+@@ -2023,9 +2046,9 @@ cms_convert_on_open_prompt_yes_callback 
  {   data->return_value = TRUE;  
      if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->auto_convert_check)))
      {   /* cms_auto_convert is global preference variable */