Merge branch 'development'

UtrechtUniversity · Apr 3, 2019 · 7253e40 · 7253e40
2 parents 6dcdbf5 + b6021d5
commit 7253e40
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.12)
 
 project(davrods C)
 
-set(IRODSRT_VERSION "4.2.4" CACHE STRING "iRODS client library version")
+set(IRODSRT_VERSION "4.2.5" CACHE STRING "iRODS client library version")
 
 set(DAVRODS_FEATURE     "1.4.2")
 set(DAVRODS_VERSION     "${IRODSRT_VERSION}_${DAVRODS_FEATURE}")

diff --git a/README.md b/README.md
@@ -35,6 +35,7 @@ Please choose the right version for your platform:
 
 | Davrods ver. | iRODS runtime ver. | Packages                                                                          |
 | ------------ | ------------------ | --------------------------------------------------------------------------------- |
+| 1.4.2        | 4.2.5              | [RPM, DEB](https://github.com/UtrechtUniversity/davrods/releases/tag/4.2.5_1.4.2) |
 | 1.4.2        | 4.2.4              | [RPM, DEB](https://github.com/UtrechtUniversity/davrods/releases/tag/4.2.4_1.4.2) |
 | 1.4.1        | 4.2.3              | [RPM, DEB](https://github.com/UtrechtUniversity/davrods/releases/tag/4.2.3_1.4.1) |
 | 1.4.1        | 4.1.x              | [RPM](https://github.com/UtrechtUniversity/davrods/releases/tag/4.1_1.4.1)        |
@@ -81,9 +82,9 @@ package using the RPM or DEB file from the
 Download the Davrods package for your platform and install it using your
 package manager, for example:
 
-    yum install davrods-4.2.4_1.4.2-1.rpm
+    yum install davrods-4.2.5_1.4.2-1.rpm
     --or--
-    apt install davrods-4.2.4_1.4.2.deb
+    apt install davrods-4.2.5_1.4.2.deb
 
 Now see the __Configuration__ section for instructions on how to
 configure Davrods once it has been installed.

diff --git a/aux/deb/davrods.conf b/aux/deb/davrods.conf
@@ -1 +1,2 @@
+# Depends: dav
 LoadModule davrods_module /usr/lib/apache2/modules/mod_davrods.so
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,6 @@
+* Wed Apr 03 2019 Chris Smeele <[email protected]> - 4.2.5_1.4.2-1
+- Now supports iRODS 4.2.5 client libraries
+
 * Mon Dec 17 2018 Chris Smeele <[email protected]> - 4.2.4_1.4.2-1
 - Fixed DavrodsExposedRoot config being ignored in some builds
 - Added a Content-Disposition configuration setting (off by default)
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		# Depends: dav
		LoadModule davrods_module /usr/lib/apache2/modules/mod_davrods.so