From 791af2da97781662db9f8834d58fa8d1ccf99ff8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 11 Feb 2016 12:59:31 +0000
Subject: Move ofono to connman-common stratum

Change-Id: Iaa5984c556f9a9fcc0142eaf5d1eded1ecaaa248
---
 strata/audio-bluetooth.morph       |  5 -----
 strata/audio-bluetooth/ofono.morph | 11 -----------
 strata/connman-common.morph        |  5 +++++
 strata/connman-common/ofono.morph  | 11 +++++++++++
 4 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 strata/audio-bluetooth/ofono.morph
 create mode 100644 strata/connman-common/ofono.morph

diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph
index 53d01c8f..b2033717 100644
--- a/strata/audio-bluetooth.morph
+++ b/strata/audio-bluetooth.morph
@@ -68,11 +68,6 @@ chunks:
   build-depends:
   - bluez
   - speex
-- name: ofono
-  morph: strata/audio-bluetooth/ofono.morph
-  repo: upstream:ofono
-  ref: d05b718cc0b0d367227fbfbf52e60fc5462cc549
-  unpetrify-ref: '1.15'
 - name: json-c
   morph: strata/audio-bluetooth/json-c.morph
   repo: upstream:json-c
diff --git a/strata/audio-bluetooth/ofono.morph b/strata/audio-bluetooth/ofono.morph
deleted file mode 100644
index a775b0c1..00000000
--- a/strata/audio-bluetooth/ofono.morph
+++ /dev/null
@@ -1,11 +0,0 @@
-name: ofono
-kind: chunk
-description: ofono Open Source Telephony
-build-system: autotools
-configure-commands:
-- autoreconf -ivf
-- ./configure --prefix="$PREFIX" --sysconfdir=/etc --localstatedir=/var
-install-commands:
-- make install
-- mkdir -p "$DESTDIR/etc/systemd/system/multi-user.target.wants"
-- ln -s /lib/systemd/system/ofono.service "$DESTDIR/etc/systemd/system/multi-user.target.wants/ofono.service"
diff --git a/strata/connman-common.morph b/strata/connman-common.morph
index fde00436..415b2fa4 100644
--- a/strata/connman-common.morph
+++ b/strata/connman-common.morph
@@ -9,3 +9,8 @@ chunks:
   repo: upstream:connman
   ref: 9951ba7a0353cfc884e96833c64e58c1bcae3f44
   unpetrify-ref: baserock/1.24
+- name: ofono
+  morph: strata/connman-common/ofono.morph
+  repo: upstream:ofono
+  ref: d05b718cc0b0d367227fbfbf52e60fc5462cc549
+  unpetrify-ref: '1.15'
diff --git a/strata/connman-common/ofono.morph b/strata/connman-common/ofono.morph
new file mode 100644
index 00000000..a775b0c1
--- /dev/null
+++ b/strata/connman-common/ofono.morph
@@ -0,0 +1,11 @@
+name: ofono
+kind: chunk
+description: ofono Open Source Telephony
+build-system: autotools
+configure-commands:
+- autoreconf -ivf
+- ./configure --prefix="$PREFIX" --sysconfdir=/etc --localstatedir=/var
+install-commands:
+- make install
+- mkdir -p "$DESTDIR/etc/systemd/system/multi-user.target.wants"
+- ln -s /lib/systemd/system/ofono.service "$DESTDIR/etc/systemd/system/multi-user.target.wants/ofono.service"
-- 
cgit v1.2.1