[Checkins] SVN: z3ext.resource/trunk/ update dependencies

[Nikolay Kim]

Log message for revision 91775:
  update dependencies

Changed:
  U   z3ext.resource/trunk/CHANGES.txt
  U   z3ext.resource/trunk/setup.py
  U   z3ext.resource/trunk/src/z3ext/resource/configure.zcml
  D   z3ext.resource/trunk/src/z3ext/resource/stylesheet/
  U   z3ext.resource/trunk/src/z3ext/resource/zrtresource/configure.zcml

-=-
Modified: z3ext.resource/trunk/CHANGES.txt
===================================================================
--- z3ext.resource/trunk/CHANGES.txt	2008-10-05 10:24:06 UTC (rev 91774)
+++ z3ext.resource/trunk/CHANGES.txt	2008-10-05 11:12:26 UTC (rev 91775)
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+1.2.0 (2008-10-06)
+------------------
+
+- Update deoendencies
+
+- Removed 'stylesheet' resource type because it's useless
+
+
 1.1.0 (2008-03-28)
 ------------------
 

Modified: z3ext.resource/trunk/setup.py
===================================================================
--- z3ext.resource/trunk/setup.py	2008-10-05 10:24:06 UTC (rev 91774)
+++ z3ext.resource/trunk/setup.py	2008-10-05 11:12:26 UTC (rev 91775)
@@ -60,6 +60,7 @@
 			  'zope.publisher',
 			  'zope.security',
                           'zope.app.publisher',
+                          'z3c.zrtresource>=1.1.0',
 			  'z3ext.cacheheaders',
                           ],
       extras_require = dict(test=['zope.traversing',

Modified: z3ext.resource/trunk/src/z3ext/resource/configure.zcml
===================================================================
--- z3ext.resource/trunk/src/z3ext/resource/configure.zcml	2008-10-05 10:24:06 UTC (rev 91774)
+++ z3ext.resource/trunk/src/z3ext/resource/configure.zcml	2008-10-05 11:12:26 UTC (rev 91775)
@@ -53,9 +53,7 @@
      factory=".fileresource.FileResourceAdapter"
      permission="zope.Public" />
 
-  <zcml:configure zcml:condition="installed z3c.zrtresource">
-    <include package="z3ext.resource.stylesheet" />
-    <include package="z3ext.resource.zrtresource" />
-  </zcml:configure>
+  <include package="z3ext.resource.stylesheet" />
+  <include package="z3ext.resource.zrtresource" />
 
 </configure>

Modified: z3ext.resource/trunk/src/z3ext/resource/zrtresource/configure.zcml
===================================================================
--- z3ext.resource/trunk/src/z3ext/resource/zrtresource/configure.zcml	2008-10-05 10:24:06 UTC (rev 91774)
+++ z3ext.resource/trunk/src/z3ext/resource/zrtresource/configure.zcml	2008-10-05 11:12:26 UTC (rev 91775)
@@ -2,8 +2,6 @@
    xmlns="http://namespaces.zope.org/zope"
    xmlns:browser="http://namespaces.zope.org/browser">
 
-  <include package="z3c.zrtresource" file="meta.zcml" />
-
   <utility
      name="zrt"
      provides="z3ext.resource.resource.IResourceFactoryType"