From 6ee05d369e5aa0acb307bf88f0ac15fb33aade2b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 13 Nov 2013 17:50:57 +0100
Subject: [PATCH] [prep-release-3.1.0-a2] Update version to 3.1.0-a2

---
 build/build.xml                              | 6 +++---
 phpBB/includes/constants.php                 | 2 +-
 phpBB/install/convertors/convert_phpbb20.php | 2 +-
 phpBB/install/schemas/schema_data.sql        | 2 +-
 phpBB/styles/prosilver/style.cfg             | 4 ++--
 phpBB/styles/subsilver2/style.cfg            | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 0a5448f98d..ebc1f0be8b 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -2,9 +2,9 @@
 
 <project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
 	<!-- a few settings for the build -->
-	<property name="newversion" value="3.1.0-a1" />
-	<property name="prevversion" value="3.0.12" />
-	<property name="olderversions" value="3.0.11" />
+	<property name="newversion" value="3.1.0-a2" />
+	<property name="prevversion" value="3.1.0-a1" />
+	<property name="olderversions" value="3.0.12" />
 	<!-- no configuration should be needed beyond this point -->
 
 	<property name="oldversions" value="${olderversions}, ${prevversion}" />
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index e1da41d106..546cd9e6d4 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -24,7 +24,7 @@ if (!defined('IN_PHPBB'))
 */
 
 // phpBB Version
-define('PHPBB_VERSION', '3.1.0-a2-dev');
+define('PHPBB_VERSION', '3.1.0-a2');
 
 // QA-related
 // define('PHPBB_QA', 1);
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index de4e04a8e5..dd4ef13e49 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -33,7 +33,7 @@ $dbms = phpbb_convert_30_dbms_to_31($dbms);
 $convertor_data = array(
 	'forum_name'	=> 'phpBB 2.0.x',
 	'version'		=> '1.0.3',
-	'phpbb_version'	=> '3.1.0-a2-dev',
+	'phpbb_version'	=> '3.1.0-a2',
 	'author'		=> '<a href="https://www.phpbb.com/">phpBB Group</a>',
 	'dbms'			=> $dbms,
 	'dbhost'		=> $dbhost,
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 095415b175..355dec2a54 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -269,7 +269,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-a2-dev');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-a2');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
 
diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg
index aac9d993f5..aef7a3b12a 100644
--- a/phpBB/styles/prosilver/style.cfg
+++ b/phpBB/styles/prosilver/style.cfg
@@ -18,8 +18,8 @@
 # General Information about this style
 name = prosilver
 copyright = &copy; phpBB Group, 2007
-style_version = 3.1.0-a1
-phpbb_version = 3.1.0-a1
+style_version = 3.1.0-a2
+phpbb_version = 3.1.0-a2
 
 # Defining a different template bitfield
 # template_bitfield = lNg=
diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg
index 1d50352885..b588567153 100644
--- a/phpBB/styles/subsilver2/style.cfg
+++ b/phpBB/styles/subsilver2/style.cfg
@@ -18,8 +18,8 @@
 # General Information about this style
 name = subsilver2
 copyright = &copy; 2005 phpBB Group
-style_version = 3.1.0-a1
-phpbb_version = 3.1.0-a1
+style_version = 3.1.0-a2
+phpbb_version = 3.1.0-a2
 
 # Defining a different template bitfield
 # template_bitfield = lNg=