[Zope-Checkins] SVN: Zope/trunk/ Merged c119099 from 2.13 branch

[Hanno Schlichting]

Log message for revision 119100:
  Merged c119099 from 2.13 branch
  

Changed:
  U   Zope/trunk/buildout.cfg
  U   Zope/trunk/doc/CHANGES.rst
  U   Zope/trunk/setup.py
  U   Zope/trunk/sources.cfg
  D   Zope/trunk/src/Products/PluginIndexes/
  D   Zope/trunk/src/Products/ZCatalog/
  U   Zope/trunk/versions.cfg

-=-
Modified: Zope/trunk/buildout.cfg
===================================================================
--- Zope/trunk/buildout.cfg	2010-12-25 18:37:32 UTC (rev 119099)
+++ Zope/trunk/buildout.cfg	2010-12-25 18:41:16 UTC (rev 119100)
@@ -54,6 +54,7 @@
     MultiMapping
     Persistence
     Products.OFSP
+    Products.ZCatalog
     Products.ZCTextIndex
     Record
     RestrictedPython

Modified: Zope/trunk/doc/CHANGES.rst
===================================================================
--- Zope/trunk/doc/CHANGES.rst	2010-12-25 18:37:32 UTC (rev 119099)
+++ Zope/trunk/doc/CHANGES.rst	2010-12-25 18:41:16 UTC (rev 119100)
@@ -34,6 +34,9 @@
 Restructuring
 +++++++++++++
 
+- Factored out the `Products.ZCatalog` and `Products.PluginIndexes` packages
+  into a new `Products.ZCatalog` distribution.
+
 - Stopped testing non-overridden ZTK eggs in ``bin/alltests``.
 
 - Dropped the direct dependencies on packages that have been factored out of

Modified: Zope/trunk/setup.py
===================================================================
--- Zope/trunk/setup.py	2010-12-25 18:37:32 UTC (rev 119099)
+++ Zope/trunk/setup.py	2010-12-25 18:41:16 UTC (rev 119100)
@@ -54,6 +54,7 @@
       'MultiMapping',
       'Persistence',
       'Products.OFSP >= 2.13.2',
+      'Products.ZCatalog',
       'Products.ZCTextIndex',
       'Record',
       'RestrictedPython',

Modified: Zope/trunk/sources.cfg
===================================================================
--- Zope/trunk/sources.cfg	2010-12-25 18:37:32 UTC (rev 119099)
+++ Zope/trunk/sources.cfg	2010-12-25 18:41:16 UTC (rev 119100)
@@ -10,6 +10,7 @@
 nt_svcutils = svn ^/nt_svcutils/trunk
 Persistence = svn ^/Persistence/trunk
 Products.OFSP = svn ^/Products.OFSP/trunk
+Products.ZCatalog = svn ^/Products.ZCatalog/trunk
 Products.ZCTextIndex = svn ^/Products.ZCTextIndex/trunk
 Record = svn ^/Record/trunk
 tempstorage = svn ^/tempstorage/trunk

Modified: Zope/trunk/versions.cfg
===================================================================
--- Zope/trunk/versions.cfg	2010-12-25 18:37:32 UTC (rev 119099)
+++ Zope/trunk/versions.cfg	2010-12-25 18:41:16 UTC (rev 119100)
@@ -22,6 +22,7 @@
 Products.OFSP = 2.13.2
 Products.PythonScripts = 2.13.0
 Products.StandardCacheManagers = 2.13.0
+Products.ZCatalog = 2.13.0
 Products.ZCTextIndex = 2.13.1
 Record = 2.13.0
 tempstorage = 2.12.1