1 files changed, 138 insertions, 55 deletions

diff --git a/graphics/kdegraphics3/pkg-plist b/graphics/kdegraphics3/pkg-plist
index c4ac456109f2..cf7151a48c11 100644
--- a/graphics/kdegraphics3/pkg-plist
+++ b/graphics/kdegraphics3/pkg-plist
@@ -4,7 +4,7 @@ bin/kdvi
 bin/kfax
 bin/kghostview
 bin/kiconedit
-bin/kpaint
+bin/kolourpaint
 bin/kpdf
 bin/kpovmodeler
 bin/kruler
@@ -175,6 +175,8 @@ include/ksvg/ksvg_plugin.h
 include/libtext2path-0.1/BezierPath.h
 include/libtext2path-0.1/Glyph.h
 include/libtext2path-0.1/GlyphTracer.h
+lib/kde3/gsthumbnail.la
+lib/kde3/gsthumbnail.so
 lib/kde3/kcm_kgamma.la
 lib/kde3/kcm_kgamma.so
 lib/kde3/kcm_kmrml.la
@@ -199,6 +201,8 @@ lib/kde3/kfile_bmp.la
 lib/kde3/kfile_bmp.so
 lib/kde3/kfile_dvi.la
 lib/kde3/kfile_dvi.so
+lib/kde3/kfile_exr.la
+lib/kde3/kfile_exr.so
 lib/kde3/kfile_ico.la
 lib/kde3/kfile_ico.so
 lib/kde3/kfile_jpeg.la
@@ -213,6 +217,8 @@ lib/kde3/kfile_pnm.la
 lib/kde3/kfile_pnm.so
 lib/kde3/kfile_ps.la
 lib/kde3/kfile_ps.so
+lib/kde3/kfile_rgb.la
+lib/kde3/kfile_rgb.so
 lib/kde3/kfile_tga.la
 lib/kde3/kfile_tga.so
 lib/kde3/kfile_tiff.la
@@ -280,22 +286,19 @@ share/applications/kde/kcolorchooser.desktop
 share/applications/kde/kcoloredit.desktop
 share/applications/kde/kdvi.desktop
 share/applications/kde/kfax.desktop
+share/applications/kde/kgamma.desktop
 share/applications/kde/kghostview.desktop
 share/applications/kde/kiconedit.desktop
-share/applications/kde/kpaint.desktop
+share/applications/kde/kolourpaint.desktop
 share/applications/kde/kpdf.desktop
 share/applications/kde/kpovmodeler.desktop
 share/applications/kde/kruler.desktop
 share/applications/kde/ksnapshot.desktop
 share/applications/kde/kview.desktop
-share/applnk/.hidden/kgamma.desktop
 share/applnk/Graphics/kruler.desktop
 share/apps/kcoloredit/kcoloreditui.rc
 share/apps/kdvi/kdvi_part.rc
 share/apps/kdvi/tips
-share/apps/kdvi/toolbar/forwpage.xpm
-share/apps/kdvi/toolbar/largetext.xpm
-share/apps/kdvi/toolbar/smalltext.xpm
 share/apps/kfax/kfax_part.rc
 share/apps/kfax/kfaxui.rc
 share/apps/kfax/pics/kfax.tif
@@ -311,42 +314,70 @@ share/apps/kghostview/kghostviewui.rc
 share/apps/kghostview/kgv_part.rc
 share/apps/kghostview/pdf_sec.ps
 share/apps/kiconedit/kiconeditui.rc
+share/apps/kiconedit/pics/aim-cursor.xpm
+share/apps/kiconedit/pics/aim.png
+share/apps/kiconedit/pics/airbrush-cursor.xpm
+share/apps/kiconedit/pics/areaselect.png
+share/apps/kiconedit/pics/circle.png
+share/apps/kiconedit/pics/colorpicker-cursor.xpm
 share/apps/kiconedit/pics/compressed.png
