[Checkins] SVN: zope.app.zopeappgenerations/branches/icemac-zope.generations/ depend on zope.generations instead of zope.app.generations

[Michael Howitz]

Log message for revision 116560:
  depend on zope.generations instead of zope.app.generations
  

Changed:
  U   zope.app.zopeappgenerations/branches/icemac-zope.generations/CHANGES.txt
  U   zope.app.zopeappgenerations/branches/icemac-zope.generations/buildout.cfg
  U   zope.app.zopeappgenerations/branches/icemac-zope.generations/setup.py
  U   zope.app.zopeappgenerations/branches/icemac-zope.generations/src/zope/app/zopeappgenerations/__init__.py
  U   zope.app.zopeappgenerations/branches/icemac-zope.generations/src/zope/app/zopeappgenerations/configure.zcml
  U   zope.app.zopeappgenerations/branches/icemac-zope.generations/src/zope/app/zopeappgenerations/evolve2.py
  U   zope.app.zopeappgenerations/branches/icemac-zope.generations/src/zope/app/zopeappgenerations/evolve3.py
  U   zope.app.zopeappgenerations/branches/icemac-zope.generations/src/zope/app/zopeappgenerations/evolve5.py

-=-
Modified: zope.app.zopeappgenerations/branches/icemac-zope.generations/CHANGES.txt
===================================================================
--- zope.app.zopeappgenerations/branches/icemac-zope.generations/CHANGES.txt	2010-09-18 10:11:55 UTC (rev 116559)
+++ zope.app.zopeappgenerations/branches/icemac-zope.generations/CHANGES.txt	2010-09-18 10:12:44 UTC (rev 116560)
@@ -5,7 +5,7 @@
 3.5.1 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Now depends on ``zope.generations`` instead of ``zope.app.generations``.
 
 
 3.5.0 (2009-04-05)

Modified: zope.app.zopeappgenerations/branches/icemac-zope.generations/buildout.cfg
===================================================================
--- zope.app.zopeappgenerations/branches/icemac-zope.generations/buildout.cfg	2010-09-18 10:11:55 UTC (rev 116559)
+++ zope.app.zopeappgenerations/branches/icemac-zope.generations/buildout.cfg	2010-09-18 10:12:44 UTC (rev 116560)
@@ -1,5 +1,6 @@
 [buildout]
 develop = .
+          ../zope.generations
 parts = test
 
 [test]

Modified: zope.app.zopeappgenerations/branches/icemac-zope.generations/setup.py
===================================================================
--- zope.app.zopeappgenerations/branches/icemac-zope.generations/setup.py	2010-09-18 10:11:55 UTC (rev 116559)
+++ zope.app.zopeappgenerations/branches/icemac-zope.generations/setup.py	2010-09-18 10:12:44 UTC (rev 116560)
@@ -52,14 +52,15 @@
       packages=find_packages('src'),
       package_dir = {'': 'src'},
       namespace_packages=['zope', 'zope.app'],
-      install_requires=['setuptools',
-                        'zope.annotation',
-                        'zope.app.authentication',
-                        'zope.app.component',
-                        'zope.app.generations >= 3.5.0',
-                        'zope.copypastemove',
-                        'zope.dublincore',
-                        ],
+      install_requires=[
+          'setuptools',
+          'zope.annotation',
+          'zope.app.authentication',
+          'zope.app.component',
+          'zope.copypastemove',
+          'zope.dublincore',
+          'zope.generations',
+          ],
       include_package_data = True,
       zip_safe = False,
       )

