From f23ba1208ff3f30e646b9b759a4ca240f26d9794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Fri, 1 Jul 2016 13:36:47 +0100
Subject: Update xdg-app -> flatpak

Change-Id: I0a281f931d469837a5b0bfb54bbd930eb186ffb0
---
 strata/flatpak-common.morph                | 22 ++++++++++++++++++++++
 strata/flatpak-common/elfutils.morph       |  7 +++++++
 strata/flatpak-common/flatpak.morph        |  5 +++++
 strata/xdg-app-common.morph                | 21 ---------------------
 strata/xdg-app-common/elfutils.morph       |  7 -------
 strata/xdg-app-common/xdg-app.morph        |  5 -----
 systems/gnome-system-armv7lhf-jetson.morph |  4 ++--
 systems/gnome-system-x86_64.morph          |  4 ++--
 8 files changed, 38 insertions(+), 37 deletions(-)
 create mode 100644 strata/flatpak-common.morph
 create mode 100644 strata/flatpak-common/elfutils.morph
 create mode 100644 strata/flatpak-common/flatpak.morph
 delete mode 100644 strata/xdg-app-common.morph
 delete mode 100644 strata/xdg-app-common/elfutils.morph
 delete mode 100644 strata/xdg-app-common/xdg-app.morph

diff --git a/strata/flatpak-common.morph b/strata/flatpak-common.morph
new file mode 100644
index 00000000..a3540a09
--- /dev/null
+++ b/strata/flatpak-common.morph
@@ -0,0 +1,22 @@
+name: flatpak-common
+kind: stratum
+build-depends:
+- morph: strata/ostree-core.morph
+- morph: strata/privileges-management.morph
+- morph: strata/x-common.morph
+chunks:
+- name: elfutils
+  morph: strata/flatpak-common/elfutils.morph
+  repo: upstream:elfutils
+  ref: 9b4bce40709611875754cf4931eb91d394042122
+  unpetrify-ref: elfutils-0.165
+- name: flatpak
+  morph: strata/flatpak-common/flatpak.morph
+  repo: upstream:flatpak
+  ref: c741200fa5e22199dc88104bdb73da4583cc8c00
+  unpetrify-ref: 0.6.5
+  build-depends:
+  - elfutils
+  submodules:
+    libglnx:
+      url: upstream:libglnx
diff --git a/strata/flatpak-common/elfutils.morph b/strata/flatpak-common/elfutils.morph
new file mode 100644
index 00000000..45707250
--- /dev/null
+++ b/strata/flatpak-common/elfutils.morph
@@ -0,0 +1,7 @@
+name: elfutils
+kind: chunk
+build-system: autotools
+configure-commands:
+- autoreconf -fi
+- ./configure --prefix="$PREFIX" --sysconfdir=/etc --localstatedir=/var
+              --enable-maintainer-mode
diff --git a/strata/flatpak-common/flatpak.morph b/strata/flatpak-common/flatpak.morph
new file mode 100644
index 00000000..e052c2a3
--- /dev/null
+++ b/strata/flatpak-common/flatpak.morph
@@ -0,0 +1,5 @@
+name: flatpak
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-documentation
diff --git a/strata/xdg-app-common.morph b/strata/xdg-app-common.morph
deleted file mode 100644
index 0cbe8c2c..00000000
--- a/strata/xdg-app-common.morph
+++ /dev/null
@@ -1,21 +0,0 @@
-name: xdg-app-common
-kind: stratum
-build-depends:
-- morph: strata/ostree-core.morph
-- morph: strata/x-common.morph
-chunks:
-- name: elfutils
-  morph: strata/xdg-app-common/elfutils.morph
-  repo: upstream:elfutils
-  ref: 9b4bce40709611875754cf4931eb91d394042122
-  unpetrify-ref: elfutils-0.165
-- name: xdg-app
-  morph: strata/xdg-app-common/xdg-app.morph
-  repo: upstream:xdg-app
-  ref: 619e1f1025851179dee3e616000e5de2ccde9412
-  unpetrify-ref: 0.5.1
-  build-depends:
-  - elfutils
-  submodules:
-    libglnx:
-      url: upstream:libglnx
diff --git a/strata/xdg-app-common/elfutils.morph b/strata/xdg-app-common/elfutils.morph
deleted file mode 100644
index 45707250..00000000
--- a/strata/xdg-app-common/elfutils.morph
+++ /dev/null
@@ -1,7 +0,0 @@
-name: elfutils
-kind: chunk
-build-system: autotools
-configure-commands:
-- autoreconf -fi
-- ./configure --prefix="$PREFIX" --sysconfdir=/etc --localstatedir=/var
-              --enable-maintainer-mode
diff --git a/strata/xdg-app-common/xdg-app.morph b/strata/xdg-app-common/xdg-app.morph
deleted file mode 100644
index 87b205e3..00000000
--- a/strata/xdg-app-common/xdg-app.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: xdg-app
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --disable-documentation
diff --git a/systems/gnome-system-armv7lhf-jetson.morph b/systems/gnome-system-armv7lhf-jetson.morph
index c64b03f5..df82e800 100644
--- a/systems/gnome-system-armv7lhf-jetson.morph
+++ b/systems/gnome-system-armv7lhf-jetson.morph
@@ -67,8 +67,8 @@ strata:
   morph: strata/x-generic.morph
 - name: ostree-core
   morph: strata/ostree-core.morph
-- name: xdg-app-common
-  morph: strata/xdg-app-common.morph
+- name: flatpak-common
+  morph: strata/flatpak-common.morph
 - name: network-security
   morph: strata/network-security.morph
 - name: icu-common
diff --git a/systems/gnome-system-x86_64.morph b/systems/gnome-system-x86_64.morph
index 431da3b0..3a53ab87 100644
--- a/systems/gnome-system-x86_64.morph
+++ b/systems/gnome-system-x86_64.morph
@@ -75,8 +75,8 @@ strata:
   morph: strata/x-generic.morph
 - name: ostree-core
   morph: strata/ostree-core.morph
-- name: xdg-app-common
-  morph: strata/xdg-app-common.morph
+- name: flatpak-common
+  morph: strata/flatpak-common.morph
 - name: network-security
   morph: strata/network-security.morph
 - name: icu-common
-- 
cgit v1.2.1