Once the installation of Zope 2.8 must be the same of 2.12, we need to merge...

Once the installation of Zope 2.8 must be the same of 2.12, we need to merge the versions of buildout infrastructure.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40872 20353a03-c40f-0410-a6d1-a30d3c3de9de

buildout/profiles/versions-2.12.cfg

@@ -12,10 +12,3 @@ Products.DCWorkflow = 2.2.1nxd001
 
 # 1.0.3 fixes bug https://bugs.launchpad.net/zelenium/+bug/673610
 Products.Zelenium >= 1.0.3
-
-# Zope Known Good Set is incompatible with buildout 1.5.0 in case of
-# distribute and zc.buildout, and as ERP5 Appliance trunk wants to use
-# the newest versions of buildout infrastructure clear the pin
-distribute =
-zc.buildout =
-setuptools =

buildout/profiles/versions-common.cfg

@@ -22,3 +22,10 @@ erp5.recipe.standaloneinstance >= 0.4.4
 hexagonit.recipe.cmmi >= 1.3.1
 python-memcached >= 1.45
 xml-marshaller >= 0.9.2
+
+# Zope Known Good Set is incompatible with buildout 1.5.0 in case of
+# distribute and zc.buildout, and as ERP5 Appliance trunk wants to use
+# the newest versions of buildout infrastructure clear the pin
+distribute =
+zc.buildout =
+setuptools =

buildout/profiles/versions.cfg

@@ -11,9 +11,5 @@ lxml = 2.2.8
 # official pysvn egg does not work with zc.recipe.egg, so we use our
 # modified version
 #pysvn = 1.7.2
-# Default ERP5 Appliance buildout is sticked to zc.buildout 1.4.4, as instance
-# generation is known not to work with zc.buildout >= 1.5
 # zc.recipe.egg is pinned as this is known compatible versions with
-# zc.buildout from 1.4 branch
-zc.buildout = 1.4.4
 zc.recipe.egg = 1.2.2