From 6a540d4ed02a2968f8881a10702b66901a001079 Mon Sep 17 00:00:00 2001
From: Marco Clemencic <marco.clemencic@cern.ch>
Date: Fri, 4 Jul 2014 10:13:01 +0000
Subject: [PATCH] praparing v23r5

From: Marco Clemencic <marco.clemencic@cern.ch>


git-svn-id: svn+ssh://svn.cern.ch/reps/gaudi/Gaudi/trunk@7503 53ecefc3-a64d-0410-9bdf-b8581fa3287e
---
 CMakeLists.txt                      |  2 +-
 Gaudi/CMakeLists.txt                |  2 +-
 Gaudi/cmt/requirements              |  2 +-
 Gaudi/cmt/version.cmt               |  2 +-
 Gaudi/doc/release.notes             |  1 +
 GaudiCommonSvc/CMakeLists.txt       |  2 +-
 GaudiCommonSvc/cmt/requirements     |  2 +-
 GaudiCommonSvc/doc/release.notes    |  1 +
 GaudiExamples/CMakeLists.txt        |  2 +-
 GaudiExamples/cmt/requirements      |  2 +-
 GaudiExamples/doc/release.notes     |  1 +
 GaudiKernel/CMakeLists.txt          |  2 +-
 GaudiKernel/cmt/requirements        |  2 +-
 GaudiKernel/doc/release.notes       |  1 +
 GaudiKernel/src/Util/CMakeLists.txt |  2 +-
 GaudiPolicy/CMakeLists.txt          |  2 +-
 GaudiPolicy/cmt/requirements        |  2 +-
 GaudiPolicy/doc/release.notes       |  1 +
 GaudiRelease/CMakeLists.txt         |  2 +-
 GaudiRelease/cmt/requirements       | 20 ++++----
 GaudiRelease/doc/release.notes      |  1 +
 GaudiRelease/doc/release.notes.html | 72 +++++++++++++++++++++++++++++
 GaudiSvc/CMakeLists.txt             |  2 +-
 GaudiSvc/cmt/requirements           |  2 +-
 GaudiSvc/doc/release.notes          |  1 +
 GaudiSys/CMakeLists.txt             |  2 +-
 GaudiSys/cmt/requirements           |  2 +-
 GaudiSys/doc/release.notes          |  1 +
 GaudiUtils/CMakeLists.txt           |  2 +-
 GaudiUtils/cmt/requirements         |  2 +-
 GaudiUtils/doc/release.notes        |  1 +
 RootCnv/CMakeLists.txt              |  2 +-
 RootCnv/cmt/requirements            |  2 +-
 RootCnv/doc/release.notes           |  1 +
 34 files changed, 114 insertions(+), 32 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5031bdd6d7..855cd67b91 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ find_package(GaudiProject)
 option(GAUDI_ATLAS "Enable ATLAS-specific settings" OFF)
 
 # Declare project name and version