+share/apps/kiconedit/pics/ellipse.png
+share/apps/kiconedit/pics/eraser-cursor.xpm
+share/apps/kiconedit/pics/fileclose.png
+share/apps/kiconedit/pics/fill-cursor.xpm
+share/apps/kiconedit/pics/filledcircle.png
+share/apps/kiconedit/pics/filledellipse.png
+share/apps/kiconedit/pics/filledrectangle.png
+share/apps/kiconedit/pics/grayscale.png
+share/apps/kiconedit/pics/grid.png
+share/apps/kiconedit/pics/kdepalette.png
+share/apps/kiconedit/pics/line.png
+share/apps/kiconedit/pics/newwin.png
+share/apps/kiconedit/pics/paintbrush-cursor.xpm
+share/apps/kiconedit/pics/pointer.png
+share/apps/kiconedit/pics/rectangle.png
+share/apps/kiconedit/pics/selectcircle.png
+share/apps/kiconedit/pics/selectrect.png
 share/apps/kiconedit/pics/source.png
 share/apps/kiconedit/pics/standard.png
-share/apps/kiconedit/toolbar/aim-cursor.xpm
-share/apps/kiconedit/toolbar/aim.png
-share/apps/kiconedit/toolbar/airbrush-cursor.xpm
-share/apps/kiconedit/toolbar/areaselect.png
-share/apps/kiconedit/toolbar/circle.png
-share/apps/kiconedit/toolbar/colorpicker-cursor.xpm
-share/apps/kiconedit/toolbar/ellipse.png
-share/apps/kiconedit/toolbar/eraser-cursor.xpm
-share/apps/kiconedit/toolbar/fileclose.png
-share/apps/kiconedit/toolbar/fill-cursor.xpm
-share/apps/kiconedit/toolbar/filledcircle.png
-share/apps/kiconedit/toolbar/filledellipse.png
-share/apps/kiconedit/toolbar/filledrectangle.png
-share/apps/kiconedit/toolbar/grayscale.png
-share/apps/kiconedit/toolbar/grid.png
-share/apps/kiconedit/toolbar/kdepalette.png
-share/apps/kiconedit/toolbar/line.png
-share/apps/kiconedit/toolbar/newwin.png
-share/apps/kiconedit/toolbar/paintbrush-cursor.xpm
-share/apps/kiconedit/toolbar/pointer.png
-share/apps/kiconedit/toolbar/rectangle.png
-share/apps/kiconedit/toolbar/selectcircle.png
-share/apps/kiconedit/toolbar/selectrect.png
-share/apps/kiconedit/toolbar/transform.png
+share/apps/kiconedit/pics/transform.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_brush.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_color_picker.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_color_washer.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_curve.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_ellipse.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_elliptical_selection.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_eraser.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_flood_fill.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_free_form_selection.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_line.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_pen.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_polygon.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_polyline.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_rect_selection.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_rectangle.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_rounded_rectangle.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_spraycan.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_text.png
+share/apps/kolourpaint/icons/hicolor/16x16/apps/kolourpaint.png
+share/apps/kolourpaint/icons/hicolor/32x32/apps/kolourpaint.png
+share/apps/kolourpaint/icons/hicolor/48x48/apps/kolourpaint.png
+share/apps/kolourpaint/kolourpaintui.rc
+share/apps/kolourpaint/pics/color_transparent_26x26.png
+share/apps/kolourpaint/pics/colorbutton_swap_16x16.png
+share/apps/kolourpaint/pics/image_rotate_anticlockwise.png
+share/apps/kolourpaint/pics/image_rotate_clockwise.png
+share/apps/kolourpaint/pics/image_skew_horizontal.png
+share/apps/kolourpaint/pics/image_skew_vertical.png
+share/apps/kolourpaint/pics/option_opaque.png
+share/apps/kolourpaint/pics/option_transparent.png
+share/apps/kolourpaint/pics/resize.png
+share/apps/kolourpaint/pics/scale.png
+share/apps/kolourpaint/pics/smooth_scale.png
+share/apps/kolourpaint/pics/tool_spraycan_17x17.png
+share/apps/kolourpaint/pics/tool_spraycan_29x29.png
+share/apps/kolourpaint/pics/tool_spraycan_9x9.png
 share/apps/konqueror/servicemenus/mrml-servicemenu.desktop
