Merge branch 'master' into staging

diff --git a/ChangeLog b/ChangeLog
index 1d8f3fb42d021ec32c8b5d6c359385fa930a2338..7bb54b4c1d5f6d585cd1a64a0335a9b639dbba94 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-04  Carl Hetherington  <cth@carlh.net>
+
+       * Version 0.107beta1 released.
+
 2013-07-04  Carl Hetherington  <cth@carlh.net>
 
        * Try to initialise the number of threads to the number

diff --git a/debian/changelog b/debian/changelog
index 7a88d3de7b98d6cc9851372f0cd5b0b2f9961c60..a04d8adf180a3fb9dea9dae0658ecd38cd47a59a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dvdomatic (0.107beta1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Thu, 04 Jul 2013 00:28:04 +0100
+
 dvdomatic (0.106-1) UNRELEASED; urgency=low
 
   * New upstream release.

diff --git a/wscript b/wscript
index 0008d198f849472b2c70058c622ee5a616741bc1..45e474de1d1704982b7b24c0493fae73498e5270 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dvdomatic'
-VERSION = '0.107pre'
+VERSION = '0.107beta1'
 
 def options(opt):
     opt.load('compiler_cxx')