From 73e52adee17b08ba043dcfcae7ee96b2b9b0980f Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Wed, 22 Aug 2012 10:39:26 -0400
Subject: [PATCH] Upgraded version number to 2.2.0

---
 install_minimal/include/airtime-constants.php    |  2 +-
 .../include/airtime-installed-check.php          |  4 ++--
 .../upgrades/airtime-2.1.3/data/upgrade.sql      |  2 +-
 .../airtime-2.2.0/common/UpgradeCommon.php       | 16 ++++++++--------
 python_apps/api_clients/api_client.py            |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/install_minimal/include/airtime-constants.php b/install_minimal/include/airtime-constants.php
index 1d09fca25..8d028ec63 100644
--- a/install_minimal/include/airtime-constants.php
+++ b/install_minimal/include/airtime-constants.php
@@ -1,3 +1,3 @@
 <?php
 
-define('AIRTIME_VERSION', '2.1.3');
+define('AIRTIME_VERSION', '2.2.0');
diff --git a/install_minimal/include/airtime-installed-check.php b/install_minimal/include/airtime-installed-check.php
index 003a3ced3..259c21914 100644
--- a/install_minimal/include/airtime-installed-check.php
+++ b/install_minimal/include/airtime-installed-check.php
@@ -21,8 +21,8 @@ if (!file_exists('/etc/airtime/airtime.conf')) {
 }
 
 require_once(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/db-conf.php");
-require_once('propel/runtime/lib/Propel.php');
-Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php");
+require_once('propel/runtime/lib/Propel.php');
+Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php");
 
 $version = AirtimeInstall::GetVersionInstalled();
 
diff --git a/install_minimal/upgrades/airtime-2.1.3/data/upgrade.sql b/install_minimal/upgrades/airtime-2.1.3/data/upgrade.sql
index 0ff1f826c..f031f7152 100644
--- a/install_minimal/upgrades/airtime-2.1.3/data/upgrade.sql
+++ b/install_minimal/upgrades/airtime-2.1.3/data/upgrade.sql
@@ -1,4 +1,4 @@
 DELETE FROM cc_pref WHERE keystr = 'system_version';
-INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '2.1.3');
+INSERT INTO cc_pref (keystr, valstr) VALUES ('system_version', '2.2.0');
 
 UPDATE cc_show_instances SET time_filled='00:00:00' WHERE time_filled IS NULL;
diff --git a/install_minimal/upgrades/airtime-2.2.0/common/UpgradeCommon.php b/install_minimal/upgrades/airtime-2.2.0/common/UpgradeCommon.php
index a0eec539d..de1514333 100644
--- a/install_minimal/upgrades/airtime-2.2.0/common/UpgradeCommon.php
+++ b/install_minimal/upgrades/airtime-2.2.0/common/UpgradeCommon.php
@@ -3,16 +3,16 @@
  * creating connections to a database, backing up config files etc.
  */
 class UpgradeCommon{
-    const CONF_FILE_AIRTIME = "/etc/airtime/airtime.conf";
-    const CONF_FILE_PYPO = "/etc/airtime/pypo.cfg";
-    const CONF_FILE_LIQUIDSOAP = "/etc/airtime/liquidsoap.cfg";
+    const CONF_FILE_AIRTIME      = "/etc/airtime/airtime.conf";
+    const CONF_FILE_PYPO         = "/etc/airtime/pypo.cfg";
+    const CONF_FILE_LIQUIDSOAP   = "/etc/airtime/liquidsoap.cfg";
     const CONF_FILE_MEDIAMONITOR = "/etc/airtime/media-monitor.cfg";
-    const CONF_FILE_API_CLIENT = "/etc/airtime/api_client.cfg";
+    const CONF_FILE_API_CLIENT   = "/etc/airtime/api_client.cfg";
 
-    const CONF_PYPO_GRP = "pypo";
-    const CONF_WWW_DATA_GRP = "www-data";
-    const CONF_BACKUP_SUFFIX = "220";
-    const VERSION_NUMBER = "2.2.0";
+    const CONF_PYPO_GRP          = "pypo";
+    const CONF_WWW_DATA_GRP      = "www-data";
+    const CONF_BACKUP_SUFFIX     = "220";
+    const VERSION_NUMBER         = "2.2.0";
     
     public static function SetDefaultTimezone()
     {       
diff --git a/python_apps/api_clients/api_client.py b/python_apps/api_clients/api_client.py
index 268898973..faf772a9a 100644
--- a/python_apps/api_clients/api_client.py
+++ b/python_apps/api_clients/api_client.py
@@ -18,7 +18,7 @@ from configobj import ConfigObj
 import string
 import traceback
 
-AIRTIME_VERSION = "2.1.3"
+AIRTIME_VERSION = "2.2.0"
 
 def to_unicode(obj, encoding='utf-8'):
     if isinstance(obj, basestring):