[Repoze-checkins] r985 - in repoze.zope2/branches/2.9: . repoze/zope2/etc

[Chris McDonough]

Author: Chris McDonough <chrism at agendaless.com>
Date: Wed May  7 13:09:04 2008
New Revision: 985

Log:
Get rid of dependency-links, use a different site.zcml.


Modified:
   repoze.zope2/branches/2.9/CHANGES.txt
   repoze.zope2/branches/2.9/repoze/zope2/etc/site.zcml
   repoze.zope2/branches/2.9/setup.py

Modified: repoze.zope2/branches/2.9/CHANGES.txt
==============================================================================
--- repoze.zope2/branches/2.9/CHANGES.txt	(original)
+++ repoze.zope2/branches/2.9/CHANGES.txt	Wed May  7 13:09:04 2008
@@ -1,6 +1,8 @@
 Fork for 2.9 (2.9.0)
 
-  - Initial
+  - Initial; no find-links, get rid of version-number-constrained
+    dependencies, don't specify a separate ZODB package dependency.
+    Use a different site.zcml to account for Five package difference.
 
 After 0.3.8
 

Modified: repoze.zope2/branches/2.9/repoze/zope2/etc/site.zcml
==============================================================================
--- repoze.zope2/branches/2.9/repoze/zope2/etc/site.zcml	(original)
+++ repoze.zope2/branches/2.9/repoze/zope2/etc/site.zcml	Wed May  7 13:09:04 2008
@@ -1,25 +1,16 @@
 <configure xmlns="http://namespaces.zope.org/zope"
-	       xmlns:meta="http://namespaces.zope.org/meta"
+               xmlns:meta="http://namespaces.zope.org/meta"
            xmlns:five="http://namespaces.zope.org/five">
 
+  <!-- Copy this file to your ``INSTANCE_HOME/etc`` directory -->
+
   <include package="Products.Five" />
   <meta:redefinePermission from="zope2.Public" to="zope.Public" />
 
-
-  <!-- Load the meta -->
   <include files="package-includes/*-meta.zcml" />
-  <five:loadProducts file="meta.zcml"/>
-
-  <!-- Load the configuration -->
   <include files="package-includes/*-configure.zcml" />
-  <five:loadProducts />
 
-  <!-- Load the configuration overrides-->
-  <includeOverrides files="package-includes/*-overrides.zcml" />
+  <five:loadProducts />
   <five:loadProductsOverrides />
 
-
-  <securityPolicy
-      component="Products.Five.security.FiveSecurityPolicy" />
-
 </configure>

Modified: repoze.zope2/branches/2.9/setup.py
==============================================================================
--- repoze.zope2/branches/2.9/setup.py	(original)
+++ repoze.zope2/branches/2.9/setup.py	Wed May  7 13:09:04 2008
@@ -40,7 +40,6 @@
       keywords='web application server wsgi zope',
       author="Agendaless Consulting",
       author_email="repoze-dev at lists.repoze.org",
-      dependency_links=['http://dist.repoze.org/zope2/2.9'],
       url="http://www.repoze.org",
       license="BSD-derived (http://www.repoze.org/LICENSE.txt)",
       packages=find_packages(),