[gnome-weather] Import the flatpak json file from gnome-apps-nightly

[Giovanni Campagna <gcampagna src gnome org>]

commit 3e00c286cf0adce8c7e5f181aefaff38bf1f0f32
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Wed Mar 8 11:55:06 2017 -0800

    Import the flatpak json file from gnome-apps-nightly
    
    So that gnome-apps-nightly can be set to take the configuration
    from here.
    This means that technically we're making nightly build, even though
    the master branch is stable. I will change the tags when stable
    GNOME is released, so I can tag the dependencies on the stable
    branches.

 data/Makefile.am                                   |   10 ++++----
 ...ata.xml.in => org.gnome.Weather.appdata.xml.in} |    0
 ....Weather.xdg-app.json => org.gnome.Weather.json |   22 ++++++++-----------
 po/POTFILES.in                                     |    2 +-
 4 files changed, 15 insertions(+), 19 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index c6a7d03..72e25d8 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -21,7 +21,7 @@ gsettings_SCHEMAS = $(PACKAGE_NAME).Application.gschema.xml
 
 @GSETTINGS_RULES@
 
-appstream_XML = $(PACKAGE_NAME).Application.appdata.xml
+appstream_XML = $(PACKAGE_NAME).appdata.xml
 
 @APPSTREAM_XML_RULES@
 @INTLTOOL_XML_RULE@
@@ -54,7 +54,7 @@ EXTRA_DIST = \
        $(PACKAGE_NAME).Application.data.gresource.xml \
        $(PACKAGE_NAME).BackgroundService.data.gresource.xml \
        $(gsettings_SCHEMAS) \
-       $(PACKAGE_NAME).Application.appdata.xml.in \
+       $(PACKAGE_NAME).appdata.xml.in \
        $(app_resource_files) \
        $(service_resource_files) \
        $(NULL)
@@ -64,8 +64,8 @@ CLEANFILES = \
        $(PACKAGE_NAME).BackgroundService.service \
        $(PACKAGE_NAME).Application.data.gresource \
        $(PACKAGE_NAME).BackgroundService.data.gresource \
-       $(PACKAGE_NAME).Application.appdata.xml \
-       $(PACKAGE_NAME).Application.appdata.valid \
+       $(PACKAGE_NAME).appdata.xml \
+       $(PACKAGE_NAME).appdata.valid \
        $(apps_DATA) \
        *.valid \
        gschemas.compiled \
@@ -73,6 +73,6 @@ CLEANFILES = \
 
 # For uninstalled use
 all-local:
-       $(GLIB_COMPILE_SCHEMAS) $(builddir)
+       $(GLIB_COMPILE_SCHEMAS) $(srcdir)
 
 -include $(top_srcdir)/git.mk
diff --git a/data/org.gnome.Weather.Application.appdata.xml.in b/data/org.gnome.Weather.appdata.xml.in
similarity index 100%
rename from data/org.gnome.Weather.Application.appdata.xml.in
rename to data/org.gnome.Weather.appdata.xml.in
diff --git a/org.gnome.Weather.xdg-app.json b/org.gnome.Weather.json
similarity index 69%
rename from org.gnome.Weather.xdg-app.json
rename to org.gnome.Weather.json
index 8d171c4..4457008 100644
--- a/org.gnome.Weather.xdg-app.json
+++ b/org.gnome.Weather.json
@@ -1,10 +1,10 @@
 {
     "app-id": "org.gnome.Weather",
-    "branch": "stable",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "3.20",
+    "runtime-version": "master",
     "sdk": "org.gnome.Sdk",
     "command": "/app/share/org.gnome.Weather/org.gnome.Weather.Application",
+    "tags": ["nightly"],
     "finish-args": [
         "--share=ipc", "--socket=x11",
         "--socket=wayland",
@@ -23,9 +23,9 @@
     "cleanup": ["/include", "/lib/pkgconfig",
                 "/share/pkgconfig", "/share/aclocal",
                 "/man", "/share/man", "/share/gtk-doc",
-                "/share/vala", "/bin/gnome-weather",
+                "/share/vala",
                 "*.la", "*.a"],
-    "cleanup-commands": ["appstream-compose --prefix=/app --origin=xdg-app --basename=org.gnome.Weather 
org.gnome.Weather.Application"],
+    "cleanup-commands": [ "desktop-file-edit \"--set-name=(Nightly) Weather\" 
/app/share/applications/org.gnome.Weather.Application.desktop" ],
     "modules": [
         {
             "name": "geocode-glib",
@@ -33,8 +33,7 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "git://git.gnome.org/geocode-glib",
-                    "branch": "3.20.1"
+                    "url": "git://git.gnome.org/geocode-glib"
                 }
             ]
         },
@@ -44,19 +43,17 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "git://git.gnome.org/libgweather",
-                    "branch": "3.20.1"
+                    "url": "git://git.gnome.org/libgweather"
                 }
             ]
         },
         {
             "name": "gnome-desktop",
-            "config-opts": ["--disable-debug-tools"],
+            "config-opts": ["--disable-debug-tools", "--disable-udev"],
             "sources": [
                 {
                     "type": "git",
-                    "url": "git://git.gnome.org/gnome-desktop",
-                    "branch": "3.20.1"
+                    "url": "git://git.gnome.org/gnome-desktop"
                 }
             ]
         },
@@ -65,8 +62,7 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "git://git.gnome.org/gnome-weather",
-                    "branch": "3.20.1"
+                    "url": "git://git.gnome.org/gnome-weather"
                 }
             ]
         }
diff --git a/po/POTFILES.in b/po/POTFILES.in
index bd7f459..ebb4ad8 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,6 @@
 [type: gettext/glade]data/app-menu.ui
 [type: gettext/glade]data/city.ui
-data/org.gnome.Weather.Application.appdata.xml.in
+data/org.gnome.Weather.appdata.xml.in
 data/org.gnome.Weather.Application.desktop.in
 data/org.gnome.Weather.Application.gschema.xml
 [type: gettext/glade]data/places-popover.ui