Bump version

diff --git a/ChangeLog b/ChangeLog
index cd1ef97509bd415aacf03066eb3ee2efd24aa5d5..5692c86fafb39339da950eec5ddd43a1264d10ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-02  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.6.0 released.
+
 2015-12-02  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.5.15 released.

diff --git a/debian/changelog b/debian/changelog
index 3384b17231a043a045a223a7b73846f4c9303f58..29660a4ccdbbe714e28dade56d09923a594c9ed2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.5.15-1) UNRELEASED; urgency=low
+dcpomatic (2.6.0-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -356,8 +356,9 @@ dcpomatic (2.5.15-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Wed, 02 Dec 2015 21:05:48 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Wed, 02 Dec 2015 22:15:47 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/wscript b/wscript
index 64232659c39c67fb80e97e184b7b3e4ef5fc9fb6..1c1a1f047aa40647858b395e9607c3a5af4c0e21 100644 (file)
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.5.15devel'
+VERSION = '2.6.0'
 
 def options(opt):
     opt.load('compiler_cxx')