Merge pull request #180 from tschoonj/bump-to-4.1.1

Bump to 4.1.1
tschoonj · Jul 25, 2021 · 4d6c962 · 4d6c962
2 parents 4afa714 + f165726
commit 4d6c962
Show file tree

Hide file tree

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

diff --git a/Changelog b/Changelog
@@ -1,3 +1,10 @@
+Version 4.1.1 Tom Schoonjans
+
+- Do not use distutils in autoconf macros, as it will not be available in
+python 3.10
+- Drop the `cython` option for the meson buildscript, as it became a reserved
+option in meson 0.59.0
+
 Version 4.1.0 Tom Schoonjans
 
 - Add meson as alternative buildsystem

diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@
 
 
 
-AC_INIT([xraylib],[4.1.0],[[email protected]])
+AC_INIT([xraylib],[4.1.1],[[email protected]])
 AC_PREREQ([2.60])
 AC_CONFIG_SRCDIR([include/xraylib.h])
 AC_CONFIG_AUX_DIR([build-aux])

diff --git a/idl/libxrlidl.dlm b/idl/libxrlidl.dlm
@@ -16,7 +16,7 @@ MODULE XRAYLIB
 
 DESCRIPTION IDL XRAYLIB BINDINGS
 
-VERSION 4.1.0
+VERSION 4.1.1
 
 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 0
+#define XRAYLIB_MICRO 1
 
 
 #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.0";
+    private static final String GOOGLE_ANALYTICS_APPLICATION_VERSION = "4.1.1";
     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.0'
+version = '4.1.1'
 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.0',
+    version: '4.1.1',
     license: 'BSD',
     default_options: ['cpp_std=c++11',]
 )

diff --git a/pascal/xraylib.pas b/pascal/xraylib.pas
@@ -47,8 +47,8 @@ interface
 // From xraylib.h
 const
   XRAYLIB_MAJOR = 4;
-  XRAYLIB_MINOR = 0;
-  XRAYLIB_MICRO = 0;
+  XRAYLIB_MINOR = 1;
+  XRAYLIB_MICRO = 1;
 
 procedure XRayInit;cdecl;external External_library name 'XRayInit';
 

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.0
+Version: 4.1.1
 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