[gthumb] meson: added data subdir

[Paolo Bacchilega <paobac src gnome org>]

commit 35b8190b1a6354827813bd7b76235d8a55e42af8
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Fri Oct 20 21:20:31 2017 +0200

    meson: added data subdir

 data/appdata/meson.build                           |    8 ++++
 data/appdata/org.gnome.gThumb.appdata.xml.in       |   24 +++++-----
 data/gschemas/meson.build                          |   25 +++++++++++
 .../org.gnome.gthumb.change-date.gschema.xml       |    0
 .../org.gnome.gthumb.comments.gschema.xml          |    0
 .../org.gnome.gthumb.contact-sheet.gschema.xml     |    0
 .../org.gnome.gthumb.convert-format.gschema.xml    |    0
 .../org.gnome.gthumb.crop.gschema.xml              |    0
 .../org.gnome.gthumb.facebook.gschema.xml          |    0
 .../org.gnome.gthumb.file-manager.gschema.xml      |    0
 .../org.gnome.gthumb.flickr.gschema.xml            |    0
 data/{ => gschemas}/org.gnome.gthumb.gschema.xml   |    0
 .../org.gnome.gthumb.gstreamer-tools.gschema.xml   |    0
 .../org.gnome.gthumb.image-print.gschema.xml       |    0
 .../org.gnome.gthumb.image-viewer.gschema.xml      |    0
 .../org.gnome.gthumb.importer.gschema.xml          |    0
 .../org.gnome.gthumb.photo-importer.gschema.xml    |    0
 .../org.gnome.gthumb.picasaweb.gschema.xml         |    0
 .../org.gnome.gthumb.pixbuf-savers.gschema.xml     |    0
 .../org.gnome.gthumb.rename-series.gschema.xml     |    0
 .../org.gnome.gthumb.resize-images.gschema.xml     |    0
 .../org.gnome.gthumb.resize.gschema.xml            |    0
 .../org.gnome.gthumb.rotate.gschema.xml            |    0
 .../org.gnome.gthumb.slideshow.gschema.xml         |    0
 .../org.gnome.gthumb.webalbums.gschema.xml         |    0
 data/icons/meson.build                             |    1 +
 data/meson.build                                   |   45 ++++++++++++++++++++
 data/org.gnome.gThumb.desktop.in.in                |   10 ++--
 data/ui/meson.build                                |   12 +++++
 meson.build                                        |   26 +++++++-----
 30 files changed, 123 insertions(+), 28 deletions(-)
---
diff --git a/data/appdata/meson.build b/data/appdata/meson.build
new file mode 100644
index 0000000..60362be
--- /dev/null
+++ b/data/appdata/meson.build
@@ -0,0 +1,8 @@
+i18n.merge_file(
+  input : 'org.gnome.gThumb.appdata.xml.in',
+  output : 'org.gnome.gThumb.appdata.xml',
+  type : 'xml',
+  po_dir : po_dir,
+  install : true,
+  install_dir : join_paths(datadir, 'metainfo')
+)
diff --git a/data/appdata/org.gnome.gThumb.appdata.xml.in b/data/appdata/org.gnome.gThumb.appdata.xml.in
index bbc6aa1..f74cce6 100644
--- a/data/appdata/org.gnome.gThumb.appdata.xml.in
+++ b/data/appdata/org.gnome.gThumb.appdata.xml.in
@@ -5,38 +5,38 @@
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+</project_license>
 
-  <_name>gThumb Image Viewer</_name>
-  <_summary>View and organize your images</_summary>
+  <name>gThumb Image Viewer</name>
+  <summary>View and organize your images</summary>
   <description>
-    <_p>
+    <p>
       gThumb is an image viewer, editor, browser and organizer.  It is designed
       to be well integrated with the GNOME 3 desktop.
-    </_p>
-    <_p>
+    </p>
+    <p>
       As an image viewer gThumb allows to view common image file formats
       such as BMP, JPEG, GIF (including the animations), PNG, TIFF, TGA and
       RAW images.
       It is also possible to view various metadata types embedded inside an
       image such as EXIF, IPTC and XMP.
