[Plone-cvs] r20214 - in plone.memoize/trunk: . docs

[Hanno S. <svn...@pl...>]

Author: hannosch
Date: Mon Mar 31 17:02:05 2008
New Revision: 20214

Modified:
   plone.memoize/trunk/docs/HISTORY.txt
   plone.memoize/trunk/docs/LICENSE.txt
   plone.memoize/trunk/setup.py
Log:
Merged c20207-20213 from the 1.0 branch into trunk


Modified: plone.memoize/trunk/docs/HISTORY.txt
==============================================================================
--- plone.memoize/trunk/docs/HISTORY.txt	(original)
+++ plone.memoize/trunk/docs/HISTORY.txt	Mon Mar 31 17:02:05 2008
@@ -7,6 +7,14 @@
     - The clearbefore decorator was mistakenly not tested.
       [maurits]
 
+
+1.0.4 (2008-03-31)
+------------------
+
+    - Documentation and release notes cleanup.
+      [hannosch]
+
+
 1.0.3 (2007-11-09)
 ------------------
 

Modified: plone.memoize/trunk/docs/LICENSE.txt
==============================================================================
--- plone.memoize/trunk/docs/LICENSE.txt	(original)
+++ plone.memoize/trunk/docs/LICENSE.txt	Mon Mar 31 17:02:05 2008
@@ -1,4 +1,4 @@
-  plone.memoize is copyright Martin Aspeli
+  plone.memoize is copyright Plone Foundation
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by

Modified: plone.memoize/trunk/setup.py
==============================================================================
--- plone.memoize/trunk/setup.py	(original)
+++ plone.memoize/trunk/setup.py	Mon Mar 31 17:02:05 2008
@@ -1,19 +1,18 @@
 from setuptools import setup, find_packages
-import sys, os
 
 version = '1.1'
 
 setup(name='plone.memoize',
       version=version,
       description="Decorators for caching the values of functions and methods",
-      long_description=open("README.txt").read() + \
+      long_description=open("README.txt").read() + '\n' + \
                        open("docs/HISTORY.txt").read(),
       classifiers=[],
       keywords='plone memoize decorator cache',
       author='Martin Aspeli, David "Whit" Morriss and Daniel Nouri',
       author_email='opt...@gm...',
       url='http://svn.plone.org/svn/plone/plone.memoize',
-      license='LGPL',
+      license='GPL',
       packages=find_packages(exclude=['ez_setup']),
       namespace_packages=['plone'],
       include_package_data=True,