[zopeorg-checkins] CVS: NZO_SiteLayout - Makefile.zinstance:1.8 Makefile.zope:1.7 cvs.mk:1.11

[Sidnei da Silva]

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

Modified Files:
	Makefile.zinstance Makefile.zope cvs.mk 
Log Message:
cleaning up branch/dirname mess
´

=== NZO_SiteLayout/Makefile.zinstance 1.7 => 1.8 ===
 #   cvs.mk for other known checkouts).
 #-----------------------------------------------------------------------
 PYTHON_CHECKOUT=src/Python-2.1.3
-ZOPE_CHECKOUT=src/Zope-2.6-head
-ZEO_CHECKOUT=src/ZEO-2.0-head
-CMF_CHECKOUT=src/CMF-1.3-head
+ZOPE_CHECKOUT=src/Zope-2.6-branch
+ZEO_CHECKOUT=src/ZEO-2.0-ZODB3-3_1-branch
+CMF_CHECKOUT=src/CMF-1.3-branch
 
 include python_targets.mk
 include zope_targets.mk


=== NZO_SiteLayout/Makefile.zope 1.6 => 1.7 ===
 #   cvs.mk for other known checkouts).
 #-----------------------------------------------------------------------
 PYTHON_CHECKOUT=src/Python-2.1.3
-ZOPE_CHECKOUT=src/Zope-2.6-head
-ZEO_CHECKOUT=src/ZEO-2.0-head
-CMF_CHECKOUT=src/CMF-1.3-head
+ZOPE_CHECKOUT=src/Zope-2.6-branch
+ZEO_CHECKOUT=src/ZEO-2.0-ZODB3-3_1-branch
+CMF_CHECKOUT=src/CMF-1.3-branch
 
 include python_targets.mk
 include zope_targets.mk


=== NZO_SiteLayout/cvs.mk 1.10 => 1.11 ===
     CUSTOM_CVS_REPOSITORY=:ext:${CVS_USER}@${CUSTOM_REPO_TAIL}
 endif
 
-PYTHON_CVS_REPOSITORY=:pserver:anonymous at cvs.python.sourceforge.net:/cvsroot/python
+PYTHON_CVS_REPOSITORY=:pserver:anonymous at cvs.sf.net:/cvsroot/python
 ZOPE_CVS_REPOSITORY=:pserver:anonymous at cvs.zope.org:/cvs-repository
 SQUID_CVS_REPOSITORY=:pserver:anoncvs at cvs.squid-cache.org:/squid
 ZOPEORG_CVS_REPOSITORY=:pserver:anonymous at cvs.zope.org:/cvs-zopeorg
@@ -53,17 +53,17 @@
 src/Zope-2.5.0: CVS_MODULE=Zope
 src/Zope-2.5.0: CVS_TAG=-r Zope-2_5_0-src
 
-src/Zope-2.5-head: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
-src/Zope-2.5-head: CVS_MODULE=Zope
-src/Zope-2.5-head: CVS_TAG=-r Zope-2_5-branch
+src/Zope-2.5-branch: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
+src/Zope-2.5-branch: CVS_MODULE=Zope
+src/Zope-2.5-branch: 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
+src/Zope-2.6-branch: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
+src/Zope-2.6-branch: CVS_MODULE=Zope
+src/Zope-2.6-branch: CVS_TAG=-r Zope-2_6-branch
 
 
 
@@ -77,9 +77,9 @@
 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/ZEO-2.0-ZODB3-3_1-branch: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
+src/ZEO-2.0-ZODB3-3_1-branch: CVS_MODULE=ZEO
+src/ZEO-2.0-ZODB3-3_1-branch: CVS_TAG=-r ZODB3-3_1-branch
 
 src/StandaloneZODB-1.0: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
 src/StandaloneZODB-1.0: CVS_MODULE=StandaloneZODB
@@ -87,13 +87,13 @@
 
 #   CMF versions
 
-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-1.3-release: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
+src/CMF-1.3-release: CVS_MODULE=CMF
+src/CMF-1.3-release: CVS_TAG=-r CMF-1_3-release
+
+src/CMF-1.3-branch: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
+src/CMF-1.3-branch: CVS_MODULE=CMF
+src/CMF-1.3-branch: CVS_TAG=-r CMF-1_3-branch
 
 src/CMF-head: CVS_REPOSITORY=${ZOPE_CVS_REPOSITORY}
 src/CMF-head: CVS_MODULE=CMF