Merge 2.0.

diff --git a/ChangeLog b/ChangeLog
index 586d33abd61292f820165df1920b100cd2f5e3cb..c9ebcfb8bd86b61260bbebc129f84eb04c973073 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
        * Use a more sensible default position and size for
        .srt subs.
 
+2014-10-03  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.0.14 released.
+
 2014-10-01  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.0.13 released.

diff --git a/debian/changelog b/debian/changelog
index 17cbec9fc6f784f90d7aff3394a3008354d7d7d4..1a0185aca2230394bc7e294962172f0cccfd759d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-dcpomatic (2.0.13-1) UNRELEASED; urgency=low
+dcpomatic (2.0.14-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Wed, 01 Oct 2014 09:54:33 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Fri, 03 Oct 2014 19:41:52 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/run/dcpomatic_cli b/run/dcpomatic_cli
index ea2a987631238e71d949d6430f52070cc5294995..e1c0ebd1485e1bf232326447f306e43c7bfb77f3 100755 (executable)
--- a/run/dcpomatic_cli
+++ b/run/dcpomatic_cli
@@ -3,11 +3,11 @@
 export LD_LIBRARY_PATH=build/src/lib:$LD_LIBRARY_PATH:build/src
 if [ "$1" == "--debug" ]; then
     shift
-    gdb --args build/src/tools/dcpomatic_cli "$@"
+    gdb --args build/src/tools/dcpomatic2_cli "$@"
 elif [ "$1" == "--valgrind" ]; then
     shift
-    valgrind --tool="memcheck" --num-callers=24 --suppressions=suppressions build/src/tools/dcpomatic_cli "$@"
-#    valgrind --tool="memcheck" --leak-check=full --show-reachable=yes --num-callers=24 --suppressions=suppressions build/src/tools/dcpomatic_cli "$@"
+    valgrind --tool="memcheck" --num-callers=24 --suppressions=suppressions build/src/tools/dcpomatic2_cli "$@"
+#    valgrind --tool="memcheck" --leak-check=full --show-reachable=yes --num-callers=24 --suppressions=suppressions build/src/tools/dcpomatic2_cli "$@"
 else
-    build/src/tools/dcpomatic_cli "$@"
+    build/src/tools/dcpomatic2_cli "$@"
 fi

diff --git a/wscript b/wscript
index 1fbdf0c32936ce895491f66d38c2f057a932979b..c81765935a6f447658c3c8a4ae9190049e9734ea 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dcpomatic'
-VERSION = '2.0.13devel'
+VERSION = '2.0.14devel'
 
 def options(opt):
     opt.load('compiler_cxx')