From df32c0a0758c598a825e767970537686f0e15bcf Mon Sep 17 00:00:00 2001
From: Klaus Rabbertz <klaus.rabbertz@cern.ch>
Date: Wed, 12 Jul 2023 14:32:22 +0200
Subject: [PATCH] Nlojet++ interface version 2.5.1; update NEWS and CL

---
 v2.5/generators/nlojet++/ChangeLog    | 85 +++++++++++++++++++++++++++
 v2.5/generators/nlojet++/NEWS         |  9 +++
 v2.5/generators/nlojet++/configure.ac |  2 +-
 3 files changed, 95 insertions(+), 1 deletion(-)

diff --git a/v2.5/generators/nlojet++/ChangeLog b/v2.5/generators/nlojet++/ChangeLog
index 29c8e08b..36be2e03 100644
--- a/v2.5/generators/nlojet++/ChangeLog
+++ b/v2.5/generators/nlojet++/ChangeLog
@@ -1,3 +1,88 @@
+2023-07-12  Release of fastNLO interface to NLOJet++ package version 2.5.1, tag 2888
+            ========================================================================
+
+2023-07-12  Klaus Rabbertz <klaus.rabbertz@cern.ch>
+
+        * v2.5/generators/nlojet++/configure.ac,
+        v2.5/generators/nlojet++/interface/check/Makefile.am: For makefile
+        portability remove commands from Makefile.am and use AC_SUBST
+        variables from configure.ac instead
+
+2023-07-12  JohannesGaessler <johannesg@5d6.de>
+
+        * v2.5/generators/nlojet++/interface/check/Makefile.am,
+        v2.5/generators/nlojet++/interface/check/fnlo-compare-tables.py,
+        v2.5/generators/nlojet++/interface/check/fnlo-nj-lotest.pl.in,
+        v2.5/generators/nlojet++/interface/check/fnlo-nj-nlotest.pl.in,
+        v2.5/generators/nlojet++/interface/{check/input =>
+        data/check}/InclusiveNJets_InclusiveJets_fix.wrm,
+        v2.5/generators/nlojet++/interface/{check/input =>
+        data/check}/InclusiveNJets_InclusiveJets_flex.wrm,
+        v2.5/generators/nlojet++/interface/data/check/Makefile.am,
+        v2.5/generators/nlojet++/interface/{ =>
+        data}/check/compare-table-helper.py,
+        v2.5/generators/nlojet++/interface/{check/input =>
+        data/check}/fix_NodeDensity.str,
+        v2.5/generators/nlojet++/interface/{check/input =>
+        data/check}/fix_NodesPerBin.str,
+        v2.5/generators/nlojet++/interface/{check/input =>
+        data/check}/flex_NodeDensity.str,
+        v2.5/generators/nlojet++/interface/{check/input =>
+        data/check}/flex_NodesPerBin.str: Fixed NLOJet++ distcheck paths
+
+2023-07-11  Klaus Rabbertz <klaus.rabbertz@cern.ch>
+
+        * v2.5/generators/nlojet++/README
+        inconsistency; drop all LHAPDF5 stuff; by default no doxygen use
+
+2023-07-11  JohannesGaessler <johannesg@5d6.de>
+
+        * v2.5/generators/nlojet++/interface/check/compare-table-helper.py,
+        v2.5/generators/nlojet++/interface/check/fnlo-compare-tables.py,
+        v2.5/generators/nlojet++/interface/check/fnlo-nj-lotest.pl.in,
+        v2.5/generators/nlojet++/interface/check/fnlo-nj-nlotest.pl.in: Skip
+        nlojet++ checks if no Python extension
+
+2023-07-11  JohannesGaessler <johannesg@5d6.de>
+
+        * v2.5/generators/nlojet++/interface/check/Makefile.am,
+        v2.5/generators/nlojet++/interface/check/fnlo-compare-tables.py,
+        v2.5/generators/nlojet++/interface/check/{ =>
+        input}/InclusiveNJets_InclusiveJets_fix.wrm,
+        v2.5/generators/nlojet++/interface/check/{ =>
+        input}/InclusiveNJets_InclusiveJets_flex.wrm,
+        v2.5/generators/nlojet++/interface/check/{ =>
+        input}/fix_NodeDensity.str,
+        v2.5/generators/nlojet++/interface/check/{ =>
+        input}/fix_NodesPerBin.str,
+        v2.5/generators/nlojet++/interface/check/{ =>
+        input}/flex_NodeDensity.str,
+        v2.5/generators/nlojet++/interface/check/{ =>
+        input}/flex_NodesPerBin.str: Fixed nlojet++ make check PYTHONPATH,
+        make clean
+
+2023-07-10  Klaus Rabbertz <klaus.rabbertz@cern.ch>
+
+        * : Merge bin_density into master
+
+2023-07-02  JohannesGaessler <johannesg@5d6.de>
+
+        * test/.gitignore, test/InclusiveNJets_InclusiveJets_fix.wrm,
+        test/InclusiveNJets_InclusiveJets_flex.wrm, test/compare_tables.py,
+        test/fix_NodeDensity.str, test/fix_NodesPerBin.str,
+        test/flex_NodeDensity.str, test/flex_NodesPerBin.str: Added
+        NodesPerBin <-> BinDensity test files
+
+2023-02-12  Klaus Rabbertz <klaus.rabbertz@cern.ch>
+
+        * v2.5/generators/nlojet++/ChangeLog, v2.5/generators/nlojet++/NEWS: 
+        Updated ChangeLog and NEWS
+
+2023-02-12  Klaus Rabbertz <klaus.rabbertz@cern.ch>
+
+        * v2.5/generators/nlojet++/mygitcl: Add command for updating
+        ChangeLog
+
 2023-02-12  Klaus Rabbertz <klaus.rabbertz@cern.ch>
 
         * v2.5/generators/nlojet++/mygitcl: Add command for updating
