Merge pull request #194 from tschoonj/release-4.1.2

Release 4.1.2
tschoonj · Feb 13, 2022 · 0cbb1b4 · 0cbb1b4
2 parents 72993f3 + fa952be
commit 0cbb1b4
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 11 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 4.1.1
+current_version = 4.1.2
 commit = False
 tag = False
 

diff --git a/Changelog b/Changelog
@@ -1,3 +1,10 @@
+Version 4.1.2 Tom Schoonjans
+
+- Fix edge case in CS_Photo_Partial, where Kissel edge energies don't actually
+correspond to the first energy in the list of energies (reported by Ulla
+Vainio, and fixed by Oleg Shirokobrod)
+- Fix memory leak in SWIG generated Python bindings (reported by David Vine)
+
 Version 4.1.1 Tom Schoonjans
 
 - Do not use distutils in autoconf macros, as it will not be available in

diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@
 
 
 
-AC_INIT([xraylib],[4.1.1],[Tom.Schoonjans@me.com])
+AC_INIT([xraylib],[4.1.2],[Tom.Schoonjans@me.com])
 AC_PREREQ([2.60])
 AC_CONFIG_SRCDIR([include/xraylib.h])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -21,7 +21,7 @@ AC_CANONICAL_HOST
 
 
 LIB_CURRENT=12
-LIB_REVISION=0
+LIB_REVISION=1
 LIB_AGE=1
 AC_SUBST(LIB_CURRENT)
 AC_SUBST(LIB_REVISION)

diff --git a/idl/libxrlidl.dlm b/idl/libxrlidl.dlm
@@ -16,7 +16,7 @@ MODULE XRAYLIB
 
 DESCRIPTION IDL XRAYLIB BINDINGS
 
-VERSION 4.1.1
+VERSION 4.1.2
 
 SOURCE A.Brunetti, M. S. del Rio, T. Schoonjans, T. Ikonen, B. Golosio, A. Simionovici, A. Somogyi
 

diff --git a/include/xraylib.h b/include/xraylib.h
@@ -24,7 +24,7 @@ extern "C" {
 
 #define XRAYLIB_MAJOR 4
 #define XRAYLIB_MINOR 1
-#define XRAYLIB_MICRO 1
+#define XRAYLIB_MICRO 2
 
 
 #ifndef PI

diff --git a/java/GoogleAnalyticsThread.java b/java/GoogleAnalyticsThread.java
@@ -14,7 +14,7 @@ public class GoogleAnalyticsThread extends Thread {
     private static final String GOOGLE_ANALYTICS_ENDPOINT = "https://www.google-analytics.com/collect";
     private static final String GOOGLE_ANALYTICS_TRACKING_ID = "UA-42595764-5";
     private static final String GOOGLE_ANALYTICS_APPLICATION_NAME = "xraylib";
-    private static final String GOOGLE_ANALYTICS_APPLICATION_VERSION = "4.1.1";
+    private static final String GOOGLE_ANALYTICS_APPLICATION_VERSION = "4.1.2";
     private static final String GOOGLE_ANALYTICS_HIT_TYPE = "event";
 
     public void run() {

diff --git a/java/build.gradle.in b/java/build.gradle.in
@@ -12,7 +12,7 @@ plugins {
     id "biz.aQute.bnd.builder" version "5.3.0"
 }
 
-version = '4.1.1'
+version = '4.1.2'
 group = 'com.github.tschoonj'
 sourceCompatibility = '1.8'
 targetCompatibility = '1.8'

diff --git a/meson.build b/meson.build
@@ -1,7 +1,7 @@
 project('xraylib',
     'c',
     meson_version: '>= 0.56.0',
-    version: '4.1.1',
+    version: '4.1.2',
     license: 'BSD',
     default_options: ['cpp_std=c++11',]
 )
@@ -14,7 +14,7 @@ project('xraylib',
 # #    been preserved, change to C+1:0:A+1
 # # c) If the interface is the same as the previous version, change to C:R+1:A
 lib_current = 12
-lib_revision = 0
+lib_revision = 1
 lib_age = 1
 
 version = '@0@.@1@.@2@'.format((lib_current - lib_age), lib_age, lib_revision)
@@ -188,4 +188,4 @@ ENDPROGRAM f2003_main
     	endif
 
     endif
-endif
+endif
diff --git a/xraylib.spec b/xraylib.spec
@@ -18,7 +18,7 @@
 %define perl_vendor_autolib	%{perl_vendor_archlib}/auto
 
 Name: xraylib
-Version: 4.1.1
+Version: 4.1.2
 Release:	1%{?dist}
 Summary: A library for X-ray matter interactions cross sections for X-ray fluorescence applications: core C library
 Group:	 Applications/Engineering and Scientific