From bf9ce15934942eb73a047ff0c4d279fad5900461 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=2E=20Armando=20Sol=C3=A9?= <sole@esrf.fr>
Date: Tue, 2 Aug 2022 10:51:14 +0200
Subject: [PATCH 1/3] Update copyright date.

---
 LICENSE     | 6 +++---
 LICENSE.GPL | 2 +-
 LICENSE.MIT | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/LICENSE b/LICENSE
index 3a4d25095..cf7cc5386 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,14 +1,14 @@
- The PyMca X-Ray Fluorescence Toolkit is Copyright (C) 2004-2019 of the European Synchrotron Radiation Facility (ESRF).
+ The PyMca X-Ray Fluorescence Toolkit is Copyright (C) 2004-2022 of the European Synchrotron Radiation Facility (ESRF).
 
 Unless otherways stated in the relevant accompanying source code, the default license of these modules is MIT.
 
-If you develop and distribute software using modules accessing Qt by means of Riverbank Computing PyQt4 or PyQt5, you will be conditioned by the license of your PyQt4/5 software (GPL or commercial). If you wish to be free of any distribution condition, you should be able to use PySide because it uses the LGPL license.
+If you develop and distribute software using modules accessing Qt by means of Riverbank Computing PyQt4, PyQt5 or PyQt6, you will be conditioned by the license of your PyQt4/5/6 software (GPL or commercial). If you wish to be free of any distribution condition, you should be able to use PySide2 or PySide6 because it uses the LGPL license.
 
 If, despite its permisivity, the license accompanying any of the PyMca modules is not convenient for you, please contact industry@esrf.fr
 
 The MIT license follows:
 
-Copyright (c) 2004-2019 European Synchrotron Radiation Facility (ESRF)
+Copyright (c) 2004-2022 European Synchrotron Radiation Facility (ESRF)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
diff --git a/LICENSE.GPL b/LICENSE.GPL
index ab8a97150..2d5f84570 100644
--- a/LICENSE.GPL
+++ b/LICENSE.GPL
@@ -1,5 +1,5 @@
 
- The PyMca X-Ray Fluorescence Toolkit is Copyright (C) 2004-2014 of the
+ The PyMca X-Ray Fluorescence Toolkit is Copyright (C) 2004-2022 of the
  European Synchrotron Radiation Facility (ESRF).
 
  You may use, distribute and copy the PyMca XRF Toolkit under the terms of
diff --git a/LICENSE.MIT b/LICENSE.MIT
index 8f3b0fb6c..69bcc7288 100644
--- a/LICENSE.MIT
+++ b/LICENSE.MIT
@@ -1,10 +1,10 @@
 
- The PyMca X-Ray Fluorescence Toolkit is Copyright (C) 2004-2014 of the
+ The PyMca X-Ray Fluorescence Toolkit is Copyright (C) 2004-2022 of the
  European Synchrotron Radiation Facility (ESRF).
 
 The MIT License (MIT)
 
-Copyright (c) 2004-2014 European Synchrotron Radiation Facility (ESRF)
+Copyright (c) 2004-2022 European Synchrotron Radiation Facility (ESRF)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

From 6705fe85485f81babe6b12c1c4dd5de5edd46f51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=2E=20Armando=20Sol=C3=A9?= <sole@esrf.fr>
Date: Tue, 2 Aug 2022 10:51:41 +0200
Subject: [PATCH 2/3] Update version.

---
 PyMca5/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PyMca5/__init__.py b/PyMca5/__init__.py
index 675c5905a..b63de4e3a 100644
--- a/PyMca5/__init__.py
+++ b/PyMca5/__init__.py
@@ -27,7 +27,7 @@
 __contact__ = "sole@esrf.fr"
 __license__ = "MIT"
 __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
-__version__ = "5.7.3"
+__version__ = "5.7.4"
 
 import os
 import sys
@@ -48,7 +48,7 @@
     from ctypes.wintypes import MAX_PATH
 
 if os.path.exists(os.path.join(\
-    os.path.dirname(os.path.dirname(__file__)), 'py2app_setup.py')):
+    os.path.dirname(os.path.dirname(__file__)), 'bootstrap.py')):
     raise ImportError('PyMca cannot be imported from source directory')
 
 def version():

From 1b1cf7f0e761c96f09b6b368fcd1e9398fc2c30f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=2E=20Armando=20Sol=C3=A9?= <sole@esrf.fr>
Date: Tue, 2 Aug 2022 10:59:17 +0200
Subject: [PATCH 3/3] Update changelog.txt

---
 changelog.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index 0d1263db7..cdc1c83f2 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,14 @@
+VERSION 5.7.4
+-------------
+
+- HDF5. Improved support of external links PR #891.
+
+- HDF5. Single MCA selections accompanied by associated motor positions (if any).
+
+- XRF. Make more explicit the Fast XRF fit is a linear fit.
+
+- ROI Imaging. Clearer tool tips.
+
 VERSION 5.7.3
 -------------