-    </_p>
-    <_p>
+    </p>
+    <p>
       As an image editor gThumb allows to scale, rotate and crop the images;
       change the saturation, lightness, contrast as well as other color
       transformations.
-    </_p>
-    <_p>
+    </p>
+    <p>
       As an image browser gThumb shows the thumbnails of the images saved on
       your disk, allows to perform the common operations of a file manager such
       as copy, move and delete files and folders.
       Furthermore there is a series of image specific tools such as JPEG
       lossless transformations; image resize; format conversion; slideshow;
       setting an image as desktop background and several others.
-    </_p>
-    <_p>
+    </p>
+    <p>
       As an image organizer gThumb allows to add comments and other metadata to
       images; organize images in catalogs and catalogs in libraries; search
       for images and save the result as a catalog.
-    </_p>
+    </p>
   </description>
 
   <launchable type="desktop-id">org.gnome.gThumb.desktop</launchable>
diff --git a/data/gschemas/meson.build b/data/gschemas/meson.build
new file mode 100644
index 0000000..7c26d88
--- /dev/null
+++ b/data/gschemas/meson.build
@@ -0,0 +1,25 @@
+gschema_files = files(
+  'org.gnome.gthumb.gschema.xml',
+  'org.gnome.gthumb.change-date.gschema.xml',
+  'org.gnome.gthumb.comments.gschema.xml',
+  'org.gnome.gthumb.contact-sheet.gschema.xml',
+  'org.gnome.gthumb.convert-format.gschema.xml',
+  'org.gnome.gthumb.crop.gschema.xml',
+  'org.gnome.gthumb.facebook.gschema.xml',
+  'org.gnome.gthumb.file-manager.gschema.xml',
+  'org.gnome.gthumb.flickr.gschema.xml',
+  'org.gnome.gthumb.gstreamer-tools.gschema.xml',
+  'org.gnome.gthumb.image-print.gschema.xml',
+  'org.gnome.gthumb.image-viewer.gschema.xml',
+  'org.gnome.gthumb.importer.gschema.xml',
+  'org.gnome.gthumb.photo-importer.gschema.xml',
+  'org.gnome.gthumb.picasaweb.gschema.xml',
+  'org.gnome.gthumb.pixbuf-savers.gschema.xml',
+  'org.gnome.gthumb.rename-series.gschema.xml',
+  'org.gnome.gthumb.resize.gschema.xml',
+  'org.gnome.gthumb.resize-images.gschema.xml',
+  'org.gnome.gthumb.rotate.gschema.xml',
+  'org.gnome.gthumb.slideshow.gschema.xml',
+  'org.gnome.gthumb.webalbums.gschema.xml'
+)
+install_data(gschema_files, install_dir : join_paths(datadir, 'glib-2.0', 'schemas'))
diff --git a/data/org.gnome.gthumb.change-date.gschema.xml 
b/data/gschemas/org.gnome.gthumb.change-date.gschema.xml
similarity index 100%
rename from data/org.gnome.gthumb.change-date.gschema.xml
rename to data/gschemas/org.gnome.gthumb.change-date.gschema.xml
diff --git a/data/org.gnome.gthumb.comments.gschema.xml b/data/gschemas/org.gnome.gthumb.comments.gschema.xml
similarity index 100%
rename from data/org.gnome.gthumb.comments.gschema.xml
rename to data/gschemas/org.gnome.gthumb.comments.gschema.xml
diff --git a/data/org.gnome.gthumb.contact-sheet.gschema.xml 
b/data/gschemas/org.gnome.gthumb.contact-sheet.gschema.xml
similarity index 100%
rename from data/org.gnome.gthumb.contact-sheet.gschema.xml
rename to data/gschemas/org.gnome.gthumb.contact-sheet.gschema.xml
diff --git a/data/org.gnome.gthumb.convert-format.gschema.xml 
b/data/gschemas/org.gnome.gthumb.convert-format.gschema.xml
similarity index 100%
rename from data/org.gnome.gthumb.convert-format.gschema.xml
rename to data/gschemas/org.gnome.gthumb.convert-format.gschema.xml
diff --git a/data/org.gnome.gthumb.crop.gschema.xml b/data/gschemas/org.gnome.gthumb.crop.gschema.xml
similarity index 100%
rename from data/org.gnome.gthumb.crop.gschema.xml
rename to data/gschemas/org.gnome.gthumb.crop.gschema.xml
diff --git a/data/org.gnome.gthumb.facebook.gschema.xml b/data/gschemas/org.gnome.gthumb.facebook.gschema.xml
similarity index 100%
rename from data/org.gnome.gthumb.facebook.gschema.xml
rename to data/gschemas/org.gnome.gthumb.facebook.gschema.xml
diff --git a/data/org.gnome.gthumb.file-manager.gschema.xml 
b/data/gschemas/org.gnome.gthumb.file-manager.gschema.xml
similarity index 100%
rename from data/org.gnome.gthumb.file-manager.gschema.xml
rename to data/gschemas/org.gnome.gthumb.file-manager.gschema.xml
diff --git a/data/org.gnome.gthumb.flickr.gschema.xml b/data/gschemas/org.gnome.gthumb.flickr.gschema.xml
similarity index 100%
rename from data/org.gnome.gthumb.flickr.gschema.xml
rename to data/gschemas/org.gnome.gthumb.flickr.gschema.xml
diff --git a/data/org.gnome.gthumb.gschema.xml b/data/gschemas/org.gnome.gthumb.gschema.xml
similarity index 100%
rename from data/org.gnome.gthumb.gschema.xml
rename to data/gschemas/org.gnome.gthumb.gschema.xml
diff --git a/data/org.gnome.gthumb.gstreamer-tools.gschema.xml 
b/data/gschemas/org.gnome.gthumb.gstreamer-tools.gschema.xml
similarity index 100%
rename from data/org.gnome.gthumb.gstreamer-tools.gschema.xml
rename to data/gschemas/org.gnome.gthumb.gstreamer-tools.gschema.xml
diff --git a/data/org.gnome.gthumb.image-print.gschema.xml 
b/data/gschemas/org.gnome.gthumb.image-print.gschema.xml
similarity index 100%
rename from data/org.gnome.gthumb.image-print.gschema.xml
rename to data/gschemas/org.gnome.gthumb.image-print.gschema.xml
diff --git a/data/org.gnome.gthumb.image-viewer.gschema.xml 
b/data/gschemas/org.gnome.gthumb.image-viewer.gschema.xml
similarity index 100%
rename from data/org.gnome.gthumb.image-viewer.gschema.xml
rename to data/gschemas/org.gnome.gthumb.image-viewer.gschema.xml
diff --git a/data/org.gnome.gthumb.importer.gschema.xml b/data/gschemas/org.gnome.gthumb.importer.gschema.xml
similarity index 100%
rename from data/org.gnome.gthumb.importer.gschema.xml
rename to data/gschemas/org.gnome.gthumb.importer.gschema.xml
diff --git a/data/org.gnome.gthumb.photo-importer.gschema.xml 
b/data/gschemas/org.gnome.gthumb.photo-importer.gschema.xml
similarity index 100%
rename from data/org.gnome.gthumb.photo-importer.gschema.xml
rename to data/gschemas/org.gnome.gthumb.photo-importer.gschema.xml
diff --git a/data/org.gnome.gthumb.picasaweb.gschema.xml 
b/data/gschemas/org.gnome.gthumb.picasaweb.gschema.xml
similarity index 100%
rename from data/org.gnome.gthumb.picasaweb.gschema.xml
rename to data/gschemas/org.gnome.gthumb.picasaweb.gschema.xml
diff --git a/data/org.gnome.gthumb.pixbuf-savers.gschema.xml 
b/data/gschemas/org.gnome.gthumb.pixbuf-savers.gschema.xml
similarity index 100%
rename from data/org.gnome.gthumb.pixbuf-savers.gschema.xml
rename to data/gschemas/org.gnome.gthumb.pixbuf-savers.gschema.xml
diff --git a/data/org.gnome.gthumb.rename-series.gschema.xml 
b/data/gschemas/org.gnome.gthumb.rename-series.gschema.xml
similarity index 100%
rename from data/org.gnome.gthumb.rename-series.gschema.xml
rename to data/gschemas/org.gnome.gthumb.rename-series.gschema.xml
diff --git a/data/org.gnome.gthumb.resize-images.gschema.xml 
b/data/gschemas/org.gnome.gthumb.resize-images.gschema.xml
similarity index 100%
rename from data/org.gnome.gthumb.resize-images.gschema.xml
rename to data/gschemas/org.gnome.gthumb.resize-images.gschema.xml
diff --git a/data/org.gnome.gthumb.resize.gschema.xml b/data/gschemas/org.gnome.gthumb.resize.gschema.xml
similarity index 100%
rename from data/org.gnome.gthumb.resize.gschema.xml
rename to data/gschemas/org.gnome.gthumb.resize.gschema.xml
diff --git a/data/org.gnome.gthumb.rotate.gschema.xml b/data/gschemas/org.gnome.gthumb.rotate.gschema.xml
similarity index 100%
rename from data/org.gnome.gthumb.rotate.gschema.xml
rename to data/gschemas/org.gnome.gthumb.rotate.gschema.xml
diff --git a/data/org.gnome.gthumb.slideshow.gschema.xml 
b/data/gschemas/org.gnome.gthumb.slideshow.gschema.xml
similarity index 100%
rename from data/org.gnome.gthumb.slideshow.gschema.xml
rename to data/gschemas/org.gnome.gthumb.slideshow.gschema.xml
diff --git a/data/org.gnome.gthumb.webalbums.gschema.xml 
b/data/gschemas/org.gnome.gthumb.webalbums.gschema.xml
similarity index 100%
rename from data/org.gnome.gthumb.webalbums.gschema.xml
rename to data/gschemas/org.gnome.gthumb.webalbums.gschema.xml
diff --git a/data/icons/meson.build b/data/icons/meson.build
new file mode 100644
index 0000000..ba8d2ad
--- /dev/null
+++ b/data/icons/meson.build
@@ -0,0 +1 @@
+install_subdir('hicolor', install_dir : icons_install_dir)
diff --git a/data/meson.build b/data/meson.build
new file mode 100644
index 0000000..af6c3c1
--- /dev/null
+++ b/data/meson.build
@@ -0,0 +1,45 @@
+
+install_man('gthumb.1')
+
+# .desktop file
+
+desktop_data = configuration_data()
+desktop_data.set('VERSION', meson.project_version())            
+desktop_in_file = configure_file(
+  input : 'org.gnome.gThumb.desktop.in.in',
+  output : 'org.gnome.gThumb.desktop.in',
+  configuration : desktop_data
+)
+
+i18n.merge_file(
+  input : desktop_in_file,
+  output : 'org.gnome.gThumb.desktop',
+  type : 'desktop',
+  po_dir : po_dir,
+  install : true,
+  install_dir : join_paths(datadir, 'applications')
+)
+
+# .pc file
+
+pkg = import('pkgconfig')
+gthumb_pc = pkg.generate(
+  name : 'gThumb',
+  description : 'gThumb extensions',
+  filebase : 'gthumb-@0@'.format(api_version),
+  subdirs : 'gthumb-@0@'.format(api_version),
+  requires : [ 'gtk+-3.0' ],
+  version: meson.project_version(),
+  variables : [ 
+    'extensionsdir=${libdir}/gthumb/extensions',
+    'datarootdir=${prefix}/share',
+    'datadir=${datarootdir}'
+  ]
+)
+
+# Subdirectories
+
+subdir('appdata')
+subdir('gschemas')
+subdir('icons')
+subdir('ui')
diff --git a/data/org.gnome.gThumb.desktop.in.in b/data/org.gnome.gThumb.desktop.in.in
index 84627ed..e4a2bae 100644
--- a/data/org.gnome.gThumb.desktop.in.in
+++ b/data/org.gnome.gThumb.desktop.in.in
@@ -1,9 +1,9 @@
 [Desktop Entry]
