[gnome-clocks: 3/3] Merge branch 'wip/christopherdavis/flatpak-dual-install' into 'master'

[Paolo Borelli <pborelli src gnome org>]

commit 8f822d080aa2d9b669b54d453431467b83fabc9a
Merge: 1af7bea 01788a6
Author: Paolo Borelli <paolo borelli gmail com>
Date:   Sun Dec 23 21:19:57 2018 +0000

    Merge branch 'wip/christopherdavis/flatpak-dual-install' into 'master'
    
    Allow dual install of flatpak
    
    See merge request GNOME/gnome-clocks!16

 .gitlab-ci.yml                                     |  37 ++++-----------
 data/flatpak/org.gnome.clocks.json                 |   9 ++--
 data/meson.build                                   |  51 ++++++++++++++++-----
 ...a.xml.in => org.gnome.clocks.appdata.xml.in.in} |   4 +-
 ...s.desktop.in => org.gnome.clocks.desktop.in.in} |   2 +-
 data/org.gnome.clocks.search-provider.ini          |   5 --
 data/org.gnome.clocks.search-provider.ini.in       |   5 ++
 data/org.gnome.clocks.service.in                   |   2 +-
 gnome-clocks.flatpak                               | Bin 0 -> 3164128 bytes
 meson.build                                        |  19 ++++++--
 meson_options.txt                                  |   9 ++++
 src/application.vala                               |   4 +-
 src/config.vapi                                    |   3 ++
 src/geocoding.vala                                 |   4 +-
 src/window.vala                                    |  10 +++-
 15 files changed, 104 insertions(+), 60 deletions(-)
---