summaryrefslogtreecommitdiff
path: root/strata/core.morph
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-09-15 17:38:54 +0100
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-09-15 17:38:54 +0100
commit0a8fa2da3197a43a220e8d68a3287a66f90b2104 (patch)
treea2a61c375a0530392ccc125ecf62bd6357219f74 /strata/core.morph
parent60ae4a0ab0e23a9257adb75eca856224dfec0f58 (diff)
parenta97ab1a95090ccffe1eaf83808769f62f058b6c0 (diff)
downloaddefinitions-0a8fa2da3197a43a220e8d68a3287a66f90b2104.tar.gz
Merge branch 'jjardon/automake-1.14'
Reviewed-By: Daniel Silverstone <daniel.silverstone@codethink.co.uk> Reviewed-By: Sam Thursfield <sam.thursfield@codethink.co.uk>
Diffstat (limited to 'strata/core.morph')
-rw-r--r--strata/core.morph17
1 files changed, 13 insertions, 4 deletions
diff --git a/strata/core.morph b/strata/core.morph
index 857524e6..4c6a23bf 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -77,8 +77,8 @@ chunks:
- name: automake
morph: strata/core/automake.morph
repo: upstream:automake
- ref: 5ac84ae6760252fc60b144a7b4deb41694f95fe7
- unpetrify-ref: baserock/morph
+ ref: ba4b42faff673e3e5265416dff09e59affc688fb
+ unpetrify-ref: v1.14.1
build-depends:
- autoconf
- perl
@@ -169,8 +169,8 @@ chunks:
- name: curl
morph: strata/core/curl.morph
repo: upstream:curl
- ref: 3c835adc9fe20f7b34df3f0abd4db6ff8b75bc3b
- unpetrify-ref: baserock/morph
+ ref: 202aa9f7758636730299b86715d924f54468a908
+ unpetrify-ref: curl-7_38_0
build-depends:
- autoconf
- automake
@@ -206,6 +206,14 @@ chunks:
- gettext
- libexpat
- openssl-new
+- name: help2man
+ morph: strata/core/help2man.morph
+ repo: upstream:help2man
+ ref: 0191a5f61525f8deea2ae8bdfea88190d85b6a71
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - autoconf
+ - automake
- name: bison
morph: strata/core/bison.morph
repo: upstream:bison
@@ -218,6 +226,7 @@ chunks:
- flex
- gettext
- git
+ - help2man
- mini-utils
- name: gperf
morph: strata/core/gperf.morph