Preparing for 2.2 release

.gitignore

@@ -8,6 +8,7 @@
 .tox/
 bin/
 coverage-*
+dist/
 docs/_build/
 include/
 lib/

MANIFEST.in

@@ -1,2 +1,3 @@
-include *.rst
+include README.rst docs/changelog.rst
 recursive-include src/icalendar *
+recursive-exclude src/icalendar *.pyc

README.rst

@@ -8,73 +8,26 @@ with Python.
 ----
 
     :Code: http://github.com/collective/icalendar
-    :Mailing list: http://codespeak.net/mailman/listinfo/icalendar-dev
+    :Mailing list: http://github.com/collective/icalendar/issues
     :Dependencies: There are no other dependencies.
     :Tested with: Python 2.4 - 2.7
     :License: ???
 
 ----
 
-About this fork
-===============
 
-.. warning::
+About this fork which is not a fork anymore
+===========================================
 
-    This part should be removed actual before release.
+Aim of this fork was to bring this package up to date with latest icalendar
+`RFC`_ specification as part of `plone.app.event`_ project which goal is to
+bring recurrent evens to `Plone`_.
 
-Aim of this fork is to bring this package up to date with latest RFC
-specification as part of `plone.app.event`_ project which aims is to bring
-recurrence evens to `Plone`_.
-
-Current plan
-------------
-
-    1. Merge bugfixes from forks listed bellow.
-    2. Contact all interested and try to get release 2.2 out.
-    3. Start working on 3.0 to bring package up-to-date with newer iCalendar
-       specification (`RFC 5545`_), while keeping 2.X series compatible with
-       `RFC 2445`_.
-
-Known forks
------------
-
- - https://codespeak.net/svn/iCalendar/trunk/
-   The original codespeak repo, which this branch is based on (keeping it up to
-   date in ``svn-trunk`` branch)
-
- - https://github.com/cozi/icalendar
-   The icalendar fork of the Cozi group with many fixes and additions. 
-   Especially ``master-future`` branch is interesting.
-
- - https://github.com/greut/iCalendar
-   Another repository. All changes except the one from commit
-   #5166fa914593d8366044 were integrated into the cozi fork.
-
- - https://github.com/ryba-xek/iCalendar
-   Another repo which fixes an Unicode issue with folding. Integrated into
-   cozi.
-
- - https://github.com/1calendar/icalendar
-   Same as above.
-
- - https://bitbucket.org/psagers/icalendar
-   Another repo which fixes something also integrated in greut's repo, but not
-   in cozi's. Not sure if we need it.
-
-
-Todo
-----
-
- - license: there is a little bit of mess with licensing. it would be good
-   contact all contributors and ask them to change to one license (maybe
-   propose BSD)? more about it here:
-   http://codespeak.net/pipermail/icalendar-dev/2010-August/000157.html
- - mailing list: should we move mailing list from codespeak, since its services
-   are shuting down? 
+After some thoughts we (Plone developers involved with `plone.app.event`_) send
+a suggestion to icalendar-dev@codespeak.net to take owner the maintanancea.
 
 
 .. _`icalendar`: http://pypi.python.org/pypi/icalendar
 .. _`plone.app.event`: http://github.com/collective/plone.app.event
 .. _`Plone`: http://plone.org
-.. _`RFC 5545`: http://www.ietf.org/rfc/rfc5545.txt
-.. _`RFC 2445`: http://www.ietf.org/rfc/rfc2445.txt
+.. _`RFC`: http://www.ietf.org/rfc/rfc5545.txt

docs/changelog.rst

@@ -1,10 +1,9 @@
-=========
 Changelog
 =========
 
 
 2.2 - unreleased
-================
+----------------
 
 * migration to https://github.com/collective/icalendar using svn2git preserving
   tags, branches and authors.
@@ -33,7 +32,7 @@ Changelog
 
 
 2.1 (2009-12-14)
-================
+----------------
 
 * Fix deprecation warnings about ``object.__init__`` taking no parameters.
 
@@ -46,7 +45,7 @@ Changelog
 
 
 2.0.1 (2008-07-11)
-==================
+------------------
 
 * Made the tests run under Python 2.5+
 
@@ -55,7 +54,7 @@ Changelog
 
 
 2.0 (2008-07-11)
-================
+----------------
 
 * EXDATE and RDATE now returns a vDDDLists object, which contains a list
   of vDDDTypes objects. This is do that EXDATE and RDATE can contain
@@ -70,13 +69,13 @@ Changelog
 
 
 1.2 (2006-11-25)
-================
+----------------
 
 * Fixed a string index out of range error in the new folding code.
 
 
 1.1 (2006-11-23)
-================
+----------------
 
 * Fixed a bug in caselessdicts popitem. (thanks to Michael Smith
   <msmith@fluendo.com>)
@@ -90,7 +89,7 @@ Changelog
 
 
 1.0 (2006-08-03)
-================
+----------------
 
 * make get_inline and set_inline support non ascii codes.
 
@@ -98,7 +97,7 @@ Changelog
 
 
 0.11 (2005-11-08)
-=================
+-----------------
 
 * Changed component .from_string to use types_factory instead of hardcoding
   entries to 'inline'
@@ -122,7 +121,7 @@ Changelog
 
 
 0.10 (2005-04-28)
-=================
+-----------------
 
 * moved code to codespeak.net subversion.
 

setup.py

@@ -1,13 +1,14 @@
-from setuptools import setup
-from setuptools import find_packages
+import os
+import setuptools
 
 version = '2.2'
 
-setup(
+setuptools.setup(
     name='icalendar',
     version=version,
     description="iCalendar parser/generator",
-    long_description=open("README.rst").read(),
+    long_description=open("README.rst").read() + \
+            open(os.path.join('docs', 'changelog.rst')).read(),
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
@@ -15,11 +16,13 @@ setup(
         'Operating System :: OS Independent',
         ],
     keywords='calendar calendaring ical icalendar event todo journal recurring',
+    maintainer="Rok Garbas",
+    maintainer_email="rok@garbas.si",
     author='MaxM',
     author_email='max@mxm.dk',
-    url='https://gihub.com/collective/iCalendar',
+    url='https://gihub.com/collective/icalendar',
     license='GPL',
-    packages=find_packages('src'),
+    packages=setuptools.find_packages('src'),
     package_dir={'': 'src'},
     include_package_data=True,
     zip_safe=False,