[gnome-clocks: 4/4] Merge branch 'bilelmoussaoui/meson-cleanup' into 'master'

[Bilal Elmoussaoui <bilelmoussaoui src gnome org>]

commit abc4859cc236bac48c87b4173822c40c7c27b02c
Merge: d774245 8d5515e
Author: Bilal Elmoussaoui <bil elmoussaoui gmail com>
Date:   Wed Sep 25 21:45:10 2019 +0000

    Merge branch 'bilelmoussaoui/meson-cleanup' into 'master'
    
    Build: clean up
    
    See merge request GNOME/gnome-clocks!32

 .gitlab-ci.yml                                    |  2 +-
 {data => build-aux}/flatpak/org.gnome.clocks.json |  0
 {snap => build-aux/snap}/snapcraft.yaml           |  0
 data/meson.build                                  | 53 +++++++++++++++++++----
 meson_options.txt                                 |  3 +-
 5 files changed, 47 insertions(+), 11 deletions(-)
---
diff --cc .gitlab-ci.yml
index 3e3aa03,6ea645c..85e11c5
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -6,10 -6,10 +6,10 @@@ variables
  flatpak:
      image: 'registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master'
      variables:
-         MANIFEST_PATH: "data/flatpak/org.gnome.clocks.json"
+         MANIFEST_PATH: "build-aux/flatpak/org.gnome.clocks.json"
          MESON_ARGS: "-Dprofile=development"
          FLATPAK_MODULE: "gnome-clocks"
 -        RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo";
 +        RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo";
          APP_ID: "org.gnome.clocksDevel"
      extends: .flatpak