Log message for revision 96742:
  Reformat the changelog and include it into the long description
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/setup.py

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===================================================================
--- Zope/trunk/doc/CHANGES.txt  2009-02-19 12:55:08 UTC (rev 96741)
+++ Zope/trunk/doc/CHANGES.txt  2009-02-19 13:00:24 UTC (rev 96742)
@@ -1,220 +1,226 @@
-Zope Changes
+Changelog
+=========
 
-  This file contains change information for the current Zope release.
-  Change information for previous versions of Zope can be found in the
-  file HISTORY.txt.
+This file contains change information for the current Zope release.
+Change information for previous versions of Zope can be found in the
+file HISTORY.txt.
 
-  Trunk (unreleased)
+Trunk (unreleased)
+------------------
 
-    Restructuring
+Restructuring
++++++++++++++
 
-      - Updated to ZODB 3.9.0a10. ZODB-level version support has been
-        removed and ZopeUndo now is part of Zope2.
+- Updated to ZODB 3.9.0a10. ZODB-level version support has been
+  removed and ZopeUndo now is part of Zope2.
 
-      - The Zope2 SVN trunk is now a buildout pulling in all dependencies as
-        actual released packages and not SVN externals anymore.
+- The Zope2 SVN trunk is now a buildout pulling in all dependencies as
+  actual released packages and not SVN externals anymore.
 
-      - Make use of the new zope.container and zope.site packages.
+- Make use of the new zope.container and zope.site packages.
 
-      - Updated to newer versions of zope packages. Removed long deprecated
-        layer and skin ZCML directives.
+- Updated to newer versions of zope packages. Removed long deprecated
+  layer and skin ZCML directives.
 
-      - Disabled the XML export on the UI level - the export functionality
-        however is still available on the Python level.
+- Disabled the XML export on the UI level - the export functionality
+  however is still available on the Python level.
 
-      - No longer show the Help! links in the ZMI, if there is no help
-        available. The help system depends on the product registry.
+- No longer show the Help! links in the ZMI, if there is no help
+  available. The help system depends on the product registry.
 
-      - Updated the quick start page and simplified the standard content.
-        The default index_html is now a page template.
+- Updated the quick start page and simplified the standard content.
+  The default index_html is now a page template.
 
-      - Removed deprecated Draft and Version support from Products.OFSP.
-        Also removed version handling from the control panel. Versions are
-        no longer supported on the ZODB level.
+- Removed deprecated Draft and Version support from Products.OFSP.
+  Also removed version handling from the control panel. Versions are
+  no longer supported on the ZODB level.
 
-      - Removed left-overs of the deprecated persistent product distribution
-        mechanism.
+- Removed left-overs of the deprecated persistent product distribution
+  mechanism.
 
-      - The persistent product registry is not required for starting Zope
-        anymore. `enable-product-installation` can be set to off if you don't
-        rely on the functionality provided by the registry.
+- The persistent product registry is not required for starting Zope
+  anymore. `enable-product-installation` can be set to off if you don't
+  rely on the functionality provided by the registry.
 
-      - ZClasses have been deprecated for two major releases. They have been
-        removed in this version of Zope.
+- ZClasses have been deprecated for two major releases. They have been
+  removed in this version of Zope.
 
-      - Avoid deprecation warnings for the md5 and sha modules in Python 2.6
-        by adding conditional imports for the hashlib module.
+- Avoid deprecation warnings for the md5 and sha modules in Python 2.6
+  by adding conditional imports for the hashlib module.
 
-      - Replaced imports from the 'Globals' module throughout the 
-        tree with imports from the actual modules;  the 'Globals' module
-        was always intended to be an area for shared data, rather than
-        a "facade" for imports.  Added zope.deferred.deprecation entries
-        to 'Globals' for all symbols / modules previously imported directly.
+- Replaced imports from the 'Globals' module throughout the 
+  tree with imports from the actual modules;  the 'Globals' module
+  was always intended to be an area for shared data, rather than
+  a "facade" for imports.  Added zope.deferred.deprecation entries
+  to 'Globals' for all symbols / modules previously imported directly.
 
-      - Protect against non-existing zope.conf path and products directories.
-        This makes it possible to run a Zope instance without a Products or
-        lib/python directory.
+- Protect against non-existing zope.conf path and products directories.
+  This makes it possible to run a Zope instance without a Products or
+  lib/python directory.
 
-      - Moved exception MountedStorageError from ZODB.POSExceptions
-        to Products.TemporaryFolder.mount (now its only client).
+- Moved exception MountedStorageError from ZODB.POSExceptions
+  to Products.TemporaryFolder.mount (now its only client).
 
