[Checkins] SVN: Products.CMFCore/branches/2.2/ Backported c114555 and c114557 from trunk

[Hanno Schlichting]

Log message for revision 114571:
  Backported c114555 and c114557 from trunk
  

Changed:
  U   Products.CMFCore/branches/2.2/Products/CMFCore/CHANGES.txt
  U   Products.CMFCore/branches/2.2/setup.py

-=-
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/CHANGES.txt
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/CHANGES.txt	2010-07-11 10:45:10 UTC (rev 114570)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/CHANGES.txt	2010-07-11 10:52:35 UTC (rev 114571)
@@ -4,7 +4,10 @@
 2.2.3 (unreleased)
 ------------------
 
+- Added dependency on the new ``Products.ZSQLMethods`` distribution and updated
+  Zope2 requirement accordingly.
 
+
 2.2.2 (2010-07-04)
 ------------------
 

Modified: Products.CMFCore/branches/2.2/setup.py
===================================================================
--- Products.CMFCore/branches/2.2/setup.py	2010-07-11 10:45:10 UTC (rev 114570)
+++ Products.CMFCore/branches/2.2/setup.py	2010-07-11 10:52:35 UTC (rev 114571)
@@ -46,9 +46,10 @@
                      ],
       install_requires=[
           'setuptools',
-          'Zope2 >= 2.12.0',
+          'Zope2 > 2.12.8',
           'five.localsitemanager',
           'Products.GenericSetup',
+          'Products.ZSQLMethods',
           ],
       tests_require=[
           'zope.testing >= 3.7.0',