GitLab

So put out gmp as self component.

Additionaly this selects different lxml egg, and "disables" lxml building hack.
Signed-off-by: Cédric de Saint Martin <cedric.dsm@tiolive.com>

commit 9486fa3d33ed70722df0ab78cf0d60f4b1bcab4b
Author: Alain Takoudjou <talino@tiolive.com>
Date:   Thu Oct 20 12:51:52 2011 +0100

    Add documentation for lamp recipe

commit cb684d1170c04ff6ad193b25fb181c71ccded042
Author: Alain Takoudjou <talino@tiolive.com>
Date:   Thu Oct 20 11:07:40 2011 +0100

    Add PunBB [Forum] software release

commit 1b2209ee64fea3854c4a8d0f9c7be1badaf2addb
Author: Alain Takoudjou <talino@tiolive.com>
Date:   Thu Oct 20 10:24:25 2011 +0100

    Add B2evolution [blog] software release

commit adf2972b4678b47ef8b4debdeecaf08536d131d3
Author: Alain Takoudjou <talino@tiolive.com>
Date:   Thu Oct 20 10:19:01 2011 +0100

    Restore lamp-template/software.cfg after the merge of lamp with master

commit 9b07d7c1a64b6ff346bfe444664787ff60886033
Author: Alain Takoudjou <talino@tiolive.com>
Date:   Wed Oct 19 15:35:46 2011 +0100

    Restore lamp.cfg

commit 4804e7aa0c1f99aad61732955f9da4a486f6aed0
Author: Alain Takoudjou <talino@tiolive.com>
Date:  ...

Conflicts:
	CHANGES.txt
	slapos/recipe/lamp/template/apache.in
	slapos/recipe/lamp/template/php.ini.in
	software/lamp-template-static/software.cfg
	software/lamp-template/software.cfg
	stack/lamp.cfg

This is a squash of the following :

Merging Alain's work in erp5 repo.

This is a squash of the following commits :

commit 8fb794464a2bdd0a7c4cc9e44636cf376a871e65
Author: Alain Takoudjou <talino@tiolive.com>
Date:   Wed Sep 28 12:11:40 2011 +0100

    Remove kwrite backup file.

commit 13feffcd5da2d4cefa7ace8c6a09859a16c77ac5
Author: Antoine Catton <acatton@tiolive.con>
Date:   Wed Sep 28 12:10:09 2011 +0100

    Remove rdiff-backup from mariadb software.

    The merge should not have do that.

commit b8fcd02b83f061e803c285d8a157a4041a92ec54
Merge: 54a76ad8 5b009b8
Author: Alain Takoudjou <talino@tiolive.com>
Date:   Wed Sep 28 11:59:45 2011 +0100

    Merge branch Alain's fork with erp5 repo

    Conflicts:
    	CHANGES.txt
    	component/apache-php/buildout.cfg
    	setup.py
    	slapos/recipe/davstorage/__init__.py
    	slapos/recipe/lamp/template/php.ini.in
    	slapos/recipe/librecipe/__init__.py
    	slapos/recipe/mysql/__init__.py
    	software/davstorage/so...

recipes.

Squashed commit of the following:

commit 47c90b0c79dc758a581e5401a83683ae4d7b0d17
Author: Antoine Catton <acatton@tiolive.com>
Date:   Fri Oct 14 17:26:27 2011 +0200

    Huge underscore to dashe refactoring

commit 609422d8bc8a500435692de6686411c01c036e8f
Author: Antoine Catton <acatton@tiolive.com>
Date:   Fri Oct 14 17:04:52 2011 +0200

    Reset lamp recipe as it is in master branch

commit 37ae2ed0b0630a802b46aae361f538eeb7130952
Author: Antoine Catton <acatton@tiolive.com>
Date:   Fri Oct 14 16:51:22 2011 +0200

    Make slapgrid-sr works

commit f35677b711e834239f8c8508ea44ca1432f98091
Author: Antoine Catton <acatton@tiolive.com>
Date:   Fri Oct 14 16:16:45 2011 +0200

    Add lamp.cfg from master.

commit 75956ad31f8d012502a305f396865505f46672d2
Author: Łukasz Nowak <luke@nexedi.com>
Date:   Fri Oct 14 16:19:42 2011 +0200

    Typo.

commit 4fe7611cbf688043b9c0462a3b5a17ae3e785e07
Author: Łukasz Nowak <luke@nexedi.c...

Conflicts:
	software/lamp-template-static/software.cfg
	software/lamp-template/software.cfg

Include LAMP recipe updates

This is a request from Cedric to not break forward compatibility.