From b8f29952b1734c9d715bbdfdccd79dd66b5310db Mon Sep 17 00:00:00 2001
From: Rene Peinthor <rene.peinthor@linbit.com>
Date: Fri, 20 Jul 2018 08:06:20 +0200
Subject: [PATCH] prepare release v0.2.5

---
 Dockerfile       |  2 +-
 debian/changelog | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index acc84ccf3..6a41a4d03 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:xenial as builder
 
-ENV LINSTOR_VERSION 0.2.4
+ENV LINSTOR_VERSION 0.2.5
 
 ENV LINSTOR_TGZNAME linstor-server
 ENV LINSTOR_TGZ ${LINSTOR_TGZNAME}-${LINSTOR_VERSION}.tar.gz
diff --git a/debian/changelog b/debian/changelog
index 2f227f6d3..632386be5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+linstor-server (0.2.5-1) experimental; urgency=medium
+
+  [ Joel Colledge ]
+  * Check for the protoc binary when executing the task rather than when c [...]
+  * Tidy up Java generation tasks
+  * Explicitly exclude Java generation from the debian build rules because [...]
+
+  [ Roland Kammerer ]
+  * debian: add python as builddep
+
+  [ Rene Peinthor ]
+  * resourcedfn: add hasDiskless method
+  * rscdfn: only remove the primary flag if rscdfn is not deleted anyway
+  * rscdfn: on delete first try to delete diskless resources
+  * make the error (which it isn't) a warning
+
+ -- Rene Peinthor <rene.peinthor@linbit.com>  Fri, 20 Jul 2018 08:01:28 +0200
+
 linstor-server (0.2.4-1) experimental; urgency=medium
 
   [ Joel Colledge ]