-      - Moved Zope2-specific module, ZODB/Mount.py, to
-        Products/TemporaryFolder/mount.py (its only client is
-        Products/TemporaryFolder/TemporaryFolder.py).
+- Moved Zope2-specific module, ZODB/Mount.py, to
+  Products/TemporaryFolder/mount.py (its only client is
+  Products/TemporaryFolder/TemporaryFolder.py).
 
-      - Removed spurious import-time dependencies from
-        Products/ZODBMountPoint/MountedObject.py.
+- Removed spurious import-time dependencies from
+  Products/ZODBMountPoint/MountedObject.py.
 
-      - Removed Examples.zexp from the skeleton. The TTW shopping cart isn't
-        any good example of Zope usage anymore.
+- Removed Examples.zexp from the skeleton. The TTW shopping cart isn't
+  any good example of Zope usage anymore.
 
-      - Removed deprecated ZTUtil.Iterator module
+- Removed deprecated ZTUtil.Iterator module
 
-      - Removed deprecated StructuredText module
+- Removed deprecated StructuredText module
 
-      - Removed deprecated TAL module
+- Removed deprecated TAL module
 
-      - Removed deprecated modules from Products.PageTemplates.
+- Removed deprecated modules from Products.PageTemplates.
 
-      - Removed deprecated ZCML directives from Five including the whole
-        Five.site subpackage.
+- Removed deprecated ZCML directives from Five including the whole
+  Five.site subpackage.
 
-    Features added
+Features added
+++++++++++++++
 
-      - Acquisition has been made aware of __parent__ pointers. This allows
-        direct access to many Zope 3 classes without the need to mixin
-        Acquisition base classes for the security to work.
+- Acquisition has been made aware of __parent__ pointers. This allows
+  direct access to many Zope 3 classes without the need to mixin
+  Acquisition base classes for the security to work.
 
-      - MailHost: now uses zope.sendmail for delivering the mail. With this
-        change MailHost integrates with the Zope transaction system (avoids
-        sending dupe emails in case of conflict errors). In addition
-        MailHost now provides support for asynchronous mail delivery. The
-        'Use queue' configuration option will create a mail queue on the
-        filesystem (under 'Queue directory') and start a queue thread that
-        checks the queue every three seconds. This decouples the sending of
-        mail from its delivery.  In addition MailHosts now supports
-        encrypted connections through TLS/SSL.
+- MailHost: now uses zope.sendmail for delivering the mail. With this
+  change MailHost integrates with the Zope transaction system (avoids
+  sending dupe emails in case of conflict errors). In addition
+  MailHost now provides support for asynchronous mail delivery. The
+  'Use queue' configuration option will create a mail queue on the
+  filesystem (under 'Queue directory') and start a queue thread that
+  checks the queue every three seconds. This decouples the sending of
+  mail from its delivery.  In addition MailHosts now supports
+  encrypted connections through TLS/SSL.
 
-      - SiteErrorLog now includes the entry id in the information copied to
-        the event log. This allowes you to correlate a user error report with
-        the event log after a restart, or let's you find the REQUEST
-        information in the SiteErrorLog when looking at a traceback in the
-        event log.
+- SiteErrorLog now includes the entry id in the information copied to
+  the event log. This allowes you to correlate a user error report with
+  the event log after a restart, or let's you find the REQUEST
+  information in the SiteErrorLog when looking at a traceback in the
+  event log.
 
-    Bugs Fixed
+Bugs Fixed
+++++++++++
 
-      - Specified height/width of icons in ZMI listings so the table doesn't
-        jump around while loading.
+- Specified height/width of icons in ZMI listings so the table doesn't
+  jump around while loading.
 
-      - After the proper introduction of parent-pointers, it's now
-        wrong to acquisition-wrap content providers. We will now use
-        the "classic" content provider expression from Zope 3.
+- After the proper introduction of parent-pointers, it's now
+  wrong to acquisition-wrap content providers. We will now use
+  the "classic" content provider expression from Zope 3.
 
-      - Ported c69896 to Five. This fix makes it possible to provide a
-        template using Python, and not have it being set to `None` by
-        the viewlet manager directive.
-    
-      - Made Five.testbrowser compatible with mechanize 0.1.7b.
+- Ported c69896 to Five. This fix makes it possible to provide a
+  template using Python, and not have it being set to `None` by
+  the viewlet manager directive.
 
-      - Launchpad #280334: Fixed problem with 'timeout'
-        argument/attribute missing in testbrowser tests.
+- Made Five.testbrowser compatible with mechanize 0.1.7b.
 
