[gimp/meson: 614/805] Fix versions, pkg-config files.

[Félix Piédallu <fpiedallu src gnome org>]

commit 3bcbacabe4a84f85686437135edbf2a00e2634e4
Author: Félix Piédallu <felix piedallu me>
Date:   Thu Jan 11 10:19:04 2018 +0100

    Fix versions, pkg-config files.

 desktop/meson.build                   |    2 +-
 devel-docs/app/meson.build            |    2 +-
 devel-docs/libgimp/meson.build        |    2 +-
 devel-docs/libgimpbase/meson.build    |    2 +-
 devel-docs/libgimpcolor/meson.build   |    2 +-
 devel-docs/libgimpconfig/meson.build  |    2 +-
 devel-docs/libgimpmath/meson.build    |    2 +-
 devel-docs/libgimpmodule/meson.build  |    2 +-
 devel-docs/libgimpthumb/meson.build   |    2 +-
 devel-docs/libgimpwidgets/meson.build |    2 +-
 docs/meson.build                      |    2 +-
 libgimpbase/meson.build               |    2 +-
 meson.build                           |   30 ++++++++++++++++--------------
 13 files changed, 28 insertions(+), 26 deletions(-)
---
diff --git a/desktop/meson.build b/desktop/meson.build
index cccd6f4..470d52a 100644
--- a/desktop/meson.build
+++ b/desktop/meson.build
@@ -22,7 +22,7 @@ desktopfilename = 'gimp.desktop'
 desktop_conf = configuration_data()
 desktop_conf.set('GIMP_APP_VERSION', app_version)
 desktop_conf.set('GIMP_COMMAND', gimp_command)
