set version to 2.5

Makefile

@@ -12,7 +12,7 @@ info:
 	@echo "make ppa-dev      - upload to launchpad development repo"
 
 #VERSION=1.3~dev5
-VERSION=2.5~dev4
+VERSION=2.5
 SERIES="trusty precise vivid"
 LOCAL_SERIES=`lsb_release -a | grep Codename | cut -f2`
 SRCDIRS=deploy authmodules migrations doc tests tools privacyidea 

deploy/debian-ubuntu/changelog

@@ -1,4 +1,4 @@
-python-privacyidea (2.5~dev4) trusty; urgency=low
+python-privacyidea (2.5-1trusty) trusty; urgency=low
 
   Features
   * Add statistics
@@ -17,7 +17,7 @@ python-privacyidea (2.5~dev4) trusty; urgency=low
   * Fix registration token
   * Fix mOTP reuse problem
 
- -- Cornelius Kölbel <cornelius@privacyidea.org>  Tue, 21 Jul 2015 22:45:00 +0200
+ -- Cornelius Kölbel <cornelius@privacyidea.org>  Wed, 22 Jul 2015 17:00:00 +0200
 
 python-privacyidea (2.4-1trusty) trusty; urgency=low
 

deploy/debian-virtualenv/changelog

@@ -1,4 +1,4 @@
-python-privacyidea (2.5~dev1) wheezy; urgency=low
+python-privacyidea (2.5-1) wheezy; urgency=low
 
   Features
   * Add statistics
@@ -18,7 +18,7 @@ python-privacyidea (2.5~dev1) wheezy; urgency=low
   * Fix mOTP reuse problem
 
 
- -- Cornelius Kölbel <cornelius@privacyidea.org>  Thu, 25 Jun 2015 11:45:00 +0200
+ -- Cornelius Kölbel <cornelius@privacyidea.org>  Wed, 22 Jul 2015 17:00:00 +0200
 
 
 privacyidea-venv (2.4-1) wheezy; urgency=low

doc/conf.py

@@ -52,9 +52,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.4'
+version = '2.5'
 # The full version, including alpha/beta/rc tags.
-release = '2.4'
+release = '2.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -5,7 +5,7 @@
 import sys
 
 #VERSION="2.1dev4"
-VERSION="2.5dev4"
+VERSION="2.5"
 
 # Taken from kennethreitz/requests/setup.py
 package_directory = os.path.realpath(os.path.dirname(__file__))