From 2820220193a4ba871d25b210448a4117c0854637 Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Mon, 17 Feb 2014 16:59:56 +0000
Subject: Re-order system and stratum morphology fields.

This is the new canonical ordering.
---
 x-x86_64-generic.morph | 194 ++++++++++++++++++++++++-------------------------
 1 file changed, 97 insertions(+), 97 deletions(-)

(limited to 'x-x86_64-generic.morph')

diff --git a/x-x86_64-generic.morph b/x-x86_64-generic.morph
index 0c00b268..0b080525 100644
--- a/x-x86_64-generic.morph
+++ b/x-x86_64-generic.morph
@@ -1,82 +1,87 @@
+name: x-x86_64-generic
+kind: stratum
 build-depends:
 - morph: x-common
 chunks:
-- build-depends: []
-  name: mesa-x
-  ref: baserock/genivi/morph
+- name: mesa-x
   repo: upstream:mesa
-- build-depends: []
-  name: xorg-lib-libxkbfile
-  ref: baserock/morph
+  ref: baserock/genivi/morph
+  build-depends: []
+- name: xorg-lib-libxkbfile
   repo: upstream:xorg-lib-libxkbfile
-- build-depends: []
-  name: pixman
   ref: baserock/morph
+  build-depends: []
+- name: pixman
   repo: upstream:pixman
-- build-depends: []
-  name: xorg-font-util
   ref: baserock/morph
+  build-depends: []
+- name: xorg-font-util
   repo: upstream:xorg-font-util
-- build-depends:
-  - xorg-font-util
-  name: xorg-lib-libfontenc
   ref: baserock/morph
+  build-depends: []
+- name: xorg-lib-libfontenc
   repo: upstream:xorg-lib-libfontenc
-- build-depends: []
-  name: freetype2
   ref: baserock/morph
+  build-depends:
+  - xorg-font-util
+- name: freetype2
   repo: upstream:freetype2
-- build-depends:
-  - freetype2
-  name: fontconfig
   ref: baserock/morph
+  build-depends: []
+- name: fontconfig
   repo: upstream:fontconfig
-- build-depends:
-  - freetype2
-  - xorg-lib-libfontenc
-  name: xorg-lib-libXfont
   ref: baserock/morph
+  build-depends:
+  - freetype2
+- name: xorg-lib-libXfont
   repo: upstream:xorg-lib-libXfont
-- build-depends: []
-  name: freefont-otf
   ref: baserock/morph
+  build-depends:
+  - freetype2
+  - xorg-lib-libfontenc
+- name: freefont-otf
   repo: upstream:freefont-otf
-- build-depends: []
-  name: xorg-lib-libICE
   ref: baserock/morph
+  build-depends: []
+- name: xorg-lib-libICE
   repo: upstream:xorg-lib-libICE
-- build-depends:
-  - xorg-lib-libICE
-  name: xorg-lib-libSM
   ref: baserock/morph
+  build-depends: []
+- name: xorg-lib-libSM
   repo: upstream:xorg-lib-libSM
-- build-depends:
-  - xorg-lib-libSM
-  name: xorg-lib-libXt
   ref: baserock/morph
+  build-depends:
+  - xorg-lib-libICE
+- name: xorg-lib-libXt
   repo: upstream:xorg-lib-libXt
-- build-depends:
-  - xorg-lib-libXt
-  name: xorg-lib-libXmu
   ref: baserock/morph
+  build-depends:
+  - xorg-lib-libSM
+- name: xorg-lib-libXmu
   repo: upstream:xorg-lib-libXmu
-- build-depends:
-  - xorg-lib-libXt
-  name: xorg-lib-libXpm
   ref: baserock/morph
+  build-depends:
+  - xorg-lib-libXt
+- name: xorg-lib-libXpm
   repo: upstream:xorg-lib-libXpm
-- build-depends:
+  ref: baserock/morph
+  build-depends:
+  - xorg-lib-libXt
+- name: xorg-lib-libXaw
+  repo: upstream:xorg-lib-libXaw
+  ref: baserock/morph
+  build-depends:
   - xorg-lib-libXmu
   - xorg-lib-libXpm
   - xorg-lib-libXt
-  name: xorg-lib-libXaw
+- name: libsha1
+  repo: upstream:libsha1
   ref: baserock/morph
-  repo: upstream:xorg-lib-libXaw
-- build-depends: []
-  name: libsha1
+  build-depends: []
+- name: xserver
+  repo: upstream:xserver
   ref: baserock/morph
