[zopeorg-checkins] CVS: NZO_SiteLayout - Makefile.skel:1.4 cvs.mk:1.8

[Sidnei da Silva]

Update of /cvs-zopeorg/NZO_SiteLayout
In directory cvs.zope.org:/tmp/cvs-serv9841

Modified Files:
	Makefile.skel cvs.mk 
Log Message:
Updated makefile to use latest versions of software

=== NZO_SiteLayout/Makefile.skel 1.3 => 1.4 ===
 #   define).
 #-----------------------------------------------------------------------
 PYTHON_CHECKOUT=src/Python-2.1.3
-ZOPE_CHECKOUT=src/Zope-2.5-head
-ZEO_CHECKOUT=src/ZEO-1.0-head
+ZOPE_CHECKOUT=src/Zope-2.6-head
+ZEO_CHECKOUT=src/ZEO-2.0-head
 CMF_CHECKOUT=src/CMF-1.3-head
 SQUID_CHECKOUT=src/Squid-2.4-STABLE6
 


=== NZO_SiteLayout/cvs.mk 1.7 => 1.8 ===
 src/Zope-2.5-head: CVS_MODULE=Zope
 src/Zope-2.5-head: CVS_TAG=-r Zope-2_5-branch
 
+src/Zope-2.6.0: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
+src/Zope-2.6.0: CVS_MODULE=Zope
+src/Zope-2.6.0: CVS_TAG=-r Zope-2_6_0-src
+
+src/Zope-2.6-head: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
+src/Zope-2.6-head: CVS_MODULE=Zope
+src/Zope-2.6-head: CVS_TAG=-r Zope-2_6-branch
+
+
+
 #   ZEO versions
 
 #src/ZEO-1.0: CVS_MODULE=ZEO   # This one doesn't (yet) exist (why?)
@@ -62,6 +72,10 @@
 src/ZEO-1.0-head: CVS_MODULE=ZEO
 src/ZEO-1.0-head: CVS_TAG=-r zeo-1_0-branch
 
+src/ZEO-2.0-head: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
+src/ZEO-2.0-head: CVS_MODULE=ZEO
+src/ZEO-2.0-head: CVS_TAG=-r ZODB3-3_1-branch
+
 src/StandaloneZODB-1.0: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
 src/StandaloneZODB-1.0: CVS_MODULE=StandaloneZODB
 src/StandaloneZODB-1.0: CVS_TAG=-r StandaloneZODB-1_0-branch
@@ -71,6 +85,10 @@
 src/CMF-1.3: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
 src/CMF-1.3: CVS_MODULE=CMF
 src/CMF-1.3: CVS_TAG=-r CMF-1_3-release
+
+src/CMF-1.3-head: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
+src/CMF-1.3-head: CVS_MODULE=CMF
+src/CMF-1.3-head: CVS_TAG=-r CMF-1_3-branch
 
 src/CMF-head: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
 src/CMF-head: CVS_MODULE=CMF