-share/apps/kpaint/kpaintui.rc
-share/apps/kpaint/toolbar/areaselect.png
-share/apps/kpaint/toolbar/brush.png
-share/apps/kpaint/toolbar/circle.png
-share/apps/kpaint/toolbar/ellipse.png
-share/apps/kpaint/toolbar/line.png
-share/apps/kpaint/toolbar/rectangle.png
-share/apps/kpaint/toolbar/roundangle.png
 share/apps/kpdf/kpdf_shell.rc
 share/apps/kpdfpart/kpdf_part.rc
 share/apps/kpovmodeler/baseinsertrules.xml
@@ -752,9 +783,57 @@ share/doc/HTML/en/kghostview/index.docbook
 share/doc/HTML/en/kiconedit/common
 share/doc/HTML/en/kiconedit/index.cache.bz2
 share/doc/HTML/en/kiconedit/index.docbook
-share/doc/HTML/en/kpaint/common
-share/doc/HTML/en/kpaint/index.cache.bz2
-share/doc/HTML/en/kpaint/index.docbook
+share/doc/HTML/en/kolourpaint/brush_shapes.png
+share/doc/HTML/en/kolourpaint/color_box.png
+share/doc/HTML/en/kolourpaint/common
+share/doc/HTML/en/kolourpaint/eraser_shapes.png
+share/doc/HTML/en/kolourpaint/fcc_std_text.png
+share/doc/HTML/en/kolourpaint/fcc_trans_text.png
+share/doc/HTML/en/kolourpaint/fill_style.png
+share/doc/HTML/en/kolourpaint/image_balance.png
+share/doc/HTML/en/kolourpaint/image_emboss.png
+share/doc/HTML/en/kolourpaint/image_flatten.png
+share/doc/HTML/en/kolourpaint/image_flip.png
+share/doc/HTML/en/kolourpaint/image_invert.png
+share/doc/HTML/en/kolourpaint/image_reduce_colors.png
+share/doc/HTML/en/kolourpaint/image_resize_scale.png
+share/doc/HTML/en/kolourpaint/image_rotate.png
+share/doc/HTML/en/kolourpaint/image_selection_dimensions.png
+share/doc/HTML/en/kolourpaint/image_skew.png
+share/doc/HTML/en/kolourpaint/image_soften_sharpen.png
+share/doc/HTML/en/kolourpaint/index.cache.bz2
+share/doc/HTML/en/kolourpaint/index.docbook
+share/doc/HTML/en/kolourpaint/kolourpaint-main.png
+share/doc/HTML/en/kolourpaint/line_width.png
+share/doc/HTML/en/kolourpaint/lines_30_45_deg.png
+share/doc/HTML/en/kolourpaint/lines_30_deg.png
+share/doc/HTML/en/kolourpaint/lines_45_deg.png
+share/doc/HTML/en/kolourpaint/rotate_image_30.png
+share/doc/HTML/en/kolourpaint/rotate_selection_30.png
+share/doc/HTML/en/kolourpaint/scale_comparison.png
+share/doc/HTML/en/kolourpaint/selections_opaque_transparent.png
+share/doc/HTML/en/kolourpaint/spraycan_patterns.png
+share/doc/HTML/en/kolourpaint/tool_brush.png
+share/doc/HTML/en/kolourpaint/tool_color_picker.png
+share/doc/HTML/en/kolourpaint/tool_color_washer.png
+share/doc/HTML/en/kolourpaint/tool_curve.png
+share/doc/HTML/en/kolourpaint/tool_ellipse.png
+share/doc/HTML/en/kolourpaint/tool_elliptical_selection.png
+share/doc/HTML/en/kolourpaint/tool_eraser.png
+share/doc/HTML/en/kolourpaint/tool_flood_fill.png
+share/doc/HTML/en/kolourpaint/tool_free_form_selection.png
+share/doc/HTML/en/kolourpaint/tool_line.png
+share/doc/HTML/en/kolourpaint/tool_pen.png
+share/doc/HTML/en/kolourpaint/tool_polygon.png
+share/doc/HTML/en/kolourpaint/tool_polyline.png
+share/doc/HTML/en/kolourpaint/tool_polystar.png
+share/doc/HTML/en/kolourpaint/tool_rect_selection.png
+share/doc/HTML/en/kolourpaint/tool_rectangle.png
+share/doc/HTML/en/kolourpaint/tool_rectangles.png
+share/doc/HTML/en/kolourpaint/tool_rounded_rectangle.png
+share/doc/HTML/en/kolourpaint/tool_selections.png
+share/doc/HTML/en/kolourpaint/tool_spraycan.png
+share/doc/HTML/en/kolourpaint/tool_text.png
 share/doc/HTML/en/kpdf/common
 share/doc/HTML/en/kpdf/index.cache.bz2
 share/doc/HTML/en/kpdf/index.docbook
