From 2f9f968111485c64cb84a6b9162c2ac252f83d2c Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 25 Jan 2012 18:47:24 +0100
Subject: [PATCH] Tweak update ReleaseNotes and ChangeLog

---
 bacula/ChangeLog    | 22 +++++++++++++++++++++-
 bacula/ReleaseNotes | 43 +++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/bacula/ChangeLog b/bacula/ChangeLog
index 0644b486ac..87036ce32e 100644
--- a/bacula/ChangeLog
+++ b/bacula/ChangeLog
@@ -1,4 +1,24 @@
-              Changelog on version 5.2.4
+              Changelog on version 5.2.5
+
+Version 5.2.5
+
+25Jan12
+ - Disable usage of JS_Warning waiting for a more complete implementation
+
+24Jan12
+ - Removed old sd plugins which doesn't work anymore.
+
+23Jan12
+ - Adapt sample-query.sql for Warning job status
+
+20Jan12
+ - Fix location of Qt dlls for Win64 build
+
+18Jan12
+ - Fix MediaView::getSelection
+
+Bugs fixed/closed since last release:
+1824 (1814 1806 1818 non-bugs)
 
 Version 5.2.4
 
diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes
index d1a3516b3d..492568f810 100644
--- a/bacula/ReleaseNotes
+++ b/bacula/ReleaseNotes
@@ -1,11 +1,50 @@
 
-               Release Notes for Bacula 5.2.4
+               Release Notes for Bacula 5.2.5
 
   Bacula code: Total files = 1,110 Total lines = 231,439 (Using SLOCCount)
 
 General:
 --------
-The 5.2.4 version is an bug fix release.
+The 5.2.5 version is a bug fix release.
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+If you are upgrading directly from 5.0.3 to this version, please see the
+important notices below for version 5.2.3, particularly
+the database upgrade and the difference in packaging the
+SQL shared libraries.
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+If you store .bsr or .mail files in the Bacula working
+directory, please be aware that they will all be deleted
+each time the Director starts.
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+Compatibility:
+--------------
+ As always, both the Director and Storage daemon must be upgraded at
+ the same time.
+
+ Older 5.0.x and 3.0.x File Daemons are compatible with the 5.2.3
+ Director and Storage daemons. There should be no need to upgrade older File
+ Daemons.
+
+Changes since 5.2.4:
+
+25Jan12
+ - Disable usage of JS_Warning waiting for a more complete implementation
+ - Removed old sd plugins which doesn't work anymore.
+ - Adapt sample-query.sql for Warning job status
+ - Fix location of Qt dlls for Win64 build
+ - Fix MediaView::getSelection
+
+Bugs fixed/closed since last release:
+1824 (1814 1806 1818 non-bugs)
+
+=============================================================
+General:
+--------
+The 5.2.4 version is a bug fix release.
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 If you are upgrading directly from 5.0.3 to this version, please see the
-- 
2.39.5