[gnome-screenshot/bilelmoussaoui/meta: 1/5] Move meta files to data folder

[Alexander Mikhaylenko <alexm src gnome org>]

commit 2662fad5b689ecd5dd2a0deaaf15f4c5089a5ae2
Author: Bilal Elmoussaoui <bil elmoussaoui gmail com>
Date:   Tue Mar 10 11:27:18 2020 +0100

    Move meta files to data folder

 {src => data}/gnome-screenshot.1                   |   0
 data/meson.build                                   |  30 ++++++++++++++++++++-
 {src => data}/org.gnome.Screenshot.desktop.in      |   0
 {src => data}/org.gnome.Screenshot.metainfo.xml.in |   2 +-
 {src => data}/org.gnome.Screenshot.service.in      |   0
 .../org.gnome.gnome-screenshot.gschema.xml         |   0
 {src => data/screenshots}/gnome-screenshot.png     | Bin
 po/POTFILES.in                                     |   6 ++---
 src/meson.build                                    |  29 --------------------
 9 files changed, 33 insertions(+), 34 deletions(-)
---
diff --git a/src/gnome-screenshot.1 b/data/gnome-screenshot.1
similarity index 100%
rename from src/gnome-screenshot.1
rename to data/gnome-screenshot.1
diff --git a/data/meson.build b/data/meson.build
index 62ea4cb..645a52e 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,3 +1,31 @@
-# Subdirectories
+i18n.merge_file('desktop',
+                type: 'desktop',
+                input: 'org.gnome.Screenshot.desktop.in',
+                output: 'org.gnome.Screenshot.desktop',
+                po_dir: join_paths(meson.current_source_dir(), '../po'),
+                install: true,
+                install_dir: gnome_screenshot_appsdir)
+
+i18n.merge_file('appdata',
+                input: 'org.gnome.Screenshot.metainfo.xml.in',
+                output: 'org.gnome.Screenshot.metainfo.xml',
+                po_dir: join_paths(meson.current_source_dir(), '../po'),
+                install: true,
+                install_dir: gnome_screenshot_appdatadir)
+
+service_conf = configuration_data ()
+service_conf.set('bindir', gnome_screenshot_bindir)
+configure_file(input: 'org.gnome.Screenshot.service.in',
+               output: 'org.gnome.Screenshot.service',
+               configuration: service_conf,
+               install: true,
+               install_dir: gnome_screenshot_servicesdir)
 
+install_data('org.gnome.gnome-screenshot.gschema.xml',
+             install_dir: gnome_screenshot_schemadir)
+
+install_data('gnome-screenshot.1',
+             install_dir: join_paths(get_option('mandir'), 'man1'))
+
+# Subdirectories
 subdir('icons')
diff --git a/src/org.gnome.Screenshot.desktop.in b/data/org.gnome.Screenshot.desktop.in
similarity index 100%
rename from src/org.gnome.Screenshot.desktop.in
rename to data/org.gnome.Screenshot.desktop.in
diff --git a/src/org.gnome.Screenshot.metainfo.xml.in b/data/org.gnome.Screenshot.metainfo.xml.in
similarity index 93%
rename from src/org.gnome.Screenshot.metainfo.xml.in
rename to data/org.gnome.Screenshot.metainfo.xml.in
index f42cdc0..bba12a4 100644
--- a/src/org.gnome.Screenshot.metainfo.xml.in
+++ b/data/org.gnome.Screenshot.metainfo.xml.in
@@ -27,7 +27,7 @@
   <url type="donation">http://www.gnome.org/friends/</url>
   <screenshots>
     <screenshot type="default">
-      <image>https://git.gnome.org/browse/gnome-screenshot/plain/src/gnome-screenshot.png</image>
+      
<image>https://gitlab.gnome.org/GNOME/gnome-screenshot/-/raw/master/data/screenshots/gnome-screenshot.png</image>
     </screenshot>
   </screenshots>
   <kudos>
diff --git a/src/org.gnome.Screenshot.service.in b/data/org.gnome.Screenshot.service.in
similarity index 100%
rename from src/org.gnome.Screenshot.service.in
rename to data/org.gnome.Screenshot.service.in
diff --git a/src/org.gnome.gnome-screenshot.gschema.xml b/data/org.gnome.gnome-screenshot.gschema.xml
similarity index 100%
rename from src/org.gnome.gnome-screenshot.gschema.xml
rename to data/org.gnome.gnome-screenshot.gschema.xml
diff --git a/src/gnome-screenshot.png b/data/screenshots/gnome-screenshot.png
similarity index 100%
rename from src/gnome-screenshot.png
rename to data/screenshots/gnome-screenshot.png
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7ba43c6..9108dbb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,9 +1,9 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
+data/org.gnome.gnome-screenshot.gschema.xml
+data/org.gnome.Screenshot.desktop.in
+data/org.gnome.Screenshot.metainfo.xml.in
 src/gnome-screenshot.c
-src/org.gnome.gnome-screenshot.gschema.xml
-src/org.gnome.Screenshot.desktop.in
-src/org.gnome.Screenshot.metainfo.xml.in
 src/screenshot-app-menu.ui
 src/screenshot-application.c
 src/screenshot-config.c
diff --git a/src/meson.build b/src/meson.build
index 66b1fb1..b21fa44 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -30,34 +30,5 @@ executable('gnome-screenshot', sources + resources,
            ],
            install: true)
 
-i18n.merge_file('desktop',
-                type: 'desktop',
-                input: 'org.gnome.Screenshot.desktop.in',
-                output: 'org.gnome.Screenshot.desktop',
-                po_dir: join_paths(meson.current_source_dir(), '../po'),
-                install: true,
-                install_dir: gnome_screenshot_appsdir)
-
-i18n.merge_file('appdata',
-                input: 'org.gnome.Screenshot.metainfo.xml.in',
-                output: 'org.gnome.Screenshot.metainfo.xml',
-                po_dir: join_paths(meson.current_source_dir(), '../po'),
-                install: true,
-                install_dir: gnome_screenshot_appdatadir)
-
-service_conf = configuration_data ()
-service_conf.set('bindir', gnome_screenshot_bindir)
-configure_file(input: 'org.gnome.Screenshot.service.in',
-               output: 'org.gnome.Screenshot.service',
-               configuration: service_conf,
-               install: true,
-               install_dir: gnome_screenshot_servicesdir)
-
-install_data('org.gnome.gnome-screenshot.gschema.xml',
-             install_dir: gnome_screenshot_schemadir)
-
-install_data('gnome-screenshot.1',
-             install_dir: join_paths(get_option('mandir'), 'man1'))
-
 install_data('gnome-screenshot.convert',
              install_dir: join_paths(gnome_screenshot_datadir, 'GConf', 'gsettings'))