Update ChangeLog, ReleaseNotes, version, and catalog update scripts for version 5.2.0

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index 21d5405f19f26e7406ac0ddaf8e68c9f1c0aa14f..eb645156a7ebe18fd4ea2276b68848d4765b0baa 100644 (file)
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -1,4 +1,4 @@
-              Changelog on version 5.2.0rc2
+              Changelog on version 5.2.0
 
 19Sep11
  - Update auth troubleshooting URL to use MANUAL_AUTH_URL macro

diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes
index aeee389af64193bd3bdadb5817bea63b096c0e19..77387eb889d4946eceba7d5b2076e817d040dc0b 100644 (file)
--- a/bacula/ReleaseNotes
+++ b/bacula/ReleaseNotes
@@ -1,5 +1,5 @@
 
-               Release Notes for Bacula 5.2.0 Beta 2
+               Release Notes for Bacula 5.2.0
 
   Bacula code: Total files = 1,110 Total lines = 231,439 (Using SLOCCount)
 
@@ -21,20 +21,22 @@ Compatibility:
 
 ================== Warning !!!!!! ==========================
 
- The new pruning algorithm will not allow to prune jobs that are essential to
- restore since the last Full backup. Pruning of volumes are not affected.
+ The new pruning algorithm will not allow pruning of jobs that are essential to
+ restore since the last Full backup. This is, of course, correct and desirable,
+ but it is different from older Bacula versions that could inappropriately
+ prune jobs. Pruning of volumes is not affected.
 
 New Catalog format in version 5.2.0
 -----------------------------------
 This release of Bacula uses a new catalog format. We provide a set of
 scripts that permit to convert a 5.0.x (version 12) catalog to 5.2.0 (version
-14).  The Bacula project rpms distributed on Source Forge will automatically
+14).  The Bacula project rpm spec files have been modified to
 detect the database change and do the upgrade for you.  We strongly
 recommend that you save a copy of your existing database before upgrading
 using rpms.
 
 The simplest way to upgrade the database assuming you are building from
-source:
+source (i.e. manually):
 1. Stop any current version of Bacula from running.
 2. Save a copy of your existing database.
 3. Configure, build, and install the 5.2.0 version of Bacula
@@ -83,7 +85,8 @@ Features Enhancements:
 - New SQL backend and ./configure that permits building multiple catalog
   backends in one build, and has the main Bacula core code totally independent
   of the SQL backend, which should simplify packaging (only the
-  libbacsql.so/dll needs to be changed.
+  libbacsql.so/dll needs to be changed to switch from one database backend
+  to another (e.g. MySQL to PostgreSQL).
 - Indent lsmark during restore
 - Disable batch insert config item
 - Director selection option in bconsole

diff --git a/bacula/src/cats/update_mysql_tables.in b/bacula/src/cats/update_mysql_tables.in
index 7a68eab2d17659c22107e096139347d289c50252..f8a7ec387301060bffa3b8e0678c5004af01465d 100644 (file)
--- a/bacula/src/cats/update_mysql_tables.in
+++ b/bacula/src/cats/update_mysql_tables.in
@@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# Shell script to update MySQL Enterprise version 2.6.x to 4.0.x
-#  or Bacula Community version 5.0.x to 5.2.x
+# Shell script to update MySQL Community version 5.0.x to 5.2.x
 #
 echo " "
 echo "This script will update a Bacula MySQL database from version 12 to 14"
-echo " which is needed to convert from Bacula Enterprise version 2.6.x to 6.0.x"
-echo " or Bacula Community version 5.0.x to 5.2.x"
+echo " which is needed to convert from Bacula Community version 5.0.x to 5.2.x"
 echo " "
 bindir=@MYSQL_BINDIR@
 PATH="$bindir:$PATH"

diff --git a/bacula/src/cats/update_postgresql_tables.in b/bacula/src/cats/update_postgresql_tables.in
index d500cee0e90c6e8447c0d68e6ce8a54c483710e3..d737bcf35a3fd27f79c3dd34a01ae9273763481a 100644 (file)
--- a/bacula/src/cats/update_postgresql_tables.in
+++ b/bacula/src/cats/update_postgresql_tables.in
@@ -5,8 +5,7 @@
 #
 echo " "
 echo "This script will update a Bacula PostgreSQL database from version 12 to 14"
-echo " which is needed to convert from Bacula Enterprise version 2.6.x to 4.0.x"
-echo " or Bacula Community version 5.0.x to 5.2.x"
+echo " which is needed to convert from Bacula Community version 5.0.x to 5.2.x"
 echo " "
 
 bindir=@POSTGRESQL_BINDIR@

diff --git a/bacula/src/cats/update_sqlite3_tables.in b/bacula/src/cats/update_sqlite3_tables.in
index d7d595b53754cae4c7e91359fc9d8e37917ac646..2d3cca53327cb5bc8e24abcad215d61db9b50b2f 100644 (file)
--- a/bacula/src/cats/update_sqlite3_tables.in
+++ b/bacula/src/cats/update_sqlite3_tables.in
@@ -1,12 +1,10 @@
 #!/bin/sh
 #
-# Shell script to update MySQL tables from Bacula Enterprise version 2.6.x to 4.0.x
-#  or Bacula Community version 5.0.x to 5.2.x
+# Shell script to update MySQL tables from Bacula Community version 5.0.x to 5.2.x
 #
 echo " "
 echo "This script will update a Bacula MySQL database from version 12 to 14"
-echo " which is needed to convert from Bacula Enterprise version 2.6.x to 4.0.x"
-echo " or Bacula Community version 5.0.x to 5.2.x"
+echo " which is needed to convert from Bacula Community version 5.0.x to 5.2.x"
 echo " "
 
 bindir=@SQLITE_BINDIR@

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 8e600af647e2e654fca9d7ea243137df295692ed..eeb04134d0f2320a8e2e0f75ae9f86e7ff9852f3 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 
 #undef  VERSION
-#define VERSION "5.2.0rc2"
-#define BDATE   "23 September 2011"
-#define LSMDATE "23Sep11"
+#define VERSION "5.2.0"
+#define BDATE   "16 October 2011"
+#define LSMDATE "16Oct11"
 
 #define PROG_COPYRIGHT "Copyright (C) %d-2011 Free Software Foundation Europe e.V.\n"
 #define BYEAR "2011"       /* year for copyright messages in progs */