Merge branch 'master' into erp5-component

component/slapos/buildout.cfg

@@ -152,7 +152,7 @@ Flask = 0.9
 
 # Required by:
 # hexagonit.recipe.cmmi==1.6
-hexagonit.recipe.download = 1.6
+hexagonit.recipe.download = 1.6nxd002
 
 # Required by:
 # slapos.core==0.35

software/MediaWiki/software.cfg

@@ -79,7 +79,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.1
+hexagonit.recipe.download = 1.6nxd002
 
 # Required by:
 # slapos.cookbook==0.34

software/apache-frontend/software.cfg

@@ -18,7 +18,7 @@ Flask = 0.9
 
 # Required by:
 # hexagonit.recipe.cmmi==1.6
-hexagonit.recipe.download = 1.6
+hexagonit.recipe.download = 1.6nxd002
 
 # Required by:
 # slapos.cookbook==0.71.1

software/b2evolution/software.cfg

@@ -64,7 +64,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.1
+hexagonit.recipe.download = 1.6nxd002
 
 # Required by:
 # slapos.cookbook==0.34

software/cmsmadesimple/software.cfg

@@ -63,7 +63,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.1
+hexagonit.recipe.download = 1.6nxd002
 
 # Required by:
 # slapos.cookbook==0.34

software/coppermine/software.cfg

@@ -74,7 +74,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.1
+hexagonit.recipe.download = 1.6nxd002
 
 # Required by:
 # slapos.cookbook==0.34

software/davstorage/software.cfg

@@ -77,7 +77,7 @@ Jinja2 = 2.6
 Werkzeug = 0.7.1
 buildout-versions = 1.6
 hexagonit.recipe.cmmi = 1.5.0
-hexagonit.recipe.download = 1.5.1
+hexagonit.recipe.download = 1.6nxd002
 meld3 = 0.6.7
 slapos.cookbook = 0.26
 

software/dotclear/software.cfg

@@ -74,7 +74,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.1
+hexagonit.recipe.download = 1.6nxd002
 
 # Required by:
 # slapos.cookbook==0.34

software/dotproject/software.cfg

@@ -74,7 +74,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.1
+hexagonit.recipe.download = 1.6nxd002
 
 # Required by:
 # slapos.cookbook==0.34

software/eSKUeL/software.cfg

@@ -63,7 +63,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.1
+hexagonit.recipe.download = 1.6nxd002
 
 # Required by:
 # slapos.cookbook==0.34

software/erp5-util-testing/instance.cfg

@@ -40,7 +40,7 @@ environment = environment
 CPPFLAGS = -I${python2.7:location}/include/python2.7 -I${libxml2:location}/include -I${libxslt:location}/include
 LDFLAGS = -L${python2.7:location}/lib -L${libxml2:location}/lib -L${libxslt:location}/lib -L${zlib:location}/lib
 PYTHONPATH = ${python-setuptools:location}
-LD_LIBRARY_PATH = ${libxslt:location}/lib
+LD_LIBRARY_PATH = ${libxslt:location}/lib:${libxml2:location}/lib:${zlib:location}/lib
 
 [sh-environment]
 # Section exposes testing default environment as sh file. It is thus easy

software/erp5-util-testing/software.cfg

@@ -45,7 +45,7 @@ branch = master
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = 0cdfaa1df03885bd6004755d285e69b5
+md5sum = 6b919dd280d6972afe0f50d389ba5fe6
 output =  ${buildout:directory}/template.cfg
 mode = 640
 
@@ -74,7 +74,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.6
-hexagonit.recipe.download = 1.5.1
+hexagonit.recipe.download = 1.6nxd002
 
 # Required by:
 # slapos.cookbook==0.65

software/erp5testnode/software.cfg

@@ -232,7 +232,7 @@ PyXML = 0.8.5
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.1
+hexagonit.recipe.download = 1.6nxd002
 
 # Required by:
 # slapos.cookbook==0.38

software/ezpublish/software.cfg

@@ -63,7 +63,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.1
+hexagonit.recipe.download = 1.6nxd002
 
 # Required by:
 # slapos.cookbook==0.34

software/html5as/software.cfg

@@ -158,7 +158,7 @@ zope.interface = 4.0.1
 
 # Required by:
 # hexagonit.recipe.cmmi==1.6
-hexagonit.recipe.download = 1.5.1
+hexagonit.recipe.download = 1.6nxd002
 
 [networkcache]
 # signature certificates of the following uploaders.

software/kumofs/software.cfg

@@ -89,7 +89,7 @@ signature-certificate-list =
   
   # Required by:
   # hexagonit.recipe.cmmi==1.6
-  hexagonit.recipe.download = 1.6
+  hexagonit.recipe.download = 1.6nxd002
   
   # Required by:
   # slapos.cookbook==0.71.1

software/kvm/software.cfg

@@ -87,7 +87,7 @@ feedparser = 5.1.3
 
 # Required by:
 # hexagonit.recipe.cmmi==1.6
-hexagonit.recipe.download = 1.6
+hexagonit.recipe.download = 1.6nxd002
 
 # Required by:
 # slapos.cookbook==0.73.1

software/lamp-template-static/software.cfg

@@ -46,7 +46,7 @@ Jinja2 = 2.6
 Werkzeug = 0.8.2
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.5.0
-hexagonit.recipe.download = 1.5.1
+hexagonit.recipe.download = 1.6nxd002
 meld3 = 0.6.8
 plone.recipe.command = 1.1
 slapos.recipe.template = 2.2

software/magento/software.cfg

@@ -62,7 +62,7 @@ PyXML = 0.8.4
 
 # Required by:
 # hexagonit.recipe.cmmi==1.5.0
-hexagonit.recipe.download = 1.5.1
+hexagonit.recipe.download = 1.6nxd002
 
 # Required by:
 # slapos.cookbook==0.34

software/mariadb/software.cfg

@@ -88,7 +88,7 @@ Jinja2 = 2.6
 Werkzeug = 0.8.3
 buildout-versions = 1.7
 hexagonit.recipe.cmmi = 1.6
-hexagonit.recipe.download = 1.6
+hexagonit.recipe.download = 1.6nxd002
 meld3 = 0.6.10
 slapos.cookbook = 0.72.0
 slapos.recipe.build = 0.11.5