From: Carl Hetherington <cth@carlh.net>
Date: Tue, 15 May 2018 19:00:28 +0000 (+0100)
Subject: Bump version
X-Git-Tag: v2.12.5
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=refs%2Ftags%2Fv2.12.5;p=dcpomatic.git

Bump version
---

diff --git a/ChangeLog b/ChangeLog
index 9afa60bdb..abb237012 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-05-15  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.12.5 released.
+
 2018-05-08  Carl Hetherington  <cth@carlh.net>
 
 	* Look at subtitle colour and effect when deciding whether or not to
diff --git a/debian/changelog b/debian/changelog
index e0977ae77..9ab4ed9c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.12.4-1) UNRELEASED; urgency=low
+dcpomatic (2.12.5-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -576,8 +576,9 @@ dcpomatic (2.12.4-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@main.carlh.net>  Sat, 14 Apr 2018 01:27:00 +0100
+ -- Carl Hetherington <carl@main.carlh.net>  Tue, 15 May 2018 20:00:27 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
diff --git a/wscript b/wscript
index 37465ad2f..285a79bc1 100644
--- a/wscript
+++ b/wscript
@@ -27,7 +27,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.12.4devel'
+VERSION = '2.12.5'
 
 def options(opt):
     opt.load('compiler_cxx')