Modified: zope.app.zopeappgenerations/branches/icemac-zope.generations/src/zope/app/zopeappgenerations/__init__.py
===================================================================
--- zope.app.zopeappgenerations/branches/icemac-zope.generations/src/zope/app/zopeappgenerations/__init__.py	2010-09-18 10:11:55 UTC (rev 116559)
+++ zope.app.zopeappgenerations/branches/icemac-zope.generations/src/zope/app/zopeappgenerations/__init__.py	2010-09-18 10:12:44 UTC (rev 116560)
@@ -17,9 +17,9 @@
 """
 __docformat__ = "reStructuredText"
 
-from zope.app.generations.generations import SchemaManager
+from zope.generations.generations import SchemaManager
 # BBB import
-from zope.app.generations.utility import getRootFolder
+from zope.generations.utility import getRootFolder
 
 
 key = 'zope.app.zopeappgenerations'

Modified: zope.app.zopeappgenerations/branches/icemac-zope.generations/src/zope/app/zopeappgenerations/configure.zcml
===================================================================
--- zope.app.zopeappgenerations/branches/icemac-zope.generations/src/zope/app/zopeappgenerations/configure.zcml	2010-09-18 10:11:55 UTC (rev 116559)
+++ zope.app.zopeappgenerations/branches/icemac-zope.generations/src/zope/app/zopeappgenerations/configure.zcml	2010-09-18 10:12:44 UTC (rev 116560)
@@ -1,8 +1,8 @@
 <configure xmlns="http://namespaces.zope.org/zope">
 
 <utility
-    name="zope.app" 
-    provides="zope.app.generations.interfaces.ISchemaManager"
+    name="zope.app"
+    provides="zope.generations.interfaces.ISchemaManager"
     component=".ZopeAppSchemaManager"
     />
 

Modified: zope.app.zopeappgenerations/branches/icemac-zope.generations/src/zope/app/zopeappgenerations/evolve2.py
===================================================================
--- zope.app.zopeappgenerations/branches/icemac-zope.generations/src/zope/app/zopeappgenerations/evolve2.py	2010-09-18 10:11:55 UTC (rev 116559)
+++ zope.app.zopeappgenerations/branches/icemac-zope.generations/src/zope/app/zopeappgenerations/evolve2.py	2010-09-18 10:12:44 UTC (rev 116560)
@@ -21,7 +21,7 @@
 from zope.app.component.interfaces import ISite
 from zope.app.zopeappgenerations import getRootFolder
 
-from zope.app.generations.utility import findObjectsProviding
+from zope.generations.utility import findObjectsProviding
 
 
 generation = 2

Modified: zope.app.zopeappgenerations/branches/icemac-zope.generations/src/zope/app/zopeappgenerations/evolve3.py
===================================================================
--- zope.app.zopeappgenerations/branches/icemac-zope.generations/src/zope/app/zopeappgenerations/evolve3.py	2010-09-18 10:11:55 UTC (rev 116559)
+++ zope.app.zopeappgenerations/branches/icemac-zope.generations/src/zope/app/zopeappgenerations/evolve3.py	2010-09-18 10:12:44 UTC (rev 116560)
@@ -24,7 +24,7 @@
 from zope.app.component.interfaces import ISite
 from zope.app.zopeappgenerations import getRootFolder
 
-from zope.app.generations.utility import findObjectsProviding
+from zope.generations.utility import findObjectsProviding
 
 from zope.app.component import registration
 import zope.app.authentication.interfaces

Modified: zope.app.zopeappgenerations/branches/icemac-zope.generations/src/zope/app/zopeappgenerations/evolve5.py
===================================================================
--- zope.app.zopeappgenerations/branches/icemac-zope.generations/src/zope/app/zopeappgenerations/evolve5.py	2010-09-18 10:11:55 UTC (rev 116559)
+++ zope.app.zopeappgenerations/branches/icemac-zope.generations/src/zope/app/zopeappgenerations/evolve5.py	2010-09-18 10:12:44 UTC (rev 116560)
@@ -20,7 +20,7 @@
 from zope.dublincore.interfaces import IWriteZopeDublinCore
 from zope.dublincore.annotatableadapter import ZDCAnnotatableAdapter
 from zope.dublincore.annotatableadapter import DCkey
-from zope.app.generations.utility import findObjectsProviding
+from zope.generations.utility import findObjectsProviding
 from zope.app.zopeappgenerations import getRootFolder
 
 generation = 5