From: Dan Scott Date: Fri, 2 Nov 2012 03:33:20 +0000 (-0400) Subject: Bumping version numbers for 2.1.4 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=61e5b66f22d21761e4851abea1b1eadff6081230;p=Evergreen.git Bumping version numbers for 2.1.4 Signed-off-by: Dan Scott --- diff --git a/Open-ILS/src/perlmods/lib/OpenILS.pm b/Open-ILS/src/perlmods/lib/OpenILS.pm index ead71e2e45..cbcf4edcf3 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS.pm @@ -6,6 +6,6 @@ OpenILS - Client and server support for the Evergreen open source library system =cut -our $VERSION = '2.00'; +our $VERSION = '2.14'; 1; diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm index 8f31239348..3abe09b1ff 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm @@ -6,7 +6,7 @@ use base qw/OpenSRF::Application/; sub ils_version { # version format is "x-y-z", for example "2-0-0" for Evergreen 2.0.0 # For branches, format is "x-y" - return "2-1-3"; + return "2-1-4"; } __PACKAGE__->register_method( diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index f017f70afa..61faf57112 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -58,6 +58,7 @@ CREATE TABLE config.upgrade_log ( ); INSERT INTO config.upgrade_log (version) VALUES ('0726'); -- denials +INSERT INTO config.upgrade_log (version) VALUES ('2.1.4'); INSERT INTO config.upgrade_log (version) VALUES ('2.1.3'); CREATE TABLE config.bib_source ( diff --git a/Open-ILS/xul/staff_client/chrome/content/main/about.html b/Open-ILS/xul/staff_client/chrome/content/main/about.html index c0f3220269..11e9919fbe 100644 --- a/Open-ILS/xul/staff_client/chrome/content/main/about.html +++ b/Open-ILS/xul/staff_client/chrome/content/main/about.html @@ -1,7 +1,7 @@

Evergreen

Target Server ID:

http://git.evergreen-ils.org/Evergreen.git?h=refs/heads/rel_2_1_3

http://git.evergreen-ils.org/Evergreen.git?h=refs/heads/rel_2_1_4

What is Evergreen?

diff --git a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js index 75bb971e6d..fac1158224 100644 --- a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js +++ b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js @@ -11,7 +11,7 @@ pref("toolkit.singletonWindowType", "eg_main"); pref("open-ils.enable_join_tabs", true); // We'll use this one to help brand some build information into the client, and rely on subversion keywords -pref("open-ils.repository.headURL","http://git.evergreen-ils.org/Evergreen.git?h=refs/heads/rel_2_1_3"); +pref("open-ils.repository.headURL","http://git.evergreen-ils.org/Evergreen.git?h=refs/heads/rel_2_1_4"); pref("open-ils.repository.author","$Author$"); pref("open-ils.repository.revision","$Revision$"); pref("open-ils.repository.date","$Date$"); diff --git a/README b/README index 0b89a3ee67..6102154035 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ -README for Evergreen 2.1.3a -=========================== +README for Evergreen 2.1.4 +========================== Preamble: referenced user accounts ---------------------------------- @@ -38,8 +38,8 @@ the following commands as the *user* Linux account: [source, bash] ------------------------------------------------------------------------------ -wget -c http://evergreen-ils.org/downloads/Evergreen-ILS-2.1.3a.tar.gz -tar xzf Evergreen-ILS-2.1.3a.tar.gz +wget -c http://evergreen-ils.org/downloads/previews/Evergreen-ILS-2.1.4.tar.gz +tar xzf previews/Evergreen-ILS-2.1.4.tar.gz ------------------------------------------------------------------------------ Preamble: Developer instructions @@ -172,7 +172,7 @@ Installation instructions + [source, bash] ------------------------------------------------------------------------------ -make STAFF_CLIENT_STAMP_ID=rel_2_1_3 install +make STAFF_CLIENT_STAMP_ID=rel_2_1_4 install ------------------------------------------------------------------------------ + 2. The server portion of the staff client expects `http://hostname/xul/server` diff --git a/configure.ac b/configure.ac index 565a94b712..aa1a8414d9 100644 --- a/configure.ac +++ b/configure.ac @@ -20,8 +20,8 @@ export PATH=${PATH}:/usr/sbin AC_PREREQ(2.61) -AC_INIT(Open-ILS, 2.1.3, open-ils-dev@list.georgialibraries.org) -AM_INIT_AUTOMAKE([OpenILS], [2.1.3]) +AC_INIT(Open-ILS, 2.1.4, open-ils-dev@list.georgialibraries.org) +AM_INIT_AUTOMAKE([OpenILS], [2.1.4]) AC_REVISION($Revision: 0.1 $) AC_CONFIG_SRCDIR([configure.ac]) AC_PREFIX_DEFAULT([/openils/])