@@ -837,7 +916,6 @@ share/icons/crystalsvg/16x16/apps/kdvi.png
 share/icons/crystalsvg/16x16/apps/kfax.png
 share/icons/crystalsvg/16x16/apps/kghostview.png
 share/icons/crystalsvg/16x16/apps/kiconedit.png
-share/icons/crystalsvg/16x16/apps/kpaint.png
 share/icons/crystalsvg/16x16/apps/kpovmodeler.png
 share/icons/crystalsvg/16x16/apps/kruler.png
 share/icons/crystalsvg/16x16/apps/ksnapshot.png
@@ -850,7 +928,6 @@ share/icons/crystalsvg/32x32/apps/kdvi.png
 share/icons/crystalsvg/32x32/apps/kfax.png
 share/icons/crystalsvg/32x32/apps/kghostview.png
 share/icons/crystalsvg/32x32/apps/kiconedit.png
-share/icons/crystalsvg/32x32/apps/kpaint.png
 share/icons/crystalsvg/32x32/apps/kpovmodeler.png
 share/icons/crystalsvg/32x32/apps/kruler.png
 share/icons/crystalsvg/32x32/apps/ksnapshot.png
@@ -861,23 +938,26 @@ share/icons/crystalsvg/48x48/apps/kdvi.png
 share/icons/crystalsvg/48x48/apps/kfax.png
 share/icons/crystalsvg/48x48/apps/kghostview.png
 share/icons/crystalsvg/48x48/apps/kiconedit.png
-share/icons/crystalsvg/48x48/apps/kpaint.png
 share/icons/crystalsvg/48x48/apps/kruler.png
 share/icons/crystalsvg/48x48/apps/ksnapshot.png
 share/icons/crystalsvg/48x48/apps/kview.png
 share/icons/crystalsvg/48x48/apps/kviewshell.png
 share/icons/crystalsvg/64x64/apps/kghostview.png
 share/icons/hicolor/16x16/apps/kgamma.png
+share/icons/hicolor/16x16/apps/kolourpaint.png
 share/icons/hicolor/16x16/apps/kpdf.png
 share/icons/hicolor/32x32/apps/kgamma.png
+share/icons/hicolor/32x32/apps/kolourpaint.png
 share/icons/hicolor/32x32/apps/kpdf.png
 share/icons/hicolor/48x48/apps/kgamma.png
+share/icons/hicolor/48x48/apps/kolourpaint.png
 share/icons/hicolor/48x48/apps/kpdf.png
 share/icons/locolor/16x16/apps/kcoloredit.png
 share/icons/locolor/16x16/apps/kpovmodeler.png
 share/icons/locolor/32x32/apps/kcoloredit.png
 share/icons/locolor/32x32/apps/kpovmodeler.png
 share/mimelnk/text/mrml.desktop
+share/services/gsthumbnail.desktop
 share/services/kconfiguredialog/kviewcanvasconfig.desktop
 share/services/kconfiguredialog/kviewgeneralconfig.desktop
 share/services/kconfiguredialog/kviewpluginsconfig.desktop
