Bump version

diff --git a/ChangeLog b/ChangeLog
index 24aa9973c20597b19b3a5b2a274d608dda2450f5..4d87756d90262e58a0e20278a42a236440b3cc11 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-11-29  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.5.12 released.
+
 2015-11-29  Carl Hetherington  <cth@carlh.net>
 
        * Possibly fix large memory use with burnt-in subtitles (#766).

diff --git a/debian/changelog b/debian/changelog
index b6d680add0dc6d3d1fb9876c585dc6e8e9554d47..9bebc8c9d1601e5da41f791569f6f153813ad22c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.5.11-1) UNRELEASED; urgency=low
+dcpomatic (2.5.12-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -352,8 +352,9 @@ dcpomatic (2.5.11-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Sat, 28 Nov 2015 01:03:46 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Sun, 29 Nov 2015 15:38:52 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/wscript b/wscript
index 7fdb3e9ac812c8192b51620194cfdbd069a7a45f..869dda01c577cda39fc68b51bbcfe37609729b65 100644 (file)
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.5.11devel'
+VERSION = '2.5.12'
 
 def options(opt):
     opt.load('compiler_cxx')