From 555292363347e1090f11da77b578717a80c5bedd Mon Sep 17 00:00:00 2001
From: Salvo 'LtWorf' Tomaselli <tiposchi@tiscali.it>
Date: Sat, 13 Jun 2015 17:34:13 +0200
Subject: [PATCH] Prepare for version 2.1

---
 CHANGELOG                   | 2 ++
 feedback-ltworf/feedback.py | 2 +-
 relational_gui.py           | 2 +-
 setup/installer_common.py   | 2 +-
 windows/input.py            | 2 +-
 windows/ss.iss              | 2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index f74c494..5cb2320 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+2.1
+
 2.0
 - Fix bug in relational-cli that made it crash when an exception was raised
 - Point to new website
diff --git a/feedback-ltworf/feedback.py b/feedback-ltworf/feedback.py
index bd5a360..8abf994 100644
--- a/feedback-ltworf/feedback.py
+++ b/feedback-ltworf/feedback.py
@@ -12,7 +12,7 @@ def m(request, *args, **kwargs):
 @application.route("/version/<id>")
 def show_version(request, *args, **kwargs):
     if kwargs["id"] == "relational":
-        return "2.0"
+        return "2.1"
     return "No version"
 
 @application.route('/feedback/<id>')
diff --git a/relational_gui.py b/relational_gui.py
index fead9fe..5cbf99a 100755
--- a/relational_gui.py
+++ b/relational_gui.py
@@ -25,7 +25,7 @@ import os.path
 import getopt
 
 from relational import relation, parser
-version = "2.0"
+version = "2.1"
 
 
 def printver(exit=True):
diff --git a/setup/installer_common.py b/setup/installer_common.py
index a3fc522..ebfc876 100644
--- a/setup/installer_common.py
+++ b/setup/installer_common.py
@@ -21,7 +21,7 @@ from distutils.core import setup
 
 def c_setup(name):
     setup(
-        version='2.0',
+        version='2.1',
         name=name,
         packages=(name,),
         author="Salvo 'LtWorf' Tomaselli",
diff --git a/windows/input.py b/windows/input.py
index de0083a..c653a10 100644
--- a/windows/input.py
+++ b/windows/input.py
@@ -37,5 +37,5 @@ setup(options = {
           {"script": "relational_gui.py","icon_resources": [(0, "windows/favicon.ico")]}
           ]
       ,name="Relational",
-               version="2.0"
+               version="2.1"
       )
diff --git a/windows/ss.iss b/windows/ss.iss
index 26c3cdd..5731921 100644
--- a/windows/ss.iss
+++ b/windows/ss.iss
@@ -7,7 +7,7 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{6F127615-6AD4-4BD7-8135-2444A335B5CD}
 AppName=Relational
-AppVerName=Relational ver. 2.0
+AppVerName=Relational ver. 2.1
 AppPublisher=Salvo 'LtWorf' Tomaselli
 AppPublisherURL=http://ltworf.github.io/relational/
 AppSupportURL=http://ltworf.github.io/relational/