This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via d7d29a1067fee45143f3ad12f103dd30555e9ee1 (commit) via cf80de5033d2fd77f3883914cb7355e8db433a79 (commit) via 288caea6e3b44608484818f51265ee16a954e440 (commit) via c9b0e5d0cacd305f62f2f258f06cebc4d1106c25 (commit) from 0bad6c2fc895e5e8f549b2af722cc85c47d57bb8 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit d7d29a1067fee45143f3ad12f103dd30555e9ee1 Merge: 0bad6c2fc895e5e8f549b2af722cc85c47d57bb8 cf80de5033d2fd77f3883914cb7355e8db433a79 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue May 11 00:22:43 2010 +0200
Merge branch 'next'
commit cf80de5033d2fd77f3883914cb7355e8db433a79 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue May 11 00:05:24 2010 +0200
cairo: Build fix for new libpng version.
commit 288caea6e3b44608484818f51265ee16a954e440 Merge: c9b0e5d0cacd305f62f2f258f06cebc4d1106c25 970b706ee812e4369f6656a780beab59e0e1e06a Author: Michael Tremer michael.tremer@ipfire.org Date: Mon May 10 02:40:16 2010 +0200
Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
commit c9b0e5d0cacd305f62f2f258f06cebc4d1106c25 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon May 3 00:17:23 2010 +0200
Merge branches 'master' and 'master' of ssh://ms@git.ipfire.org/pub/git/people/ms/ipfire-3.x into next
-----------------------------------------------------------------------
Summary of changes: pkgs/core/cairo/cairo.nm | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
Difference in files: diff --git a/pkgs/core/cairo/cairo.nm b/pkgs/core/cairo/cairo.nm index c19359d..1808536 100644 --- a/pkgs/core/cairo/cairo.nm +++ b/pkgs/core/cairo/cairo.nm @@ -45,3 +45,7 @@ define PKG_DESCRIPTION endef
PKG_TARBALL = $(THISAPP).tar.gz + +define STAGE_PREPARE_CMDS + cd $(DIR_APP) && sed -e "s/libpng12/& libpng14/g" -i configure +endef
hooks/post-receive -- IPFire 3.x development tree