diff --git a/v2.5/generators/nlojet++/NEWS b/v2.5/generators/nlojet++/NEWS
index 9be561b8..9d3391e2 100644
--- a/v2.5/generators/nlojet++/NEWS
+++ b/v2.5/generators/nlojet++/NEWS
@@ -1,3 +1,12 @@
+Release Notes for fastnlo_interface_nlojet version 2.5.1 revision 2888
+=======================================================================
+Major improvement (Johannes Gäßler):
+- optional on-the-fly x-binning extension with given bin density
+Other:
+- LHAPDF5 support removed
+- By default NO Doxygen documentation anymore; must be switched on explicitly
+
+
 Release Notes for fastnlo_interface_nlojet version 2.5.0 revision 2858:
 =======================================================================
 - Implementation of HT_parton as scale
diff --git a/v2.5/generators/nlojet++/configure.ac b/v2.5/generators/nlojet++/configure.ac
index a0b56d5f..67582390 100644
--- a/v2.5/generators/nlojet++/configure.ac
+++ b/v2.5/generators/nlojet++/configure.ac
@@ -11,7 +11,7 @@
 # Require minimal autoconf version, 2.71 is from 2021
 AC_PREREQ([2.71])
 # Define subproject fastNLO_interface_nlojet
-AC_INIT([fastNLO_interface_nlojet],[2.5.0],[Daniel.Britzger@desy.de, Klaus.Rabbertz@kit.edu, Georg Sieber, Fred Stober, wobisch@latech.edu])
+AC_INIT([fastNLO_interface_nlojet],[2.5.1],[Daniel.Britzger@desy.de, Klaus.Rabbertz@kit.edu, Georg Sieber, Fred Stober, wobisch@latech.edu])
 #Suppress verbose output when compiling (use make V=99 for verbose output)
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 # Properly include subprojects
-- 
GitLab