-gaudi_project(Gaudi v25r2)
+gaudi_project(Gaudi v25r3)
 
 # These tests do not really fit in a subdirectory.
 gaudi_add_test(cmake.EnvConfigTests
diff --git a/Gaudi/CMakeLists.txt b/Gaudi/CMakeLists.txt
index 16eb262d83..46f349b233 100644
--- a/Gaudi/CMakeLists.txt
+++ b/Gaudi/CMakeLists.txt
@@ -1,4 +1,4 @@
-gaudi_subdir(Gaudi v25r2)
+gaudi_subdir(Gaudi v25r3)
 
 gaudi_depends_on_subdirs(GaudiKernel)
 
diff --git a/Gaudi/cmt/requirements b/Gaudi/cmt/requirements
index 516d00b13f..bfcf424ae9 100644
--- a/Gaudi/cmt/requirements
+++ b/Gaudi/cmt/requirements
@@ -1,6 +1,6 @@
 package Gaudi
 
-version v25r2
+version v25r3
 branches doc cmt
 
 use GaudiSys *
diff --git a/Gaudi/cmt/version.cmt b/Gaudi/cmt/version.cmt
index 12d0f0ea4a..986323ecd4 100644
--- a/Gaudi/cmt/version.cmt
+++ b/Gaudi/cmt/version.cmt
@@ -1 +1 @@
-v25r2
+v25r3
diff --git a/Gaudi/doc/release.notes b/Gaudi/doc/release.notes
index 19d1b09588..71e829c770 100644
--- a/Gaudi/doc/release.notes
+++ b/Gaudi/doc/release.notes
@@ -2,6 +2,7 @@ Package : Gaudi
 Package manager : Marco Clemencic
 Commit Id: $Format:%H$
 
+================================ Gaudi v25r3 =================================
 ================================ Gaudi v25r2 =================================
 ! 2014-03-26 - Marco Clemencic
  - Reverted work-around for ROOT-6125 (fixed upstream).
diff --git a/GaudiCommonSvc/CMakeLists.txt b/GaudiCommonSvc/CMakeLists.txt
index 8cfe5cd051..0138ed0a5f 100644
--- a/GaudiCommonSvc/CMakeLists.txt
+++ b/GaudiCommonSvc/CMakeLists.txt
@@ -1,4 +1,4 @@
-gaudi_subdir(GaudiCommonSvc v3r1)
+gaudi_subdir(GaudiCommonSvc v3r2)
 
 gaudi_depends_on_subdirs(GaudiKernel)
 
diff --git a/GaudiCommonSvc/cmt/requirements b/GaudiCommonSvc/cmt/requirements
index 2f1aa8bb02..8dbe5eb579 100644
--- a/GaudiCommonSvc/cmt/requirements
+++ b/GaudiCommonSvc/cmt/requirements
@@ -3,7 +3,7 @@
 # Maintainer : Marco Clemencic
 # ============================================================================
 package    GaudiCommonSvc
-version    v3r1
+version    v3r2
 
 # ============================================================================
 # Structure, i.e. directories to process.
diff --git a/GaudiCommonSvc/doc/release.notes b/GaudiCommonSvc/doc/release.notes
index c50e73eb2c..2765ffc23f 100644
--- a/GaudiCommonSvc/doc/release.notes
+++ b/GaudiCommonSvc/doc/release.notes
@@ -5,6 +5,7 @@
 # Commit Id: $Format:%H$
 ################################################################################
 
+============================ GaudiCommonSvc v3r2 =============================
 ! 2014-07-02 - Marco Clemencic
  - Fixed logic of OutputStream::decodeAlgorithms.
 
diff --git a/GaudiExamples/CMakeLists.txt b/GaudiExamples/CMakeLists.txt
index 823acde6a5..efe4380dae 100644
--- a/GaudiExamples/CMakeLists.txt
+++ b/GaudiExamples/CMakeLists.txt
@@ -1,4 +1,4 @@
-gaudi_subdir(GaudiExamples v25r2)
+gaudi_subdir(GaudiExamples v25r3)
 
 gaudi_depends_on_subdirs(GaudiKernel GaudiUtils GaudiGSL GaudiAlg RootCnv)
 
diff --git a/GaudiExamples/cmt/requirements b/GaudiExamples/cmt/requirements
index e6194e0d3e..209a34b8a2 100644
--- a/GaudiExamples/cmt/requirements
+++ b/GaudiExamples/cmt/requirements
@@ -1,5 +1,5 @@
 package GaudiExamples
-version v25r2
+version v25r3
 
 use ROOT         * LCG_Interfaces
 use RELAX        * LCG_Interfaces -no_auto_imports
diff --git a/GaudiExamples/doc/release.notes b/GaudiExamples/doc/release.notes
index 6372593cc1..c6ef6901b4 100644
--- a/GaudiExamples/doc/release.notes
+++ b/GaudiExamples/doc/release.notes
@@ -2,6 +2,7 @@ Package GaudiExamples
 Package manager : Marco Clemencic
 Commit Id: $Format:%H$
 
+============================ GaudiExamples v25r3 =============================
 ! 2014-07-02 - Marco Clemencic
  - Updated reference file after the changes in OutputStream.
 
diff --git a/GaudiKernel/CMakeLists.txt b/GaudiKernel/CMakeLists.txt
index 28edd79dc2..e859787441 100644
--- a/GaudiKernel/CMakeLists.txt
+++ b/GaudiKernel/CMakeLists.txt
@@ -1,4 +1,4 @@
-gaudi_subdir(GaudiKernel v30r3)
+gaudi_subdir(GaudiKernel v31r0)
 
 gaudi_depends_on_subdirs(GaudiPluginService)
 
diff --git a/GaudiKernel/cmt/requirements b/GaudiKernel/cmt/requirements
index f8b6ffaf0c..9e100ac611 100644
--- a/GaudiKernel/cmt/requirements
+++ b/GaudiKernel/cmt/requirements
@@ -1,5 +1,5 @@
 package GaudiKernel
-version v30r3
+version v31r0
 author "LHCb Gaudi Team"
 
 branches GaudiKernel cmt doc src
diff --git a/GaudiKernel/doc/release.notes b/GaudiKernel/doc/release.notes
index f5436203aa..df96423d61 100644
--- a/GaudiKernel/doc/release.notes
+++ b/GaudiKernel/doc/release.notes
@@ -2,6 +2,7 @@ Package : GaudiKernel
 Package manager : Marco Clemencic
 Commit Id: $Format:%H$
 
+============================= GaudiKernel v31r0 ==============================
 ! 2014-07-04 - Marco Clemencic
  - Fixed the test for GAUDI-975 to work without build directory.
 
diff --git a/GaudiKernel/src/Util/CMakeLists.txt b/GaudiKernel/src/Util/CMakeLists.txt
index 12b3d5ff98..4e326b5fcf 100644
--- a/GaudiKernel/src/Util/CMakeLists.txt
+++ b/GaudiKernel/src/Util/CMakeLists.txt
@@ -1,4 +1,4 @@
-gaudi_subdir(Util v30r2)
+gaudi_subdir(Util v31r0)
 
 gaudi_depends_on_subdirs(GaudiKernel GaudiPluginService)
 
diff --git a/GaudiPolicy/CMakeLists.txt b/GaudiPolicy/CMakeLists.txt
index 0b9ea1d99d..eaaf7e8509 100644
--- a/GaudiPolicy/CMakeLists.txt
+++ b/GaudiPolicy/CMakeLists.txt
@@ -1,4 +1,4 @@
-gaudi_subdir(GaudiPolicy v14r3)
+gaudi_subdir(GaudiPolicy v15r0)
 
 #---Installation-----------------------------------------------------------------------------
 gaudi_install_scripts()
diff --git a/GaudiPolicy/cmt/requirements b/GaudiPolicy/cmt/requirements
index 91da4896be..5c39990ca3 100644
--- a/GaudiPolicy/cmt/requirements
+++ b/GaudiPolicy/cmt/requirements
@@ -1,5 +1,5 @@
 package GaudiPolicy
-version v14r3
+version v15r0
 
 branches cmt doc
 
diff --git a/GaudiPolicy/doc/release.notes b/GaudiPolicy/doc/release.notes
index e9facbc261..024bf8aff3 100644
--- a/GaudiPolicy/doc/release.notes
+++ b/GaudiPolicy/doc/release.notes
@@ -2,6 +2,7 @@ package GaudiPolicy
 package manager: Marco Clemencic
 Commit Id: $Format:%H$
 
+============================= GaudiPolicy v15r0 ==============================
 ! 2014-07-04 - Marco Clemencic
  - Fixed a problem with unicode-ascii conversion failure in CTestXML2HTML.
 
diff --git a/GaudiRelease/CMakeLists.txt b/GaudiRelease/CMakeLists.txt
index a511a37b77..2d3630ba09 100644
--- a/GaudiRelease/CMakeLists.txt
+++ b/GaudiRelease/CMakeLists.txt
@@ -1,2 +1,2 @@
 # Dummy configuration for an empty subdir (used in CMT to group dependencies).
-gaudi_subdir(GaudiRelease v25r2)
+gaudi_subdir(GaudiRelease v25r3)
diff --git a/GaudiRelease/cmt/requirements b/GaudiRelease/cmt/requirements
index 9f650c3e76..0e1414affc 100644
--- a/GaudiRelease/cmt/requirements
+++ b/GaudiRelease/cmt/requirements
@@ -3,36 +3,36 @@
 
 package GaudiRelease
 
-version v25r2
+version v25r3
 branches doc cmt
 
 # CMT and Gaudi policy
-use GaudiPolicy	   v14r3
+use GaudiPolicy	   v15r0
 
 # Gaudi executable
-use Gaudi          v25r2
+use Gaudi          v25r3
 
 # Gaudi Plugin Service
 use GaudiPluginService    v1r2
 
 # Gaudi libraries - generic
-use GaudiKernel    v30r3
+use GaudiKernel    v31r0
 use GaudiCoreSvc   v3r1
-use GaudiCommonSvc v3r1
-use GaudiSvc       v21r2
+use GaudiCommonSvc v3r2
+use GaudiSvc       v21r3
 use GaudiAud       v10r1
 use GaudiAlg       v15r1
 use GaudiGSL       v8r2
-use GaudiUtils     v5r1
+use GaudiUtils     v5r2
 use GaudiPartProp  v2r1
 
 # Technology-specific Persistency packages
-use RootCnv        v1r22p1
+use RootCnv        v1r22p2
 use RootHistCnv    v12r1
 use GaudiPython    v13r2
 
 # Container package specifying the minimum set of core packages
-use GaudiSys       v25r2
+use GaudiSys       v25r3
 
 # Monitoring utilities.
 use GaudiMonitor   v5r1
@@ -44,7 +44,7 @@ use GaudiProfiling v2r1
 use GaudiMP v3r2
 
 # Examples packages
-use GaudiExamples   v25r2
+use GaudiExamples   v25r3
 
 
 # Atlas packages
diff --git a/GaudiRelease/doc/release.notes b/GaudiRelease/doc/release.notes
index 2143a8c637..fd9dfdf8ac 100644
--- a/GaudiRelease/doc/release.notes
+++ b/GaudiRelease/doc/release.notes
@@ -2,6 +2,7 @@ Package: GaudiRelease
 Maintainer: Marco Clemencic
 Commit Id: $Format:%H$
 
+============================= GaudiRelease v25r3 =============================
 ============================= GaudiRelease v25r2 =============================
 ============================ GaudiRelease v25r1p1 ============================
 ============================= GaudiRelease v25r1 =============================
diff --git a/GaudiRelease/doc/release.notes.html b/GaudiRelease/doc/release.notes.html
index cad9c4ca92..8f19b70bf3 100644
--- a/GaudiRelease/doc/release.notes.html
+++ b/GaudiRelease/doc/release.notes.html
@@ -55,6 +55,78 @@ Package Coordinator: Marco Clemencic, Charles Leggett<br>
 Purpose: Gaudi common set of packages<br><br>
 </pre>
 <!-- ====================================================================== -->
+<h2><a name="v25r3">Gaudi v25r3</a> (2014-07-03)</h2>
+<h3>Externals version: <a href="http://lcgsoft.cern.ch/index.py?page=cfg_overview&cfg=69root6">LCGCMT_69root6</a></h3>
+<h3>General Changes</h3>
+<ul>
+<li>First production release based on ROOT 6 (6.00/01)<br/>
+    (<span class="author">Marco Clemencic</span>)</li>
+<li>Updates in the CMake configuration to support ATLAS<br/>
+    (<span class="author">Marco Clemencic</span>,
+    <span class="author">David Quarrie</span>)</li>
+<li>GAUDI-425: implement a pure ascii based configurable-db<br/>
+    (<span class="author">Sebastien Binet</span>)</li>
+</ul>
+<h3>Packages Changes</h3>
+<ul>
+<li>GaudiPolicy (v15r0):
+<ul>
+<li>GAUDI-425: implement a pure ascii based configurable-db<br/>
+    (<span class="author">Sebastien Binet</span>)</li>
+<li>Removed the partial .confdb from the InstallArea and keep only the merged one.<br/>
+    (<span class="author">Marco Clemencic</span>)</li>
+<li>Minor fixes.<br/>
+    (<span class="author">Marco Clemencic</span>)</li>
+<li>Deprecation warning if the obsolete CMT pattern generate_rootmap is used.<br/>
+    (<span class="author">Charles Leggett</span>)</li>
+</ul>
+</li>
+<li>GaudiKernel (v31r0):
+<ul>
+<li>GAUDI-425: implement a pure ascii based configurable-db<br/>
+    (<span class="author">Sebastien Binet</span>)</li>
+<li>Fixed unchecked StatusCodes<br/>
+    (<span class="author">Charles Leggett</span>)</li>
+</ul>
+</li>
+<li>GaudiSvc (v21r3):
+<ul>
+<li>Fixes to FileMgr.<br/>
+    (<span class="author">Charles Leggett</span>)</li>
+</ul>
+</li>
+<li>GaudiUtils (v5r2):
+<ul>
+<li>Fixed bug GAUDI-971: successful failover to a replica in IODataManager leads
+   to non-zero exit code.<br/>
+    (<span class="author">Marco Clemencic</span>)</li>
+</ul>
+</li>
+<li>RootCnv (v1r22p2):
+<ul>
+<li>GAUDI-962: fix unprotected debug messages.<br/>
+    (<span class="author">Marco Cattaneo</span>)</li>
+<li>Fixed suppression of some VERBOSE messages.<br/>
+    (<span class="author">Marco Clemencic</span>)</li>
+</ul>
+</li>
+<li>GaudiCommonSvc (v3r2):
+<ul>
+<li>GAUDI-974: Add a new property to OutputStream, 'AlgDependentItemList' that allows for data locations to be conditionally added, only if a given
+   algorithm fired in a given event.<br/>
+    (<span class="author">Chris Jones</span>)</li>
+<li>Fixed logic of OutputStream::decodeAlgorithms.<br/>
+    (<span class="author">Marco Clemencic</span>)</li>
+</ul>
+</li>
+<li>GaudiExamples (v25r3):
+<ul>
+<li>Added tests for GAUDI-971 and GAUDI-974.<br/>
+    (<span class="author">Marco Clemencic</span>)</li>
+</ul>
+</li>
+</ul>
+<!-- ====================================================================== -->
 <h2><a name="v25r2">Gaudi v25r2</a> (2014-06-02)</h2>
 <h3>Externals version: <a href="http://lcgsoft.cern.ch/index.py?page=cfg_overview&cfg=68">LCGCMT_68</a></h3>
 <h3>General Changes</h3>
diff --git a/GaudiSvc/CMakeLists.txt b/GaudiSvc/CMakeLists.txt
index ac3d854db6..366bc06385 100644
--- a/GaudiSvc/CMakeLists.txt
+++ b/GaudiSvc/CMakeLists.txt
@@ -1,4 +1,4 @@
-gaudi_subdir(GaudiSvc v21r2)
+gaudi_subdir(GaudiSvc v21r3)
 
 gaudi_depends_on_subdirs(GaudiKernel)
 
diff --git a/GaudiSvc/cmt/requirements b/GaudiSvc/cmt/requirements
index 64c459b9df..0341a77c68 100644
--- a/GaudiSvc/cmt/requirements
+++ b/GaudiSvc/cmt/requirements
@@ -1,5 +1,5 @@
 package GaudiSvc
-version v21r2
+version v21r3
 
 branches src cmt doc
 use GaudiKernel *
diff --git a/GaudiSvc/doc/release.notes b/GaudiSvc/doc/release.notes
index 35d109b4df..88f58b6b90 100644
--- a/GaudiSvc/doc/release.notes
+++ b/GaudiSvc/doc/release.notes
@@ -2,6 +2,7 @@ Package: GaudiSvc
 Package manager : Marco Clemencic
 Commit Id: $Format:%H$
 
+=============================== GaudiSvc v21r3 ===============================
 ! 2014-06-11 - Charles Leggett
  - FileMgr: execActs(): check iterator
 M       src/FileMgr/FileMgr.cpp
diff --git a/GaudiSys/CMakeLists.txt b/GaudiSys/CMakeLists.txt
index 4110fcf2c8..4a7049abed 100644
--- a/GaudiSys/CMakeLists.txt
+++ b/GaudiSys/CMakeLists.txt
@@ -1,2 +1,2 @@
 # Dummy configuration for an empty subdir (used in CMT to group dependencies).
-gaudi_subdir(GaudiSys v25r2)
+gaudi_subdir(GaudiSys v25r3)
diff --git a/GaudiSys/cmt/requirements b/GaudiSys/cmt/requirements
index ad4bcdd592..acae2f34b8 100644
--- a/GaudiSys/cmt/requirements
+++ b/GaudiSys/cmt/requirements
@@ -1,5 +1,5 @@
 package GaudiSys
-version v25r2
+version v25r3
 
 branches doc cmt
 
diff --git a/GaudiSys/doc/release.notes b/GaudiSys/doc/release.notes
index 845c5fdc3f..a737bcb728 100644
--- a/GaudiSys/doc/release.notes
+++ b/GaudiSys/doc/release.notes
@@ -2,6 +2,7 @@ package GaudiSys
 package manager: Pere Mato
 Commit Id: $Format:%H$
 
+=============================== GaudiSys v25r3 ===============================
 =============================== GaudiSys v25r2 ===============================
 ============================== GaudiSys v25r1p1 ==============================
 =============================== GaudiSys v25r1 ===============================
diff --git a/GaudiUtils/CMakeLists.txt b/GaudiUtils/CMakeLists.txt
index 31db58c8b8..76acd7dc35 100644
--- a/GaudiUtils/CMakeLists.txt
+++ b/GaudiUtils/CMakeLists.txt
@@ -1,4 +1,4 @@
-gaudi_subdir(GaudiUtils v5r1)
+gaudi_subdir(GaudiUtils v5r2)
 
 gaudi_depends_on_subdirs(GaudiKernel)
 
diff --git a/GaudiUtils/cmt/requirements b/GaudiUtils/cmt/requirements
index 7110576eb3..416934d2e5 100644
--- a/GaudiUtils/cmt/requirements
+++ b/GaudiUtils/cmt/requirements
@@ -1,6 +1,6 @@
 # =============================================================================
 package GaudiUtils
-version v5r1
+version v5r2
 
 # ============== structure ====================================================
 branches        GaudiUtils src cmt doc
diff --git a/GaudiUtils/doc/release.notes b/GaudiUtils/doc/release.notes
index e13f1f7975..795cebcdc7 100644
--- a/GaudiUtils/doc/release.notes
+++ b/GaudiUtils/doc/release.notes
@@ -2,6 +2,7 @@ Package: GaudiUtils
 Package manager : Marco Clemencic
 Commit Id: $Format:%H$
 
+============================== GaudiUtils v5r2 ===============================
 ! 2014-06-19 - Marco Clemencic
  - Fixed unchecked StatusCode.
 
diff --git a/RootCnv/CMakeLists.txt b/RootCnv/CMakeLists.txt
index af699a2ef6..7fc640a798 100644
--- a/RootCnv/CMakeLists.txt
+++ b/RootCnv/CMakeLists.txt
@@ -1,4 +1,4 @@
-gaudi_subdir(RootCnv v1r22p1)
+gaudi_subdir(RootCnv v1r22p2)
 
 gaudi_depends_on_subdirs(GaudiKernel GaudiUtils)
 
diff --git a/RootCnv/cmt/requirements b/RootCnv/cmt/requirements
index 101d3641b4..3e114df226 100644
--- a/RootCnv/cmt/requirements
+++ b/RootCnv/cmt/requirements
@@ -1,5 +1,5 @@
 package RootCnv
-version           v1r22p1
+version           v1r22p2
 
 author Markus Frank
 
diff --git a/RootCnv/doc/release.notes b/RootCnv/doc/release.notes
index 7c93fdfd71..191a0925a4 100644
--- a/RootCnv/doc/release.notes
+++ b/RootCnv/doc/release.notes
@@ -5,6 +5,7 @@
 ! Commit Id   : $Format:%H$
 !-----------------------------------------------------------------------------
 
+============================== RootCnv v1r22p2 ===============================
 ! 2014-06-19 - Marco Clemencic
  - Minor fix for unpredictable VERBOSE messages (message suppression not
    correctly implemented).
-- 
GitLab