[gnome-music/wip/mschraal/3-30-flatpak] flatpak: Mark as stable 3.30

[Jean Felder <jfelder src gnome org>]

commit aeb3d6c3e57c9c890e5634d77891d1efc608d9a0
Author: Marinus Schraal <mschraal gnome org>
Date:   Tue Sep 4 09:09:46 2018 +0200

    flatpak: Mark as stable 3.30

 .gitlab-ci.yml       |  8 ++++----
 org.gnome.Music.json | 11 ++++-------
 2 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2afeecaa..c796caaf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,18 +5,18 @@ stages:
   - deploy
 
 variables:
-  BUNDLE: "gnome-music-dev.flatpak"
-  DBUS_ID: "org.gnome.MusicDevel"
+  BUNDLE: "gnome-music.flatpak"
+  DBUS_ID: "org.gnome.Music"
   FLATPAK_MODULE: "gnome-music"
   GIT_SUBMODULE_STRATEGY: normal
   MANIFEST_PATH: "org.gnome.Music.json"
-  RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo";
+  RUNTIME_REPO: "https://sdk.gnome.org/gnome.flatpakrepo";
 
 flatpak:
   stage: build-flatpak
   script:
     - flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH}
-    - flatpak build app meson --prefix=/app -Dprofile=development _build
+    - flatpak build app meson --prefix=/app _build
     - flatpak build app ninja -C _build install
     - flatpak-builder --finish-only --repo=repo app ${MANIFEST_PATH}
     - flatpak build-bundle repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${DBUS_ID}
diff --git a/org.gnome.Music.json b/org.gnome.Music.json
index 632bbe2f..a3d8a768 100644
--- a/org.gnome.Music.json
+++ b/org.gnome.Music.json
@@ -1,11 +1,10 @@
 {
-    "app-id": "org.gnome.MusicDevel",
+    "app-id": "org.gnome.Music",
     "runtime": "org.gnome.Platform",
     "runtime-version": "master",
     "sdk": "org.gnome.Sdk",
     "command": "gnome-music",
-    "tags": ["devel", "development", "nightly"],
-    "desktop-file-name-prefix": "(Development) ",
+    "tags": ["stable", "3.30"],
     "finish-args": [
         "--share=ipc", "--socket=x11",
         "--share=network",
@@ -89,7 +88,8 @@
             "sources": [
                 {
                     "type": "git",
-                    "url": "https://gitlab.gnome.org/GNOME/gnome-online-accounts.git";
+                    "url": "https://gitlab.gnome.org/GNOME/gnome-online-accounts.git";,
+                    "branch": "gnome-3-30"
                 }
             ]
         },
@@ -143,9 +143,6 @@
         },
         {
             "name": "gnome-music",
-            "config-opts" : [
-                "-Dprofile=development"
-            ],
             "buildsystem": "meson",
             "sources": [
                 {