From 1b7668651d04aa5b7c6d02857f4320b89eaf99e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Thu, 11 Feb 2016 13:00:00 +0000
Subject: Move ModemManager to NetworkManager-common stratum

Change-Id: I9470b2759686fc012e278adb15e0cb871bbaf0db
---
 strata/NetworkManager-common.morph              | 20 ++++++++++++++++++++
 strata/NetworkManager-common/ModemManager.morph |  9 +++++++++
 strata/gnome.morph                              | 19 -------------------
 strata/gnome/ModemManager.morph                 |  9 ---------
 4 files changed, 29 insertions(+), 28 deletions(-)
 create mode 100644 strata/NetworkManager-common/ModemManager.morph
 delete mode 100644 strata/gnome/ModemManager.morph

diff --git a/strata/NetworkManager-common.morph b/strata/NetworkManager-common.morph
index 9c96110f..14994a80 100644
--- a/strata/NetworkManager-common.morph
+++ b/strata/NetworkManager-common.morph
@@ -30,3 +30,23 @@ chunks:
   - libgudev
   - libndp
   - readline6
+- name: libmbim
+  repo: upstream:libmbim
+  ref: 6cf74ebfae1dccf807bb34d88f2cd024d4b14da7
+  unpetrify-ref: master
+  build-system: autotools
+  build-depends:
+  - libgudev
+- name: libqmi
+  repo: upstream:libqmi
+  ref: 97aaa6855d071f64ec2e28df1b9f816da02a3e07
+  unpetrify-ref: master
+  build-system: autotools
+- name: ModemManager
+  morph: strata/NetworkManager-common/ModemManager.morph
+  repo: upstream:ModemManager
+  ref: 0ca68657fbcd5bace3d303a0babe2da292784385
+  unpetrify-ref: master
+  build-depends:
+  - libmbim
+  - libqmi
diff --git a/strata/NetworkManager-common/ModemManager.morph b/strata/NetworkManager-common/ModemManager.morph
new file mode 100644
index 00000000..909f6eca
--- /dev/null
+++ b/strata/NetworkManager-common/ModemManager.morph
@@ -0,0 +1,9 @@
+name: ModemManager
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc
+system-integration:
+  ModemManager-misc:
+    00-enable-ModemManager-unit:
+    - systemctl enable ModemManager
diff --git a/strata/gnome.morph b/strata/gnome.morph
index eef24baa..d3834b13 100644
--- a/strata/gnome.morph
+++ b/strata/gnome.morph
@@ -218,24 +218,6 @@ chunks:
   build-depends:
   - json-glib
   build-system: autotools
-- name: libmbim
-  repo: upstream:libmbim
-  ref: 6cf74ebfae1dccf807bb34d88f2cd024d4b14da7
-  unpetrify-ref: master
-  build-system: autotools
-- name: libqmi
-  repo: upstream:libqmi
-  ref: 97aaa6855d071f64ec2e28df1b9f816da02a3e07
-  unpetrify-ref: master
-  build-system: autotools
-- name: ModemManager
-  morph: strata/gnome/ModemManager.morph
-  repo: upstream:ModemManager
-  ref: 0ca68657fbcd5bace3d303a0babe2da292784385
-  unpetrify-ref: master
-  build-depends:
-  - libmbim
-  - libqmi
 - name: geoclue
   morph: strata/gnome/geoclue.morph
   repo: upstream:geoclue
@@ -243,7 +225,6 @@ chunks:
   unpetrify-ref: 2.4.0
   build-depends:
   - json-glib
-  - ModemManager
 - name: libgweather
   repo: upstream:gnome/libgweather
   ref: 5b8aed611f24d03434eed35e438cea213b894b7c
diff --git a/strata/gnome/ModemManager.morph b/strata/gnome/ModemManager.morph
deleted file mode 100644
index 909f6eca..00000000
--- a/strata/gnome/ModemManager.morph
+++ /dev/null
@@ -1,9 +0,0 @@
-name: ModemManager
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc
-system-integration:
-  ModemManager-misc:
-    00-enable-ModemManager-unit:
-    - systemctl enable ModemManager
-- 
cgit v1.2.1