[gimp/gimp-attributes-wip: 56/56] merged to master: GExiv2 0.10.3 is out - working branch t"

[Hartmut Kuhse <hartmutkuhse src gnome org>]

commit 6798cacf221743fd0b7c53d5374000e12122be93
Merge: 1d7e002 109d568
Author: Hartmut Kuhse <hk_priv gmx de>
Date:   Sun Apr 12 10:30:20 2015 +0200

    merged to master: GExiv2 0.10.3 is out - working branch
    t"
    
    This reverts commit 0c931858adc2217405ca8cb75239bfb7c5fa9757.
    
    Conflicts:
        configure.ac

 INSTALL.in                                         |   22 +-
 app/Makefile.am                                    |    2 +
 app/actions/tools-actions.c                        |   20 +
 app/actions/tools-commands.c                       |   32 +-
 app/actions/tools-commands.h                       |    6 +
 app/config/gimpguiconfig.c                         |   14 +
 app/config/gimpguiconfig.h                         |    1 +
 app/config/gimprc-blurbs.h                         |    3 +
 app/core/gimpprojection.c                          |   24 +-
 app/dialogs/action-search-dialog.c                 |   13 -
 app/dialogs/preferences-dialog.c                   |    5 +
 app/display/gimpdisplayshell-callbacks.c           |   23 +-
 app/display/gimpdisplayshell.c                     |    2 +-
 app/display/gimpimagewindow.c                      |   43 +-
 app/gegl/Makefile.am                               |    4 +-
 app/gegl/gimp-gegl-loops.c                         |   53 +-
 app/gegl/gimptilehandlerprojection.c               |  356 -
 app/gegl/gimptilehandlerprojection.h               |   82 -
 app/gegl/gimptilehandlervalidate.c                 |  418 +
 app/gegl/gimptilehandlervalidate.h                 |   87 +
 app/operations/gimpbrightnesscontrastconfig.c      |   46 +-
 app/operations/gimpcolorizeconfig.c                |   48 +-
 app/operations/gimpthresholdconfig.c               |   46 +-
 app/paint/Makefile.am                              |   21 +-
 app/paint/gimp-paint.c                             |    4 +
 app/paint/gimpmybrush.c                            |  255 +
 app/paint/gimpmybrush.h                            |   59 +
 app/paint/gimpmybrushoptions.c                     |  140 +
 app/paint/gimpmybrushoptions.h                     |   57 +
 app/paint/paint-types.h                            |    2 +
 app/tools/Makefile.am                              |    6 +
 app/tools/gimp-tools.c                             |   12 +-
 app/tools/gimphandletransformoptions.c             |   18 +-
 app/tools/gimphandletransformtool.c                |  240 +-
 app/tools/gimpimagemaptool.c                       |    2 +-
 app/tools/gimpiscissorstool.c                      | 1515 +-
 app/tools/gimpiscissorstool.h                      |   34 +-
 app/tools/gimpmybrushoptions-gui.c                 |  170 +
 app/tools/gimpmybrushoptions-gui.h                 |   29 +
 app/tools/gimpmybrushtool.c                        |  136 +
 app/tools/gimpmybrushtool.h                        |   59 +
 app/tools/gimpoperationtool.c                      |   85 +-
 app/tools/gimpoperationtool.h                      |    2 +-
 app/tools/gimppaintoptions-gui.c                   |   12 +-
 app/tools/gimpperspectivetool.c                    |   10 +-
 app/tools/gimprotatetool.c                         |    6 +-
 app/tools/gimpscaletool.c                          |   10 +-
 app/tools/gimptilehandleriscissors.c               |  332 +
 app/tools/gimptilehandleriscissors.h               |   59 +
 app/tools/gimptransformtool.c                      |  243 +-
 app/tools/gimptransformtool.h                      |   65 +-
 app/tools/gimpunifiedtransformtool.c               |  235 +-
 app/tools/tools-enums.c                            |    8 +-
 app/tools/tools-enums.h                            |    6 +-
 app/widgets/gimpaction.c                           |    1 +
 app/widgets/gimphelp-ids.h                         |    1 +
 app/xcf/xcf-save.c                                 |   34 +-
 build/windows/gimp.manifest                        |    1 +
 build/windows/jhbuild/imglibs.moduleset            |    4 +-
 .../jhbuild/patches/icu-fix-library-names.patch    |   21 +
 .../patches/libmng-no-undefined-makefile-in.patch  |   11 +
 configure.ac                                       |   25 +
 icons/16/gimp-tool-mybrush.png                     |  Bin 0 -> 3474 bytes
 icons/22/gimp-tool-mybrush.png                     |  Bin 0 -> 3469 bytes
 .../wilber-32.png => icons/32/gimp-wilber.png      |  Bin 1759 -> 1759 bytes
 .../wilber-48.png => icons/48/gimp-wilber.png      |  Bin 3189 -> 3189 bytes
 icons/Makefile.am                                  |   10 +-
 libgimpwidgets/.gitignore                          |    1 -
 libgimpwidgets/Makefile.am                         |   28 +-
 libgimpwidgets/gimpfileentry.c                     |   60 +-
 libgimpwidgets/gimpstock.c                         |    1 +
 libgimpwidgets/gimpstock.h                         |    1 +
 libgimpwidgets/gimpwidgets-private.c               |   24 +-
 libgimpwidgets/wilber-16.png                       |  Bin 765 -> 0 bytes
 libgimpwidgets/wilber-64.png                       |  Bin 4644 -> 0 bytes
 menus/image-menu.xml.in                            |    5 +-
 plug-ins/file-jpeg/jpeg-save.c                     |   20 +-
 plug-ins/help-browser/dialog.c                     |   24 +-
 po-libgimp/LINGUAS                                 |    1 +
 po-libgimp/bs.po                                   | 2075 +++
 po-libgimp/el.po                                   |  146 +-
 po-plug-ins/LINGUAS                                |    1 +
 po-plug-ins/bs.po                                  |13029 ++++++++++++++
 po-plug-ins/el.po                                  | 2567 ++--
 po-python/LINGUAS                                  |    1 +
 po-python/bs.po                                    |  398 +
 po-script-fu/LINGUAS                               |    1 +
 po-script-fu/bs.po                                 |  259 +
 po-tags/LINGUAS                                    |    1 +
 po-tags/bs.po                                      |   27 +
 po-tips/LINGUAS                                    |    1 +
 po-tips/bs.po                                      |  305 +
 po-tips/sk.po                                      |  440 +-
 po/LINGUAS                                         |    1 +
 po/POTFILES.in                                     |    4 +
 po/bs.po                                           |18167 ++++++++++++++++++++
 po/el.po                                           | 2105 ++-
 po/kk.po                                           | 8492 +++++-----
 po/sr.po                                           |16291 +++++++++---------
 99 files changed, 53113 insertions(+), 16653 deletions(-)
---
diff --cc configure.ac
index 6082838,1f5b7e3..bf72118
--- a/configure.ac
+++ b/configure.ac
@@@ -65,7 -65,8 +65,8 @@@ m4_define([pygtk_required_version], [2.
  m4_define([poppler_required_version], [0.12.4])
  m4_define([poppler_data_required_version], [0.4.7])
  m4_define([libgudev_required_version], [167])
 -m4_define([gexiv2_required_version], [0.6.1])
 +m4_define([gexiv2_required_version], [0.10.3])
+ m4_define([libmypaint_required_version], [1.1])
  m4_define([lcms_required_version], [2.6])
  m4_define([libpng_required_version], [1.2.37])
  m4_define([liblzma_required_version], [5.0.0])