summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2016-02-11 13:00:00 +0000
committerJavier Jardón <jjardon@gnome.org>2016-02-18 15:42:05 +0000
commit1b7668651d04aa5b7c6d02857f4320b89eaf99e9 (patch)
treeee46214c3b7ee64bb93caeb5b946524fd94f8959
parent5a0c810c6bc52f3719fb073663e39f18bb4fcf8c (diff)
downloaddefinitions-1b7668651d04aa5b7c6d02857f4320b89eaf99e9.tar.gz
Move ModemManager to NetworkManager-common stratum
Change-Id: I9470b2759686fc012e278adb15e0cb871bbaf0db
-rw-r--r--strata/NetworkManager-common.morph20
-rw-r--r--strata/NetworkManager-common/ModemManager.morph (renamed from strata/gnome/ModemManager.morph)0
-rw-r--r--strata/gnome.morph19
3 files changed, 20 insertions, 19 deletions
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/gnome/ModemManager.morph b/strata/NetworkManager-common/ModemManager.morph
index 909f6eca..909f6eca 100644
--- a/strata/gnome/ModemManager.morph
+++ b/strata/NetworkManager-common/ModemManager.morph
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