-      - Launchpad #267834: proper separation of HTTP header fields   
-        using CRLF as requested by RFC 2616.
+- Launchpad #280334: Fixed problem with 'timeout'
+  argument/attribute missing in testbrowser tests.
 
-      - Launchpad #257276: fix for possible denial-of-service attack
-        in PythonScript when passing an arbitrary module to the encode()
-        or decode() of strings.
+- Launchpad #267834: proper separation of HTTP header fields   
+  using CRLF as requested by RFC 2616.
 
-      - Launchpad #257269: 'raise SystemExit' with a PythonScript could 
shutdown
-        a complete Zope instance
+- Launchpad #257276: fix for possible denial-of-service attack
+  in PythonScript when passing an arbitrary module to the encode()
+  or decode() of strings.
 
-      - Switch to branch of 'zope.testbrowser' external which suppresses
-        over-the-wire tests.
+- Launchpad #257269: 'raise SystemExit' with a PythonScript could shutdown
+  a complete Zope instance
 
-      - Launchpad #143902: Fixed App.ImageFile to use a stream iterator to
-        output the file. Avoid loading the file content when guessing the
-        mimetype and only load the first 1024 bytes of the file when it cannot
-        be guessed from the filename.
+- Switch to branch of 'zope.testbrowser' external which suppresses
+  over-the-wire tests.
 
-      - Changed PageTemplateFile not to load the file contents on Zope startup
-        anymore but on first access instead. This brings them inline with the
-        zope.pagetemplate version and speeds up Zope startup.
+- Launchpad #143902: Fixed App.ImageFile to use a stream iterator to
+  output the file. Avoid loading the file content when guessing the
+  mimetype and only load the first 1024 bytes of the file when it cannot
+  be guessed from the filename.
 
-      - Collector #2278: form ':record' objects did not implement enough
-        of the mapping protocol.
+- Changed PageTemplateFile not to load the file contents on Zope startup
+  anymore but on first access instead. This brings them inline with the
+  zope.pagetemplate version and speeds up Zope startup.
 
-      - "version.txt" file was being written to the wrong place by the
-        Makefile, causing Zope to report "unreleased version" even for
-        released versions.
+- Collector #2278: form ':record' objects did not implement enough
+  of the mapping protocol.
 
