[gnome-builder] build: move manifest to toplevel

[Christian Hergert <chergert src gnome org>]

commit 266744004312ddd534a2adec179489f1eea23bdb
Author: Christian Hergert <chergert redhat com>
Date:   Fri Jul 22 10:47:48 2022 -0700

    build: move manifest to toplevel
    
    This makes it a bit easier to find, even if we keep the scripts in a
    subdirectory of build-aux/.

 .gitlab-ci.yml                                     |  2 +-
 ...lder.Devel.json => org.gnome.Builder.Devel.json | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 61c36ce72..002e4736d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ flatpak:
     GIT_SUBMODULE_STRATEGY: normal
 
     # Replace with your manifest path
-    MANIFEST_PATH: "build-aux/flatpak/org.gnome.Builder.Devel.json"
+    MANIFEST_PATH: "org.gnome.Builder.Devel.json"
     RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo";
     # Replace with your application name, as written in the manifest
     FLATPAK_MODULE: "gnome-builder"
diff --git a/build-aux/flatpak/org.gnome.Builder.Devel.json b/org.gnome.Builder.Devel.json
similarity index 96%
rename from build-aux/flatpak/org.gnome.Builder.Devel.json
rename to org.gnome.Builder.Devel.json
index 18fa957d1..efcbc6e4b 100644
--- a/build-aux/flatpak/org.gnome.Builder.Devel.json
+++ b/org.gnome.Builder.Devel.json
@@ -89,8 +89,8 @@
         "*.a"
     ],
     "modules" : [
-        "python-deps.json",
-        "python3-jedi-language-server.json",
+        "build-aux/flatpak/python-deps.json",
+        "build-aux/flatpak/python3-jedi-language-server.json",
         {
             "name" : "gperftools",
             "cleanup" : [
@@ -134,7 +134,7 @@
                 "/bin/ulockmgr_server"
             ],
             "post-install" : [
-                "install -m a+rx fusermount-wrapper.sh /app/bin/fusermount"
+                "install -m a+rx build-aux/flatpak/fusermount-wrapper.sh /app/bin/fusermount"
             ],
             "sources" : [
                 {
@@ -144,19 +144,19 @@
                 },
                 {
                     "type" : "patch",
-                    "path" : "fuse-2.9.2-namespace-conflict-fix.patch"
+                    "path" : "build-aux/flatpak/fuse-2.9.2-namespace-conflict-fix.patch"
                 },
                 {
                     "type" : "patch",
-                    "path" : "fuse-disable-sys-mount-under-flatpak.patch"
+                    "path" : "build-aux/flatpak/fuse-disable-sys-mount-under-flatpak.patch"
                 },
                 {
                     "type" : "patch",
-                    "path" : "fuse-2.9.2-closefrom.patch"
+                    "path" : "build-aux/flatpak/fuse-2.9.2-closefrom.patch"
                 },
                 {
                     "type" : "file",
-                    "path" : "fusermount-wrapper.sh"
+                    "path" : "build-aux/flatpak/fusermount-wrapper.sh"
                 }
             ]
         },
@@ -204,11 +204,11 @@
                 },
                 {
                     "type" : "patch",
-                    "path" : "polkit-build-Add-option-to-build-without-polkitd.patch"
+                    "path" : "build-aux/flatpak/polkit-build-Add-option-to-build-without-polkitd.patch"
                 },
                 {
                     "type" : "file",
-                    "path" : "polkit-autogen",
+                    "path" : "build-aux/flatpak/polkit-autogen",
                     "dest-filename" : "autogen.sh"
                 }
             ]
@@ -593,8 +593,8 @@
                 }
             ]
         },
-        "typescript-language-server.json",
-        "intelephense-language-server.json",
+        "build-aux/flatpak/typescript-language-server.json",
+        "build-aux/flatpak/intelephense-language-server.json",
         {
             "name" : "libpanel",
             "buildsystem" : "meson",