Merge branch 'master' of /home/carl/git/dvdomatic

4 files changed, 27 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 0a14ccd3d..733625063 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-07-01  Carl Hetherington  <cth@carlh.net>
+
+	* Version 0.106 released.
+
+2013-07-01  Carl Hetherington  <cth@carlh.net>
+
+	* Version 0.106beta1 released.
+
 2013-06-28  Carl Hetherington  <cth@carlh.net>
 
 	* Version 0.105 released.
diff --git a/debian/changelog b/debian/changelog
index 7ccc2bf84..7a88d3de7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+dvdomatic (0.106-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Mon, 01 Jul 2013 23:42:59 +0100
+
+dvdomatic (0.106beta1-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Mon, 01 Jul 2013 16:18:29 +0100
+
 dvdomatic (0.105-1) UNRELEASED; urgency=low
 
   * New upstream release.
diff --git a/src/wx/wscript b/src/wx/wscript
index 4bc79d6bb..345c02b08 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -25,17 +25,16 @@ sources = """
           """
 
 def configure(conf):
-    conf.check_cfg(msg='Checking for wxWidgets', package='', path=conf.options.wx_config,
-                   args='--cppflags --cxxflags --libs',
+    conf.check_cfg(msg='Checking for wxWidgets', package='', path=conf.options.wx_config, args='--cppflags --cxxflags --libs',
                    uselib_store='WXWIDGETS', mandatory=True)
- 
+
     if conf.env.STATIC:
-        # wx-config returns its static libraries as full paths, without -l prefixes, which I think confuses
-        # check_cfg(), so it ends up putting these libraries before even the .cc file when linking.
-        # This hack works around that.
+	# wx-config returns its static libraries as full paths, without -l prefixes, which confuses
+        # check_cfg(), so just hard-code it all.
         conf.env.STLIB_WXWIDGETS = ['wx_gtk2u_xrc-2.9', 'wx_gtk2u_qa-2.9', 'wx_baseu_net-2.9', 'wx_gtk2u_html-2.9',
                                     'wx_gtk2u_adv-2.9', 'wx_gtk2u_core-2.9', 'wx_baseu_xml-2.9', 'wx_baseu-2.9']
-
+        conf.env.LIB_WXWIDGETS = ['tiff', 'SM']
+ 
     conf.in_msg = 1
     wx_version = conf.check_cfg(package='', path=conf.options.wx_config, args='--version').strip()
     conf.im_msg = 0
diff --git a/wscript b/wscript
index a98d60894..dff00caef 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dvdomatic'
-VERSION = '0.106pre'
+VERSION = '0.107pre'
 
 def options(opt):
     opt.load('compiler_cxx')