-      - Five.browser.metaconfigure.page didn't protect names from interface
-        superclasses (http://www.zope.org/Collectors/Zope/2333)
+- "version.txt" file was being written to the wrong place by the
+  Makefile, causing Zope to report "unreleased version" even for
+  released versions.
 
-      - DAV: litmus "notowner_modify" tests warn during a MOVE request
-        because we returned "412 Precondition Failed" instead of "423
-        Locked" when the resource attempting to be moved was itself
-        locked.  Fixed by changing Resource.Resource.MOVE to raise the
-        correct error.
+- Five.browser.metaconfigure.page didn't protect names from interface
+  superclasses (http://www.zope.org/Collectors/Zope/2333)
 
-      - DAV: litmus props tests 19: propvalnspace and 20:
-        propwformed were failing because Zope did not strip off the
-        xmlns: attribute attached to XML property values.  We now strip
-        off all attributes that look like xmlns declarations.
+- DAV: litmus "notowner_modify" tests warn during a MOVE request
+  because we returned "412 Precondition Failed" instead of "423
+  Locked" when the resource attempting to be moved was itself
+  locked.  Fixed by changing Resource.Resource.MOVE to raise the
+  correct error.
 
-      - DAV: When a client attempted to unlock a resource with a token
-        that the resource hadn't been locked with, in the past we
-        returned a 204 response.  This was incorrect.  The "correct"
-        behavior is to do what mod_dav does, which is return a '400
-        Bad Request' error.  This was caught by litmus
-        locks.notowner_lock test #10.  See
-        http://lists.w3.org/Archives/Public/w3c-dist-auth/2001JanMar/0099.html
-        for further rationale.
+- DAV: litmus props tests 19: propvalnspace and 20:
+  propwformed were failing because Zope did not strip off the
+  xmlns: attribute attached to XML property values.  We now strip
+  off all attributes that look like xmlns declarations.
 
-      - When Zope properties were set via DAV in the "null" namespace
-        (xmlns="") a subsequent PROPFIND for the property would cause the
-        XML representation for that property to show a namespace of
-        xmlns="None".  Fixed within OFS.PropertySheets.dav__propstat.
+- DAV: When a client attempted to unlock a resource with a token
+  that the resource hadn't been locked with, in the past we
+  returned a 204 response.  This was incorrect.  The "correct"
+  behavior is to do what mod_dav does, which is return a '400
+  Bad Request' error.  This was caught by litmus
+  locks.notowner_lock test #10.  See
+  http://lists.w3.org/Archives/Public/w3c-dist-auth/2001JanMar/0099.html
+  for further rationale.
 
-      - integrated theuni's additional test from 2.11 (see r73132)
+- When Zope properties were set via DAV in the "null" namespace
+  (xmlns="") a subsequent PROPFIND for the property would cause the
+  XML representation for that property to show a namespace of
+  xmlns="None".  Fixed within OFS.PropertySheets.dav__propstat.
 
-      - Relaxed requirements for context of
-        Products.Five.browser.pagetemplatefile.ZopeTwoPageTemplateFile,
-        to reduce barriers for testing renderability of views which
-        use them.
-        (http://www.zope.org/Collectors/Zope/2327)
+- integrated theuni's additional test from 2.11 (see r73132)
 
-      - PluginIndexes: Fixed 'parseIndexRequest' for false values.
+- Relaxed requirements for context of
+  Products.Five.browser.pagetemplatefile.ZopeTwoPageTemplateFile,
+  to reduce barriers for testing renderability of views which
+  use them.
+  (http://www.zope.org/Collectors/Zope/2327)
 
-      - Collector #2263: 'field2ulines' did not convert empty string
-        correctly.
+- PluginIndexes: Fixed 'parseIndexRequest' for false values.
 
-      - Collector #2198: Zope 3.3 fix breaks Five 1.5 test_getNextUtility
+- Collector #2263: 'field2ulines' did not convert empty string
+  correctly.
 
-      - Prevent ZPublisher from insering incorrect <base/> tags into the
-        headers of plain html files served from Zope3 resource directories.
+- Collector #2198: Zope 3.3 fix breaks Five 1.5 test_getNextUtility
 
-      - Changed the condition checking for setting status of
-        HTTPResponse from to account for new-style classes.
+- Prevent ZPublisher from insering incorrect <base/> tags into the
+  headers of plain html files served from Zope3 resource directories.
 
-      - The Wrapper_compare function from tp_compare to tp_richcompare.
-        Also another function Wrapper_richcompare is added.
+- Changed the condition checking for setting status of
+  HTTPResponse from to account for new-style classes.
 
-      - The doc test has been slightly changed in ZPublisher to get
-        the error message extracted correctly.
+- The Wrapper_compare function from tp_compare to tp_richcompare.
+  Also another function Wrapper_richcompare is added.
 
-      - The changes made in Acquisition.c in Implicit Acquisition
-        comparison made avail to Explicit Acquisition comparison also.
+- The doc test has been slightly changed in ZPublisher to get
+  the error message extracted correctly.
 
-      - zopedoctest no longer breaks if the URL contains more than one
-        question mark. It broke even when the second question mark was
-        correctly quoted.
+- The changes made in Acquisition.c in Implicit Acquisition
+  comparison made avail to Explicit Acquisition comparison also.
 
-    Other Changes
+- zopedoctest no longer breaks if the URL contains more than one
+  question mark. It broke even when the second question mark was
+  correctly quoted.
 
-      - Added lib/python/webdav/litmus-results.txt explaining current
-        test results from the litmus WebDAV torture test.
+Other Changes
++++++++++++++
 
-      - DocumentTemplate.DT_Var.newline_to_br(): Simpler, faster
-        implementation.
+- Added lib/python/webdav/litmus-results.txt explaining current
+  test results from the litmus WebDAV torture test.
 
+- DocumentTemplate.DT_Var.newline_to_br(): Simpler, faster
+  implementation.
+

Modified: Zope/trunk/setup.py
===================================================================
--- Zope/trunk/setup.py 2009-02-19 12:55:08 UTC (rev 96741)
+++ Zope/trunk/setup.py 2009-02-19 13:00:24 UTC (rev 96742)
@@ -13,6 +13,7 @@
 ##############################################################################
 """Setup for the Acquisition egg package
 """
+import os
 from setuptools import setup, find_packages, Extension
 
 EXTENSIONCLASS_INCLUDEDIRS = ['include', 'src']
@@ -39,6 +40,9 @@
       description='Zope2 application server / web framework',
       author='Zope Corporation and Contributors',
       author_email='zope-...@zope.org',
+      long_description=open("README.txt").read() + "\n" +
+                       open(os.path.join("doc", "CHANGES.txt")).read(),
+
       long_description='',
       
       packages=find_packages('src'),

_______________________________________________
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

Reply via email to