Merge branch 'release-0.1.2'

AUTHORS.txt

@@ -1,7 +1,7 @@
 Authors
 =======
 
-Jeff Pittman [geojeff]
+Jeff Pittman [geojeff] for port to python and development of examples.
 
 kivy_statecharts started as a port of the SproutCore.statechart framework,
 which Michael Cohen [frozencanuck] first developed as the standalone framework

CHANGES.txt

@@ -1,6 +1,12 @@
 CHANGES
 =======
 
+0.1.2
+-----
+
+ - Transferred to github.com/Kivy.
+ - Updated readme and license info for transfer.
+
 0.1.1
 -----
 

LICENSE

@@ -1,24 +1,29 @@
-# ================================================================================
+# =============================================================================
 # Project: kivy-statecharts - A Statechart Framework for Kivy
-# Copyright: ©2012 Jeffrey Gill Pittman, and contributors.
 # Copyright: ©2010, 2011 Michael Cohen, and contributors.
 # Python Port: Jeff Pittman, ported from SproutCore, SC.Statechart
-# ================================================================================
+# =============================================================================
 #
 # Ported from:
 #
-#     https://github.com/sproutcore/sproutcore/tree/master/frameworks/statechart
+#   https://github.com/sproutcore/sproutcore/tree/master/frameworks/statechart
 #
-# =================================================================================
+# =============================================================================
 # Project:   kivy_statecharts - A Statechart Framework for Kivy
 #
-# Copyright: (c) 2012 Jeffrey Gill Pittman, and contributors.
 # Copyright: (c) 2010, 2011 Michael Cohen, and contributors.
 #            Portions @2011 Apple Inc. All rights reserved.
-# License:   Licensed under MIT license
-# =================================================================================
+# License:   Licensed under MIT license -- See note below, about transferring
+#            into Kivy from github.com/geojeff, done February 11, 2013.
+# =============================================================================
 #
-# Note: The similarity between the original name of Michael Cohen's Ki Statechart
-#       framework, which was later ported to SproutCore, and the name Kivy, is
-#       purely coincidental.
+# Note: The similarity between the original name of Michael Cohen's Ki
+#       Statechart framework, which was later ported to SproutCore, and the
+#       name Kivy, is purely coincidental.
 #
+# Note: The original license of Ki and of SC.Statechart is MIT, so this was
+#       kept for kivy-statecharts while it was being ported and developed on
+#       github.com/geojeff. It is something of an add-on to Kivy core, so
+#       perhaps this is fine, but this can be reviewed for making changes
+#       appropriate for living under the Kivy umbrella. The copyright lines
+#       for Jeffrey Gill Pittman (geojeff) was removed on transfer to Kivy.

README.rst

@@ -47,7 +47,7 @@ it, and inside kivy, do::
     
 Clone the kivy-statecharts repo::
 
-    git clone https://github.com/geojeff/kivy-statecharts.git
+    git clone https://github.com/kivy/kivy-statecharts.git
 
     python setup develop
 
@@ -108,7 +108,7 @@ As of April 2012, most tests were ported.
 .. _Original Ki repo: https://github.com/frozenCanuck/ki
 .. _SC.Statechart repo: https://github.com/sproutcore/sproutcore/tree/master/frameworks/statechart
 .. _Find out more about Kivy: http://kivy.org
-.. _GitHub repository: https://github.com/geojeff/kivy_statecharts
+.. _GitHub repository: https://github.com/kivy/kivy_statecharts
 .. _gitflow: https://github.com/nvie/gitflow
 .. _A successful Git branching model: http://nvie.com/posts/a-successful-git-branching-model/
 .. _nose: http://readthedocs.org/docs/nose/en/latest/

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = '0.1.1'
+version = '0.1.2'
 
 here = os.path.abspath(os.path.dirname(__file__))