-desktop_conf.set('GIMP_VERSION', user_version)
+desktop_conf.set('GIMP_VERSION', gimp_version)
 desktop_conf.set('MIME_TYPES', ';'.join(MIMEtypes))
 
 desktopfilein = configure_file(
diff --git a/devel-docs/app/meson.build b/devel-docs/app/meson.build
index cf767ba..f09f546 100644
--- a/devel-docs/app/meson.build
+++ b/devel-docs/app/meson.build
@@ -1,7 +1,7 @@
 module_name = 'app'
 
 version_data = configuration_data()
-version_data.set('GIMP_VERSION', meson.project_version())
+version_data.set('GIMP_VERSION', gimp_version)
 configure_file(
   input : 'version.in',
   output: 'version',
diff --git a/devel-docs/libgimp/meson.build b/devel-docs/libgimp/meson.build
index 2c792af..72ee9e6 100644
--- a/devel-docs/libgimp/meson.build
+++ b/devel-docs/libgimp/meson.build
@@ -1,7 +1,7 @@
 module_name = 'libgimp'
 
 version_data = configuration_data()
-version_data.set('GIMP_VERSION', meson.project_version())
+version_data.set('GIMP_VERSION', gimp_version)
 configure_file(
   input : 'version.in',
   output: 'version',
diff --git a/devel-docs/libgimpbase/meson.build b/devel-docs/libgimpbase/meson.build
index a28ecba..0eeed60 100644
--- a/devel-docs/libgimpbase/meson.build
+++ b/devel-docs/libgimpbase/meson.build
@@ -1,7 +1,7 @@
 module_name = 'libgimpbase'
 
 version_data = configuration_data()
-version_data.set('GIMP_VERSION', meson.project_version())
+version_data.set('GIMP_VERSION', gimp_version)
 configure_file(
   input : 'version.in',
   output: 'version',
diff --git a/devel-docs/libgimpcolor/meson.build b/devel-docs/libgimpcolor/meson.build
index ec8e94e..c5bf87f 100644
--- a/devel-docs/libgimpcolor/meson.build
+++ b/devel-docs/libgimpcolor/meson.build
@@ -1,7 +1,7 @@
 module_name = 'libgimpcolor'
 
 version_data = configuration_data()
-version_data.set('GIMP_VERSION', meson.project_version())
+version_data.set('GIMP_VERSION', gimp_version)
 configure_file(
   input : 'version.in',
   output: 'version',
diff --git a/devel-docs/libgimpconfig/meson.build b/devel-docs/libgimpconfig/meson.build
index d32eec2..015f48b 100644
--- a/devel-docs/libgimpconfig/meson.build
+++ b/devel-docs/libgimpconfig/meson.build
@@ -1,7 +1,7 @@
 module_name = 'libgimpconfig'
 
 version_data = configuration_data()
-version_data.set('GIMP_VERSION', meson.project_version())
+version_data.set('GIMP_VERSION', gimp_version)
 configure_file(
   input : 'version.in',
   output: 'version',
diff --git a/devel-docs/libgimpmath/meson.build b/devel-docs/libgimpmath/meson.build
index 79b42ec..5361d40 100644
--- a/devel-docs/libgimpmath/meson.build
+++ b/devel-docs/libgimpmath/meson.build
@@ -1,7 +1,7 @@
 module_name = 'libgimpmath'
 
 version_data = configuration_data()
-version_data.set('GIMP_VERSION', meson.project_version())
+version_data.set('GIMP_VERSION', gimp_version)
 configure_file(
   input : 'version.in',
   output: 'version',
diff --git a/devel-docs/libgimpmodule/meson.build b/devel-docs/libgimpmodule/meson.build
index ac62326..4ac636b 100644
--- a/devel-docs/libgimpmodule/meson.build
+++ b/devel-docs/libgimpmodule/meson.build
@@ -1,7 +1,7 @@
 module_name = 'libgimpmodule'
 
 version_data = configuration_data()
-version_data.set('GIMP_VERSION', meson.project_version())
+version_data.set('GIMP_VERSION', gimp_version)
 configure_file(
   input : 'version.in',
   output: 'version',
diff --git a/devel-docs/libgimpthumb/meson.build b/devel-docs/libgimpthumb/meson.build
index d841298..f25ae75 100644
--- a/devel-docs/libgimpthumb/meson.build
+++ b/devel-docs/libgimpthumb/meson.build
@@ -1,7 +1,7 @@
 module_name = 'libgimpthumb'
 
 version_data = configuration_data()
-version_data.set('GIMP_VERSION', meson.project_version())
+version_data.set('GIMP_VERSION', gimp_version)
 configure_file(
   input : 'version.in',
   output: 'version',
diff --git a/devel-docs/libgimpwidgets/meson.build b/devel-docs/libgimpwidgets/meson.build
index 6361d3d..3f23f35 100644
--- a/devel-docs/libgimpwidgets/meson.build
+++ b/devel-docs/libgimpwidgets/meson.build
@@ -1,7 +1,7 @@
 module_name = 'libgimpwidgets'
 
 version_data = configuration_data()
-version_data.set('GIMP_VERSION', meson.project_version())
+version_data.set('GIMP_VERSION', gimp_version)
 configure_file(
   input : 'version.in',
   output: 'version',
diff --git a/docs/meson.build b/docs/meson.build
index 7b2bae1..bbe9652 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -1,7 +1,7 @@
 
 # Configure_file is just here to rename the files
 manconf = configuration_data()
-manconf.set('GIMP_VERSION',   app_version)
+manconf.set('GIMP_VERSION',   gimp_version)
 manconf.set('gimpdatadir',    join_paths(prefix, gimpdatadir))
 manconf.set('gimplocaledir',  join_paths(prefix, localedir))
 manconf.set('gimpplugindir',  join_paths(prefix, gimpplugindir))
diff --git a/libgimpbase/meson.build b/libgimpbase/meson.build
index d0e384c..597948b 100644
--- a/libgimpbase/meson.build
+++ b/libgimpbase/meson.build
@@ -3,7 +3,7 @@ versionconfig = configuration_data()
 versionconfig.set('GIMP_MAJOR_VERSION', major_version)
 versionconfig.set('GIMP_MINOR_VERSION', minor_version)
 versionconfig.set('GIMP_MICRO_VERSION', micro_version)
-versionconfig.set('GIMP_VERSION',       meson.project_version())
+versionconfig.set('GIMP_VERSION',       gimp_version)
 versionconfig.set('GIMP_API_VERSION',   api_version)
 gimpversion = configure_file(
   input : 'gimpversion.h.in',
diff --git a/meson.build b/meson.build
index d663acd..da07739 100644
--- a/meson.build
+++ b/meson.build
@@ -26,9 +26,7 @@ profiling = get_option('profiling')
 ansi      = get_option('ansi')
 
 ################################################################################
-# Projects infos
-
-# TODO post-merge : simplify the whole version number handling
+# Project info
 
 prettyname = 'GIMP'
 full_name  = 'GNU Image Manipulation Program'
@@ -44,9 +42,19 @@ version = meson.project_version().split('.')
 major_version = version[0].to_int()
 minor_version = version[1].to_int()
 micro_version = version[2].to_int()
+interface_age = 0
+
+api_version   = '@0@.0'  .format(major_version)
+app_version   = '@0@.@1@'.format(major_version, minor_version)
+user_version  = '@0@.@1@'.format(major_version, minor_version)
+gimp_version  = meson.project_version()
+
+gimp_command  = 'gimp-' + app_version
+gimp_api_name = 'gimp-' + api_version
+package_string= prettyname + ' ' + gimp_version
+
 
 # TODO cleanup all this versions mess
-interface_age = 0
 binary_age = 100 * minor_version + micro_version
 
 lt_current = 100 * minor_version + micro_version - interface_age
@@ -57,13 +65,6 @@ lt_current_minus_age = lt_current - lt_age
 
 so_version = '@0@.@1@.@2@'.format(lt_revision, lt_current, lt_current_minus_age)
 
-api_version = '2.0'
-app_version = '2.9'
-user_version= '2.9'
-
-gimp_command = 'gimp-' + app_version
-gimp_api_name = 'gimp-' + api_version
-package_string = prettyname + ' ' + meson.project_version()
 
 stable = (minor_version % 2 == 0)
 conf.set10('GIMP_UNSTABLE', not stable)
@@ -849,7 +850,7 @@ configure_file(
 pkgconfig.generate(filebase: 'gimp-' + api_version,
   name: prettyname,
   description: 'GIMP Library',
-  version: meson.project_version(),
+  version: gimp_version,
   requires: [
     'gdk-pixbuf-2.0 ' + gdk_pixbuf_minver,
     'cairo '          + cairo_minver,
@@ -867,6 +868,7 @@ pkgconfig.generate(filebase: 'gimp-' + api_version,
     gimp_api_name,
   ],
   variables: [
+    'datarootdir='    +'${prefix}/'+ get_option('datadir')
     'gimpdatadir='    +'${prefix}/'+ gimpdatadir,
     'gimplibdir='     +'${prefix}/'+ gimpplugindir,
     'gimpsysconfdir=' + gimpsysconfdir,
@@ -876,7 +878,7 @@ pkgconfig.generate(filebase: 'gimp-' + api_version,
 pkgconfig.generate(filebase: 'gimpthumb-' + api_version,
   name: 'GIMP Thumb',
   description: 'GIMP Thumbnail Library',
-  version: meson.project_version(),
+  version: gimp_version,
   requires: [
     'gdk-pixbuf-2.0 ' + gdk_pixbuf_minver,
   ],
@@ -891,7 +893,7 @@ pkgconfig.generate(filebase: 'gimpthumb-' + api_version,
 pkgconfig.generate(filebase: 'gimpui-' + api_version,
   name: 'GIMP UI',
   description: 'GIMP User Interface Library',
-  version: meson.project_version(),
+  version: gimp_version,
   requires: [
     'gimp-' + api_version + ' >= ' + app_version,
     'gtk+-2.0 ' + gtk2_minver,