summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2014-07-10 15:44:05 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2014-07-10 15:44:05 +0000
commit3dd9eb9a74b8da585a6748b7ddc8a9a0b24b9947 (patch)
treec563992daddd94793b0f41f4b397fbe71eec09c3
parent17fdec12655a38459d5ca47361e55f2952e5f081 (diff)
parent096263c36c5dbd3176a1ff0dfd72d6515891ec04 (diff)
downloaddefinitions-3dd9eb9a74b8da585a6748b7ddc8a9a0b24b9947.tar.gz
Merge branch 'baserock/liw/genivi-h-1.1'
Reviewed-by: Richard Maw on IRC Reviewed-by: Pedro Alvarez on IRC
-rw-r--r--wayland-armv7-versatile.morph8
-rw-r--r--wayland-x86_64-generic.morph8
2 files changed, 8 insertions, 8 deletions
diff --git a/wayland-armv7-versatile.morph b/wayland-armv7-versatile.morph
index 1bc2019c..3980c170 100644
--- a/wayland-armv7-versatile.morph
+++ b/wayland-armv7-versatile.morph
@@ -110,8 +110,8 @@ chunks:
- freefont-otf
- name: weston
repo: upstream:weston
- ref: 721c0f13ab80eb209983c1d73e168df4ffb70ddc
- unpetrify-ref: baserock/genivi/weston-ivi-shell-patches
+ ref: 8658e06e69cc3944e89684a2de619e479751633f
+ unpetrify-ref: baserock/genivi/baseline-h-1.1
build-depends:
- pango
- pixman
@@ -122,8 +122,8 @@ chunks:
- cairo
- name: wayland-ivi-extension
repo: upstream:genivi/wayland-ivi-extension
- ref: 167029fad4d2896491093ee313a663f2f057217e
- unpetrify-ref: baserock/genivi/baseline
+ ref: 8b59529cf3b279a948f253bc79263d00d3f051a5
+ unpetrify-ref: baserock/genivi/baseline-h-1.1
build-depends:
- wayland
- weston
diff --git a/wayland-x86_64-generic.morph b/wayland-x86_64-generic.morph
index 6441a1f3..353b953b 100644
--- a/wayland-x86_64-generic.morph
+++ b/wayland-x86_64-generic.morph
@@ -110,8 +110,8 @@ chunks:
- freefont-otf
- name: weston
repo: upstream:weston
- ref: 721c0f13ab80eb209983c1d73e168df4ffb70ddc
- unpetrify-ref: baserock/genivi/weston-ivi-shell-patches
+ ref: 8658e06e69cc3944e89684a2de619e479751633f
+ unpetrify-ref: baserock/genivi/baseline-h-1.1
build-depends:
- pango
- wayland
@@ -122,8 +122,8 @@ chunks:
- libxkbcommon
- name: wayland-ivi-extension
repo: upstream:genivi/wayland-ivi-extension
- ref: 167029fad4d2896491093ee313a663f2f057217e
- unpetrify-ref: baserock/genivi/baseline
+ ref: 8b59529cf3b279a948f253bc79263d00d3f051a5
+ unpetrify-ref: baserock/genivi/baseline-h-1.1
build-depends:
- wayland
- weston