@@ -886,6 +966,7 @@ share/services/kconfiguredialog/kviewviewerpluginsconfig.desktop
 share/services/kded/daemonwatcher.desktop
 share/services/kfile_bmp.desktop
 share/services/kfile_dvi.desktop
+share/services/kfile_exr.desktop
 share/services/kfile_ico.desktop
 share/services/kfile_jpeg.desktop
 share/services/kfile_pcx.desktop
@@ -893,6 +974,7 @@ share/services/kfile_pdf.desktop
 share/services/kfile_png.desktop
 share/services/kfile_pnm.desktop
 share/services/kfile_ps.desktop
+share/services/kfile_rgb.desktop
 share/services/kfile_tga.desktop
 share/services/kfile_tiff.desktop
 share/services/kfile_xbm.desktop
@@ -919,18 +1001,13 @@ share/servicetypes/ksvgrenderer.desktop
 @dirrm share/icons/hicolor/32x32
 @dirrm share/icons/hicolor/16x16/apps
 @dirrm share/icons/hicolor/16x16
-@dirrm share/icons/crystalsvg/64x64/apps
-@dirrm share/icons/crystalsvg/48x48/apps
-@dirrm share/icons/crystalsvg/32x32/apps
 @dirrm share/icons/crystalsvg/22x22/apps
-@dirrm share/icons/crystalsvg/16x16/apps
-@dirrm share/icons/crystalsvg/128x128/apps
 @dirrm share/doc/HTML/en/kview
 @dirrm share/doc/HTML/en/ksnapshot
 @dirrm share/doc/HTML/en/kruler
 @dirrm share/doc/HTML/en/kpovmodeler
 @dirrm share/doc/HTML/en/kpdf
-@dirrm share/doc/HTML/en/kpaint
+@dirrm share/doc/HTML/en/kolourpaint
 @dirrm share/doc/HTML/en/kiconedit
 @dirrm share/doc/HTML/en/kghostview
 @dirrm share/doc/HTML/en/kgamma
@@ -968,11 +1045,19 @@ share/servicetypes/ksvgrenderer.desktop
 @dirrm share/apps/kpovmodeler
 @dirrm share/apps/kpdfpart
 @dirrm share/apps/kpdf
-@dirrm share/apps/kpaint/toolbar
-@dirrm share/apps/kpaint
 @dirrm share/apps/konqueror/servicemenus
 @dirrm share/apps/konqueror
-@dirrm share/apps/kiconedit/toolbar
+@dirrm share/apps/kolourpaint/pics
+@dirrm share/apps/kolourpaint/icons/hicolor/48x48/apps
+@dirrm share/apps/kolourpaint/icons/hicolor/48x48
+@dirrm share/apps/kolourpaint/icons/hicolor/32x32/apps
+@dirrm share/apps/kolourpaint/icons/hicolor/32x32
+@dirrm share/apps/kolourpaint/icons/hicolor/16x16/apps
+@dirrm share/apps/kolourpaint/icons/hicolor/16x16/actions
+@dirrm share/apps/kolourpaint/icons/hicolor/16x16
+@dirrm share/apps/kolourpaint/icons/hicolor
+@dirrm share/apps/kolourpaint/icons
+@dirrm share/apps/kolourpaint
 @dirrm share/apps/kiconedit/pics
 @dirrm share/apps/kiconedit
 @dirrm share/apps/kghostview
@@ -980,11 +1065,9 @@ share/servicetypes/ksvgrenderer.desktop
 @dirrm share/apps/kgamma
 @dirrm share/apps/kfax/pics
 @dirrm share/apps/kfax
-@dirrm share/apps/kdvi/toolbar
 @dirrm share/apps/kdvi
 @dirrm share/apps/kcoloredit
 @dirrm share/applnk/Graphics
-@dirrm share/applnk/.hidden
 @dirrm share/applnk
 @dirrm include/libtext2path-0.1
 @dirrm include/ksvg