-_Name=gThumb
-_GenericName=Image Viewer
-_X-GNOME-FullName=gThumb Image Viewer
-_Comment=View and organize your images
-_Keywords=Image;Viewer;
+Name=gThumb
+GenericName=Image Viewer
+X-GNOME-FullName=gThumb Image Viewer
+Comment=View and organize your images
+Keywords=Image;Viewer;
 Categories=GNOME;GTK;Graphics;Viewer;RasterGraphics;2DGraphics;Photography;
 Exec=gthumb %U
 Icon=gthumb
diff --git a/data/ui/meson.build b/data/ui/meson.build
new file mode 100644
index 0000000..3792762
--- /dev/null
+++ b/data/ui/meson.build
@@ -0,0 +1,12 @@
+ui_files = files(
+  'browser-preferences.ui',
+  'extensions-preferences.ui',
+  'filter-editor.ui',
+  'histogram-info.ui',
+  'location.ui',
+  'overwrite-dialog.ui',
+  'personalize-filters.ui',
+  'preferences.ui',
+  'sort-order.ui'
+)
+install_data(ui_files, install_dir : ui_install_dir)
diff --git a/meson.build b/meson.build
index 15cc425..cd55235 100644
--- a/meson.build
+++ b/meson.build
@@ -34,14 +34,18 @@ datadir = join_paths(prefix, get_option('datadir'))
 pkgdatadir = join_paths(datadir, meson.project_name())
 pkgincludedir = join_paths(prefix, 'include', meson.project_name())
 pkglibdir = join_paths(prefix, 'lib', meson.project_name())
