From 407e0dbd8bb28c3fbfb2eca113bf833b3e420027 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 15 Mar 2014 14:47:58 +0100
Subject: [PATCH] [prep-release-3.1.0-b1] Update version to 3.1.0-b1

---
 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 1022565ff0..9f467e433b 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-a4-dev" />
-	<property name="prevversion" value="3.1.0-a2" />
-	<property name="olderversions" value="3.0.12, 3.1.0-a1" />
+	<property name="newversion" value="3.1.0-b1" />
+	<property name="prevversion" value="3.1.0-a3" />
+	<property name="olderversions" value="3.0.12, 3.1.0-a1, 3.1.0-a2" />
 	<!-- 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 c2c7ca0abd..ef1ae767d0 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-a4-dev');
+define('PHPBB_VERSION', '3.1.0-b1');
 
 // QA-related
 // define('PHPBB_QA', 1);
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index 034b590331..e8c8a7431d 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-a3',
+	'phpbb_version'	=> '3.1.0-b1',
 	'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 306098bc2b..087a856536 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-a4-dev');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-b1');
 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 f4f67635dd..6b73b25a79 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 = © phpBB Group, 2007
-style_version = 3.1.0-a3
-phpbb_version = 3.1.0-a3
+style_version = 3.1.0-b1
+phpbb_version = 3.1.0-b1
 
 # Defining a different template bitfield
 # template_bitfield = lNg=
diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg
index 9ca6077dfa..438ced13f4 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 = © 2005 phpBB Group
-style_version = 3.1.0-a3
-phpbb_version = 3.1.0-a3
+style_version = 3.1.0-b1
+phpbb_version = 3.1.0-b1
 
 # Defining a different template bitfield
 # template_bitfield = lNg=