diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-09-15 17:38:54 +0100 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-09-15 17:38:54 +0100 |
commit | 0a8fa2da3197a43a220e8d68a3287a66f90b2104 (patch) | |
tree | a2a61c375a0530392ccc125ecf62bd6357219f74 | |
parent | 60ae4a0ab0e23a9257adb75eca856224dfec0f58 (diff) | |
parent | a97ab1a95090ccffe1eaf83808769f62f058b6c0 (diff) | |
download | definitions-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>
-rw-r--r-- | strata/core.morph | 17 | ||||
-rw-r--r-- | strata/core/automake.morph | 2 | ||||
-rw-r--r-- | strata/core/help2man.morph (renamed from strata/foundation/help2man.morph) | 0 | ||||
-rw-r--r-- | strata/foundation.morph | 6 | ||||
-rw-r--r-- | strata/gtk2.morph | 3 | ||||
-rw-r--r-- | strata/x-common.morph | 16 |
6 files changed, 23 insertions, 21 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 diff --git a/strata/core/automake.morph b/strata/core/automake.morph index 616eeddf..282535d6 100644 --- a/strata/core/automake.morph +++ b/strata/core/automake.morph @@ -2,7 +2,7 @@ name: automake kind: chunk build-system: autotools configure-commands: -- ./bootstrap +- ./bootstrap.sh - ./configure --prefix="$PREFIX" build-commands: - unset DESTDIR; make diff --git a/strata/foundation/help2man.morph b/strata/core/help2man.morph index e25a8d8e..e25a8d8e 100644 --- a/strata/foundation/help2man.morph +++ b/strata/core/help2man.morph diff --git a/strata/foundation.morph b/strata/foundation.morph index 757b25d4..2af03865 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -111,12 +111,6 @@ chunks: build-depends: - glib - systemd -- name: help2man - morph: strata/foundation/help2man.morph - repo: upstream:help2man - ref: 0191a5f61525f8deea2ae8bdfea88190d85b6a71 - unpetrify-ref: baserock/morph - build-depends: [] - name: libxslt repo: upstream:libxslt ref: 8785a2ffd0d146df0395ab71ce4734d0a8ba0f7e diff --git a/strata/gtk2.morph b/strata/gtk2.morph index 1265573c..8ac31eaa 100644 --- a/strata/gtk2.morph +++ b/strata/gtk2.morph @@ -8,6 +8,5 @@ chunks: - name: gtk+ morph: strata/gtk2/gtk+.morph repo: upstream:gtk+ - ref: 52de99559e5b5bf09160e5a5a164d0ca5fede98c - unpetrify-ref: baserock/xfce-build + ref: fbf38d16bcc26630f0f721d266509f5bc292f606 build-depends: [] diff --git a/strata/x-common.morph b/strata/x-common.morph index a6791d48..fe489832 100644 --- a/strata/x-common.morph +++ b/strata/x-common.morph @@ -21,8 +21,8 @@ chunks: build-depends: [] - name: xorg-util-macros repo: upstream:xorg-util-macros - ref: c98b41de5596c675c603ef43ae9570133f1a9921 - unpetrify-ref: baserock/morph + ref: 9a54b858601bd305de2737b06e609084a2a114c2 + unpetrify-ref: util-macros-1.19.0 build-depends: [] - name: xorg-proto-bigreqsproto repo: upstream:xorg-proto-bigreqsproto @@ -176,8 +176,8 @@ chunks: - xorg-util-macros - name: xcb-proto repo: upstream:xcb-proto - ref: ca30e6d5d7a0c7618d988f9051026d250f5e124e - unpetrify-ref: baserock/morph + ref: 4b384d2a015c50d0e93dcacda4b8260a3fd37640 + unpetrify-ref: "1.11" build-depends: - xorg-util-macros - name: xorg-lib-libXau @@ -189,8 +189,8 @@ chunks: - xorg-util-macros - name: xcb-libxcb repo: upstream:xcb-libxcb - ref: 0dd8f8d26a758bc385e79d9239bf6ef2e3d7bf13 - unpetrify-ref: baserock/morph + ref: d1e8ec96fca4862f37ec9f0e9407bb989c4c161a + unpetrify-ref: "1.11" build-depends: - xcb-proto - xcb-pthread-stubs @@ -204,8 +204,8 @@ chunks: - xorg-util-macros - name: xorg-lib-libX11 repo: upstream:xorg-lib-libX11 - ref: f57fd760cba92ad846917f21e94e73e9c846185f - unpetrify-ref: baserock/morph + ref: cb107760df33ffc8630677e66e2e50aa37950a5c + unpetrify-ref: libX11-1.6.2 build-depends: - xcb-libxcb - xorg-lib-libXau |