-  repo: upstream:libsha1
-- build-depends:
+  build-depends:
   - libsha1
   - mesa-x
   - pixman
@@ -88,86 +93,81 @@ chunks:
   - xorg-lib-libXt
   - xorg-lib-libfontenc
   - xorg-lib-libxkbfile
-  name: xserver
-  ref: baserock/morph
-  repo: upstream:xserver
-- build-depends:
-  - xserver
-  name: xorg-driver-xf86-video-cirrus
-  ref: baserock/morph
+- name: xorg-driver-xf86-video-cirrus
   repo: upstream:xorg-driver-xf86-video-cirrus
-- build-depends:
-  - xserver
-  name: xorg-driver-xf86-video-fbdev
   ref: baserock/morph
-  repo: upstream:xorg-driver-xf86-video-fbdev
-- build-depends:
+  build-depends:
   - xserver
-  name: xorg-driver-xf86-video-vesa
+- name: xorg-driver-xf86-video-fbdev
+  repo: upstream:xorg-driver-xf86-video-fbdev
   ref: baserock/morph
-  repo: upstream:xorg-driver-xf86-video-vesa
-- build-depends:
+  build-depends:
   - xserver
-  name: xorg-driver-xf86-input-evdev
+- name: xorg-driver-xf86-video-vesa
+  repo: upstream:xorg-driver-xf86-video-vesa
   ref: baserock/morph
-  repo: upstream:xorg-driver-xf86-input-evdev
-- build-depends:
+  build-depends:
   - xserver
-  name: xorg-driver-xf86-input-keyboard
+- name: xorg-driver-xf86-input-evdev
+  repo: upstream:xorg-driver-xf86-input-evdev
   ref: baserock/morph
-  repo: upstream:xorg-driver-xf86-input-keyboard
-- build-depends:
+  build-depends:
   - xserver
-  name: xorg-driver-xf86-input-mouse
+- name: xorg-driver-xf86-input-keyboard
+  repo: upstream:xorg-driver-xf86-input-keyboard
   ref: baserock/morph
+  build-depends:
+  - xserver
+- name: xorg-driver-xf86-input-mouse
   repo: upstream:xorg-driver-xf86-input-mouse
-- build-depends:
-  - xorg-lib-libxkbfile
-  name: xorg-app-xkbcomp
   ref: baserock/morph
+  build-depends:
+  - xserver
+- name: xorg-app-xkbcomp
   repo: upstream:xorg-app-xkbcomp
-- build-depends:
-  - xorg-app-xkbcomp
-  name: xkeyboard-config
   ref: baserock/morph
+  build-depends:
+  - xorg-lib-libxkbfile
+- name: xkeyboard-config
   repo: upstream:xkeyboard-config
-- build-depends: []
-  name: xorg-app-xinit
   ref: baserock/morph
+  build-depends:
+  - xorg-app-xkbcomp
+- name: xorg-app-xinit
   repo: upstream:xorg-app-xinit
-- build-depends:
-  - fontconfig
-  - freetype2
-  name: xorg-lib-libXft
   ref: baserock/morph
+  build-depends: []
+- name: xorg-lib-libXft
   repo: upstream:xorg-lib-libXft
-- build-depends: []
-  name: xcb-util
   ref: baserock/morph
+  build-depends:
+  - fontconfig
+  - freetype2
+- name: xcb-util
   repo: upstream:xcb-util
-- build-depends: []
-  name: util-wm
   ref: baserock/morph
+  build-depends: []
+- name: util-wm
   repo: upstream:util-wm
-- build-depends: []
-  name: util-keysyms
   ref: baserock/morph
+  build-depends: []
+- name: util-keysyms
   repo: upstream:util-keysyms
-- build-depends:
-  - xcb-util
-  name: util-image
   ref: baserock/morph
+  build-depends: []
+- name: util-image
   repo: upstream:util-image
-- build-depends:
-  - xorg-lib-libXaw
-  - xorg-lib-libxkbfile
-  name: xterm
   ref: baserock/morph
+  build-depends:
+  - xcb-util
+- name: xterm
   repo: upstream:xterm
-- build-depends:
-  - xorg-lib-libXmu
-  name: xorg-app-xauth
   ref: baserock/morph
+  build-depends:
+  - xorg-lib-libXaw
+  - xorg-lib-libxkbfile
+- name: xorg-app-xauth
   repo: upstream:xorg-app-xauth
-kind: stratum
-name: x-x86_64-generic
+  ref: baserock/morph
+  build-depends:
+  - xorg-lib-libXmu
-- 
cgit v1.2.1