+po_dir = join_paths(meson.source_root(), 'po')
+extensions_install_dir = join_paths(pkglibdir, 'extensions')
+ui_install_dir = join_paths(pkgdatadir, 'ui')
+icons_install_dir = join_paths(pkgdatadir, 'icons')
 if get_option('run-in-place')
-  uidir = join_paths(meson.source_root(), 'data', 'ui')
-  icondir = join_paths(meson.source_root(), 'data', 'icons')
-  extensionsdir = join_paths(meson.build_root(), 'extensions')
+  ui_data_dir = join_paths(meson.source_root(), 'data', 'ui')
+  icons_data_dir = join_paths(meson.source_root(), 'data', 'icons')
+  extensions_data_dir = join_paths(meson.build_root(), 'extensions')
 else
-  uidir = join_paths(pkgdatadir, 'ui')
-  icondir = join_paths(pkgdatadir, 'icons')
-  extensionsdir = join_paths(pkglibdir, 'extensions')
+  ui_data_dir = ui_install_dir
+  icons_data_dir = icons_install_dir
+  extensions_data_dir = extensions_install_dir  
 endif
 
 # Dependencies
@@ -213,10 +217,10 @@ config_data.set_quoted('PACKAGE_NAME', meson.project_name())
 config_data.set_quoted('PACKAGE_VERSION', meson.project_version())
 config_data.set_quoted('GTHUMB_API_VERSION', api_version)
 config_data.set_quoted('GTHUMB_LOCALEDIR', join_paths(prefix, get_option('localedir')))
-config_data.set_quoted('GTHUMB_UI_DIR', uidir)
-config_data.set_quoted('GTHUMB_ICON_DIR', icondir)
-config_data.set_quoted('GTHUMB_EXTENSIONS_UI_DIR', uidir)
-config_data.set_quoted('GTHUMB_EXTENSIONS_DIR', extensionsdir)
+config_data.set_quoted('GTHUMB_UI_DIR', ui_data_dir)
+config_data.set_quoted('GTHUMB_ICON_DIR', icons_data_dir)
+config_data.set_quoted('GTHUMB_EXTENSIONS_UI_DIR', ui_data_dir)
+config_data.set_quoted('GTHUMB_EXTENSIONS_DIR', extensions_data_dir)
 if get_option('buildtype').contains('debug')
   config_data.set('DEBUG', 1)
 endif
@@ -308,9 +312,9 @@ c_args += c_comp.get_supported_arguments(test_args)
 
 # Subdirectories
 
-#subdir('data')
 #subdir('extensions')
 subdir('gthumb')
+subdir('data')
 subdir('help')
 subdir('po')