[polari] build: Move meson/ and flatpak/ directories out of build-aux

[Florian Müllner <fmuellner src gnome org>]

commit a23d0c029ed204bc464b9e9bf84aed7292d50db4
Author: Florian Müllner <fmuellner gnome org>
Date:   Sat Apr 8 21:03:53 2017 +0200

    build: Move meson/ and flatpak/ directories out of build-aux
    
    build-aux is a dumping ground for autotools-generated files, mixing
    them with non-generated files under version control is a bit icky.
    Using toplevel meson/ and flatpak/ directories seems what most GNOME
    projects are settling on, so do the same.

 .gitignore                                         |    4 +---
 .../flatpak => flatpak}/tp-change-uniquify.patch   |    0
 .../flatpak => flatpak}/tpl-override-basedir.patch |    0
 meson.build                                        |    2 +-
 {build-aux/meson => meson}/meson-postinstall.sh    |    0
 org.gnome.Polari-unstable.json                     |    4 ++--
 org.gnome.Polari.json                              |    4 ++--
 7 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 45beae9..0b40d05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,9 +15,7 @@ Makefile
 Makefile.in
 aclocal.m4
 autom4te.cache/
-build-aux/*
-!build-aux/flatpak
-!build-aux/meson
+build-aux/
 config.*
 configure
 data/appdata/*.appdata.valid
diff --git a/build-aux/flatpak/tp-change-uniquify.patch b/flatpak/tp-change-uniquify.patch
similarity index 100%
rename from build-aux/flatpak/tp-change-uniquify.patch
rename to flatpak/tp-change-uniquify.patch
diff --git a/build-aux/flatpak/tpl-override-basedir.patch b/flatpak/tpl-override-basedir.patch
similarity index 100%
rename from build-aux/flatpak/tpl-override-basedir.patch
rename to flatpak/tpl-override-basedir.patch
diff --git a/meson.build b/meson.build
index 8095809..94f8587 100644
--- a/meson.build
+++ b/meson.build
@@ -47,4 +47,4 @@ subdir('data')
 subdir('po')
 subdir('help')
 
-meson.add_install_script('build-aux/meson/meson-postinstall.sh')
+meson.add_install_script('meson/meson-postinstall.sh')
diff --git a/build-aux/meson/meson-postinstall.sh b/meson/meson-postinstall.sh
similarity index 100%
rename from build-aux/meson/meson-postinstall.sh
rename to meson/meson-postinstall.sh
diff --git a/org.gnome.Polari-unstable.json b/org.gnome.Polari-unstable.json
index 3a122fd..5c32bc1 100644
--- a/org.gnome.Polari-unstable.json
+++ b/org.gnome.Polari-unstable.json
@@ -69,7 +69,7 @@
                 },
                 {
                     "type": "patch",
-                    "path": "build-aux/flatpak/tp-change-uniquify.patch"
+                    "path": "flatpak/tp-change-uniquify.patch"
                 }
             ]
         },
@@ -106,7 +106,7 @@
                 },
                 {
                     "type": "patch",
-                    "path": "build-aux/flatpak/tpl-override-basedir.patch"
+                    "path": "flatpak/tpl-override-basedir.patch"
                 }
             ]
         },
diff --git a/org.gnome.Polari.json b/org.gnome.Polari.json
index 90267a9..8110d44 100644
--- a/org.gnome.Polari.json
+++ b/org.gnome.Polari.json
@@ -68,7 +68,7 @@
                 },
                 {
                     "type": "patch",
-                    "path": "build-aux/flatpak/tp-change-uniquify.patch"
+                    "path": "flatpak/tp-change-uniquify.patch"
                 }
             ]
         },
@@ -105,7 +105,7 @@
                 },
                 {
                     "type": "patch",
-                    "path": "build-aux/flatpak/tpl-override-basedir.patch"
+                    "path": "flatpak/tpl-override-basedir.patch"
                 }
             ]
         },