From 27ff164defae7a710ccd1694963d64637b4d8f9e Mon Sep 17 00:00:00 2001
From: Michael Drake <michael.drake@codethink.co.uk>
Date: Mon, 9 Jun 2014 11:22:39 +0000
Subject: Update LibPNG, Automake and others:

  LibPNG has had many security fixes.  Updating libpng required
  an update to automake.  Updating automake required further
  changes to various software using automake.

  Since the new version of automake does not bundle its own
  copy of help2man, help2man has been moved from the foundation
  to the core stratum, to enable bison to build.

  The version updates are as follows:

    LibPNG 1.6.0
    Curl 7.37.0
    Automake 1.13.4

  Has had a commit cherry-picked from upstream to for new automake:

    xorg-lib-libX11
---
 x-common.morph | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'x-common.morph')

diff --git a/x-common.morph b/x-common.morph
index 77ba793b..5158a512 100644
--- a/x-common.morph
+++ b/x-common.morph
@@ -10,8 +10,8 @@ chunks:
   build-depends: []
 - name: libpng
   repo: upstream:libpng
-  ref: 981560ae6094f0b0557e82c33d7ae5f7d81ca0ea
-  unpetrify-ref: baserock/morph
+  ref: baserock/mikedrake/update-chunks
+  unpetrify-ref: 981560ae6094f0b0557e82c33d7ae5f7d81ca0ea
   build-depends: []
 - name: libjpeg
   repo: upstream:libjpeg
@@ -203,8 +203,8 @@ chunks:
   - xorg-util-macros
 - name: xorg-lib-libX11
   repo: upstream:xorg-lib-libX11
-  ref: f57fd760cba92ad846917f21e94e73e9c846185f
-  unpetrify-ref: baserock/morph
+  ref: baserock/mikedrake/update-chunks
+  unpetrify-ref: f57fd760cba92ad846917f21e94e73e9c846185f
   build-depends:
   - xcb-libxcb
   - xorg-lib-libXau
-- 
cgit v1.2.1