Merge branch 'video-player' of /home/carl/git/dvdomatic into video-player

diff --git a/ChangeLog b/ChangeLog
index 0b93c2ac38f0e2521c7d9bfd2f66272c28612190..313ac957f9a22f46cc89f5bf7ec9f990b3df821c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-12-19  Carl Hetherington  <cth@carlh.net>
+
+       * Version 0.68beta2 released.
+
+2012-12-19  Carl Hetherington  <cth@carlh.net>
+
+       * Version 0.68beta1 released.
+
 2012-12-18  Carl Hetherington  <cth@carlh.net>
 
        * Alter film viewer so that it is much quicker, responds instantly

diff --git a/debian/changelog b/debian/changelog
index 83439be721bb2c7aea1a7bca6ec57967d1e61f1c..d03978d7dd59c0e4247c8651034f652bb13224a3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+dvdomatic (0.68beta2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Wed, 19 Dec 2012 11:22:58 +0000
+
+dvdomatic (0.68beta1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Wed, 19 Dec 2012 10:11:13 +0000
+
 dvdomatic (0.67-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/src/wx/wscript b/src/wx/wscript
index b4a6092a66b423d27cdb0f27245b3594e331fb58..4dbb04eeacaa4cc0da3155f09e6243e5934b7dbb 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -1,8 +1,5 @@
 def configure(conf):
-    if bld.env.TARGET_WINDOWS:
-        conf.check_cfg(package = '', atleast_version = '2.9.4', path = 'wx-config', args = '--cppflags --cxxflags --libs', uselib_store = 'WXWIDGETS', mandatory = True)
-    else:
-        conf.check_cfg(package = '', atleast_version = '2.8.12', path = 'wx-config', args = '--cppflags --cxxflags --libs', uselib_store = 'WXWIDGETS', mandatory = True)
+    conf.check_cfg(package = '', path = 'wx-config', args = '--cppflags --cxxflags --libs', uselib_store = 'WXWIDGETS', mandatory = True)
 
 def build(bld):
     if bld.env.STATIC:

diff --git a/wscript b/wscript
index 02d95715b719e8d8c174caf92adac21b3929a601..6ba196cce3c9a0c374b8e358006975709c3a9b28 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dvdomatic'
-VERSION = '0.68pre'
+VERSION = '0.68beta2'
 
 def options(opt):
     opt.load('compiler_cxx')