From b544cbb8dc45aa2bb878a99da16132264bebbae7 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 1 Jul 2013 13:35:00 +0000 Subject: Explicitly link with GTK when doing Linux static builds. --- wscript | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index e8f6240d3..a98d60894 100644 --- a/wscript +++ b/wscript @@ -112,8 +112,11 @@ def configure(conf): if conf.env.TARGET_LINUX: conf.check_cfg(package='liblzma', args='--cflags --libs', uselib_store='LZMA', mandatory=True) - # On Linux we need to be able to include to check GTK's version - conf.check_cfg(package='gtk+-2.0', args='--cflags', uselib_store='GTK', mandatory=True) + if conf.env.STATIC: + conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True) + else: + # On Linux we need to be able to include to check GTK's version + conf.check_cfg(package='gtk+-2.0', args='--cflags', uselib_store='GTK', mandatory=True) conf.check_cfg(package = '', path = conf.options.magickpp_config, args = '--cppflags --cxxflags --libs', uselib_store = 'MAGICK', mandatory = True) -- cgit v1.2.3 From 533443c335cbd8c3dc24591976e63003308aaf9a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 1 Jul 2013 16:18:29 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 0a14ccd3d..83bd20986 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-07-01 Carl Hetherington + + * Version 0.106beta1 released. + 2013-06-28 Carl Hetherington * Version 0.105 released. diff --git a/debian/changelog b/debian/changelog index 7ccc2bf84..4ea303219 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.106beta1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Mon, 01 Jul 2013 16:18:29 +0100 + dvdomatic (0.105-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index a98d60894..93db7d3ee 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.106pre' +VERSION = '0.106beta1' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3