[gnome-weather: 3/3] Merge branch 'wip/christopherdavis/unify-app-id' into 'master'

[Christopher Davis <christopherdavis src gnome org>]

commit 7951c7e402ed52ee1b40900c5845063b3d367798
Merge: 6e5770c a0b4717
Author: Christopher Davis <brainblasted disroot org>
Date:   Thu Jan 31 15:37:32 2019 +0000

    Merge branch 'wip/christopherdavis/unify-app-id' into 'master'
    
    Unify App ID
    
    See merge request GNOME/gnome-weather!10

 data/meson.build                                     | 20 ++++++++++----------
 data/org.gnome.Weather.Application.service.in        |  3 ---
 data/org.gnome.Weather.appdata.xml.in                |  5 ++++-
 ...urce.xml => org.gnome.Weather.data.gresource.xml} |  2 +-
 ...desktop.in.in => org.gnome.Weather.desktop.in.in} |  2 +-
 ...ion.gschema.xml => org.gnome.Weather.gschema.xml} |  2 +-
 ...der.ini => org.gnome.Weather.search-provider.ini} |  2 +-
 data/org.gnome.Weather.service.in                    |  3 +++
 org.gnome.Weather-unstable.json                      |  2 +-
 po/POTFILES.in                                       |  4 ++--
 src/app/city.js                                      |  4 ++--
 src/app/currentLocationController.js                 |  2 +-
 src/app/main.js                                      |  2 +-
 src/app/window.js                                    |  4 ++--
 src/app/world.js                                     |  2 +-
 src/meson.build                                      |  8 ++++----
 ...e.Weather.Application.in => org.gnome.Weather.in} |  0
 ...ource.xml => org.gnome.Weather.src.gresource.xml} |  2 +-
 src/service/searchProvider.js                        |  4 ++--
 src/shared/world.js                                  |  2 +-
 tests/testutil.py                                    |  4 ++--
 21 files changed, 41 insertions(+), 38 deletions(-)
---