[open-ils-commits] r16254 - in tags/rel_1_6_0_4: . Open-ILS/src/perlmods/OpenILS Open-ILS/src/sql/Pg (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2010-04-16 13:08:42 -0400 (Fri, 16 Apr 2010)
New Revision: 16254

Modified:
   tags/rel_1_6_0_4/Open-ILS/src/perlmods/OpenILS/Application.pm
   tags/rel_1_6_0_4/Open-ILS/src/sql/Pg/1.6.0.3-1.6.0.4-upgrade-db.sql
   tags/rel_1_6_0_4/README
Log:
adjusting upgrade script; adjusting version numbering

Modified: tags/rel_1_6_0_4/Open-ILS/src/perlmods/OpenILS/Application.pm
===================================================================
--- tags/rel_1_6_0_4/Open-ILS/src/perlmods/OpenILS/Application.pm	2010-04-16 16:56:57 UTC (rev 16253)
+++ tags/rel_1_6_0_4/Open-ILS/src/perlmods/OpenILS/Application.pm	2010-04-16 17:08:42 UTC (rev 16254)
@@ -5,7 +5,7 @@
 
 sub ils_version {
     # version format is "x-y-z-p", for example "1-2-1-0" for Evergreen 1.2.1.0
-    return "1-5";
+    return "1-6-0-4";
 }
 
 __PACKAGE__->register_method(

Modified: tags/rel_1_6_0_4/Open-ILS/src/sql/Pg/1.6.0.3-1.6.0.4-upgrade-db.sql
===================================================================
--- tags/rel_1_6_0_4/Open-ILS/src/sql/Pg/1.6.0.3-1.6.0.4-upgrade-db.sql	2010-04-16 16:56:57 UTC (rev 16253)
+++ tags/rel_1_6_0_4/Open-ILS/src/sql/Pg/1.6.0.3-1.6.0.4-upgrade-db.sql	2010-04-16 17:08:42 UTC (rev 16254)
@@ -91,7 +91,11 @@
   GROUP BY 1,2,3,4,5,6,8,9;
 
 -- Now rebuild the materialized simple record table that was built on reporter.old_super_simple_record
+-- If you're using Slony, delete instead of truncate!
+
+--DELETE FROM materialized.simple_record;
 TRUNCATE TABLE materialized.simple_record;
+
 INSERT INTO materialized.simple_record
     SELECT * FROM reporter.old_super_simple_record;
 
@@ -689,6 +693,7 @@
 INSERT INTO permission.perm_list (code, description) VALUES ('MERGE_USERS', 'Allows user records to be merged');
 
 -- More trigger event definition permissions
+INSERT INTO permission.perm_list (code, description) VALUES ('ADMIN_TRIGGER_EVENT_DEF', 'Allow a user to administer trigger event definitions');
 INSERT INTO permission.perm_list (code, description) VALUES ('ADMIN_TRIGGER_CLEANUP', 'Allow a user to create, delete, and update trigger cleanup entries');
 INSERT INTO permission.perm_list (code, description) VALUES ('CREATE_TRIGGER_CLEANUP', 'Allow a user to create trigger cleanup entries');
 INSERT INTO permission.perm_list (code, description) VALUES ('DELETE_TRIGGER_CLEANUP', 'Allow a user to delete trigger cleanup entries');

Modified: tags/rel_1_6_0_4/README
===================================================================
--- tags/rel_1_6_0_4/README	2010-04-16 16:56:57 UTC (rev 16253)
+++ tags/rel_1_6_0_4/README	2010-04-16 17:08:42 UTC (rev 16254)
@@ -1,11 +1,11 @@
-README for Evergreen 1.6
+README for Evergreen 1.6.0.4
 
 Installing prerequisites:
 ========================
 Evergreen has a number of prerequisite packages that must be installed
 before you can successfully configure, compile, and install Evergreen.
 
-1. Begin by installing the most recent version of OpenSRF (1.1 or later).
+1. Begin by installing the most recent version of OpenSRF (1.2 or later).
 You can download OpenSRF releases from
 http://evergreen-ils.org/downloads
 
@@ -40,7 +40,7 @@
 Once you have configured and compiled Evergreen, issue the following
 command as the root user to install Evergreen:
 
-make STAFF_CLIENT_BUILD_ID=rel_1_6_0_0 install
+make STAFF_CLIENT_BUILD_ID=rel_1_6_0_4 install
 
 This will install Evergreen, including example configuration files in
 /openils/conf/ that you can use as templates for your own configuration files.