summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2014-08-15 17:23:41 +0100
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2014-08-15 17:23:41 +0100
commita90e321bbd4e431c27d7919c18d36ec1de02a2ba (patch)
tree4d54c30bf5033b0041eab67a827a3f80d21abefb
parent72ddb20826c94dc3e3267336ca017202bd234373 (diff)
parent861ac25c2c59f0448114bc4fd9755c5af3063a7d (diff)
downloaddefinitions-a90e321bbd4e431c27d7919c18d36ec1de02a2ba.tar.gz
Merge branch 'baserock/franred/fixing-chunks'
Merged by: Francisco Redondo Marchena <francisco.marchena@codethink.co.uk> Review by: Pedro Alvarez Piedehierro <pedro.alvarez@codethink.co.uk>
-rw-r--r--foundation.morph2
-rw-r--r--lua.morph2
-rw-r--r--qt5-tools.morph2
-rw-r--r--wayland-armv7-versatile.morph2
-rw-r--r--wayland-x86_64-generic.morph2
-rw-r--r--x-generic.morph2
6 files changed, 6 insertions, 6 deletions
diff --git a/foundation.morph b/foundation.morph
index 6ddb32d8..c8606bb5 100644
--- a/foundation.morph
+++ b/foundation.morph
@@ -6,7 +6,7 @@ build-depends:
chunks:
- name: attr
repo: upstream:attr
- ref: 803387f4cd792982b86d45796fbb4df559d9db44
+ ref: bf32f1769e9895f8546570f0c841a945c93a5b22
unpetrify-ref: baserock/morph
build-depends: []
- name: groff
diff --git a/lua.morph b/lua.morph
index 8ad1dfec..3b92e08c 100644
--- a/lua.morph
+++ b/lua.morph
@@ -6,6 +6,6 @@ build-depends:
chunks:
- name: lua
repo: upstream:lua
- ref: bedbdc0f03bca4fe97200ddf9c3d6cb210b45888
+ ref: 948063437e0350d9ef1649ec3a76d0c24a5c8642
unpetrify-ref: baserock/5.1-morph
build-depends: []
diff --git a/qt5-tools.morph b/qt5-tools.morph
index 26e57550..27c594d1 100644
--- a/qt5-tools.morph
+++ b/qt5-tools.morph
@@ -24,7 +24,7 @@ chunks:
- ruby-1.8
- name: qtbase
repo: upstream:qt5/qtbase
- ref: 79be8352ced650e98ab0afe89e91cffee4f6a04a
+ ref: 55f24d7e91e7c906cf4e3a3ef7a4d95ff094a7a8
unpetrify-ref: baserock/morph
build-depends:
- icu
diff --git a/wayland-armv7-versatile.morph b/wayland-armv7-versatile.morph
index 3980c170..70502b5c 100644
--- a/wayland-armv7-versatile.morph
+++ b/wayland-armv7-versatile.morph
@@ -38,7 +38,7 @@ chunks:
- freetype2
- name: freefont-otf
repo: upstream:freefont-otf
- ref: 0ca3ccce74e81f7feb6e922edd988be0e1a43f05
+ ref: 75fa95a912718bb94a135d4bf6b13bb38e186ce7
unpetrify-ref: baserock/morph
build-depends: []
- name: cairo
diff --git a/wayland-x86_64-generic.morph b/wayland-x86_64-generic.morph
index 353b953b..e01b3a3f 100644
--- a/wayland-x86_64-generic.morph
+++ b/wayland-x86_64-generic.morph
@@ -38,7 +38,7 @@ chunks:
- freetype2
- name: freefont-otf
repo: upstream:freefont-otf
- ref: 0ca3ccce74e81f7feb6e922edd988be0e1a43f05
+ ref: 75fa95a912718bb94a135d4bf6b13bb38e186ce7
unpetrify-ref: baserock/morph
build-depends: []
- name: cairo
diff --git a/x-generic.morph b/x-generic.morph
index 8309a88e..82902c03 100644
--- a/x-generic.morph
+++ b/x-generic.morph
@@ -49,7 +49,7 @@ chunks:
- xorg-lib-libfontenc
- name: freefont-otf
repo: upstream:freefont-otf
- ref: 0ca3ccce74e81f7feb6e922edd988be0e1a43f05
+ ref: 75fa95a912718bb94a135d4bf6b13bb38e186ce7
unpetrify-ref: baserock/morph
build-depends: []
- name: xorg-lib-libICE