From da77c335d14904a556b2d5a310e14dbfb81dfc97 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 5 Feb 2014 13:58:01 +0000 Subject: Bump version --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6290cc9e7..8d31d2268 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.64.0-1) UNRELEASED; urgency=low +dcpomatic (1.64.1-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -81,8 +81,9 @@ dcpomatic (1.64.0-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Sun, 02 Feb 2014 23:46:54 +0000 + -- Carl Hetherington Wed, 05 Feb 2014 13:58:01 +0000 dcpomatic (0.87-1) UNRELEASED; urgency=low -- cgit v1.2.3 From 86b39b2bb82abd11727c822bb36ca0dd2f3943d9 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 5 Feb 2014 23:27:37 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/ChangeLog b/ChangeLog index 11f07470f..399b720ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-02-05 Carl Hetherington + + * Version 1.64.2 released. + 2014-02-05 Carl Hetherington * A variety of fixes to small problems found by Coverity. diff --git a/debian/changelog b/debian/changelog index 8d31d2268..e0e6152be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.64.1-1) UNRELEASED; urgency=low +dcpomatic (1.64.2-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -82,8 +82,9 @@ dcpomatic (1.64.1-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Wed, 05 Feb 2014 13:58:01 +0000 + -- Carl Hetherington Wed, 05 Feb 2014 23:27:37 +0000 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index dcd4e4d7b..80b742f65 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.64.1devel' +VERSION = '1.64.2' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 58a10e184029bcb7bae0df69afe69f24340c63e2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 8 Feb 2014 13:33:08 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/ChangeLog b/ChangeLog index 5a842a4f3..7f4045c4f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-02-08 Carl Hetherington + + * Version 1.64.3 released. + 2014-02-08 Carl Hetherington * Bump libdcp version to get some fixes for Interop XML. diff --git a/debian/changelog b/debian/changelog index e0e6152be..a9bf676ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.64.2-1) UNRELEASED; urgency=low +dcpomatic (1.64.3-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -83,8 +83,9 @@ dcpomatic (1.64.2-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Wed, 05 Feb 2014 23:27:37 +0000 + -- Carl Hetherington Sat, 08 Feb 2014 13:33:08 +0000 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 95fb7f92c..625334c3d 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.64.2devel' +VERSION = '1.64.3' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From ba513bbb0b145358eb4cfd3912ca44ea9fe78bc4 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 8 Feb 2014 16:38:06 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/ChangeLog b/ChangeLog index 7f4045c4f..d35f00543 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-02-08 Carl Hetherington + + * Version 1.64.4 released. + 2014-02-08 Carl Hetherington * Version 1.64.3 released. diff --git a/debian/changelog b/debian/changelog index a9bf676ad..aa29a25db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.64.3-1) UNRELEASED; urgency=low +dcpomatic (1.64.4-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -84,8 +84,9 @@ dcpomatic (1.64.3-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Sat, 08 Feb 2014 13:33:08 +0000 + -- Carl Hetherington Sat, 08 Feb 2014 16:38:06 +0000 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 425bfee20..78958d22b 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.64.3devel' +VERSION = '1.64.4' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 8a471cf8b38ccb82bde42cc64c13b318bb34e42e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 8 Feb 2014 17:50:43 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/ChangeLog b/ChangeLog index d35f00543..caa6ded69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-02-08 Carl Hetherington + + * Version 1.64.5 released. + 2014-02-08 Carl Hetherington * Version 1.64.4 released. diff --git a/debian/changelog b/debian/changelog index aa29a25db..3c1017c03 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.64.4-1) UNRELEASED; urgency=low +dcpomatic (1.64.5-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -85,8 +85,9 @@ dcpomatic (1.64.4-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Sat, 08 Feb 2014 16:38:06 +0000 + -- Carl Hetherington Sat, 08 Feb 2014 17:50:43 +0000 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 0f94b58d8..9ffc4ce5f 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.64.4devel' +VERSION = '1.64.5' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 6f99e5d4f41f9645102a0da2495abf7310d92f57 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 8 Feb 2014 18:47:29 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/ChangeLog b/ChangeLog index caa6ded69..474c8f70d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-02-08 Carl Hetherington + + * Version 1.64.6 released. + 2014-02-08 Carl Hetherington * Version 1.64.5 released. diff --git a/debian/changelog b/debian/changelog index 3c1017c03..8187396d3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.64.5-1) UNRELEASED; urgency=low +dcpomatic (1.64.6-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -86,8 +86,9 @@ dcpomatic (1.64.5-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Sat, 08 Feb 2014 17:50:43 +0000 + -- Carl Hetherington Sat, 08 Feb 2014 18:47:29 +0000 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 755149b57..5664bcbd5 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.64.5devel' +VERSION = '1.64.6' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From bca3a59610be52cd54fdc9e548a3b8feca71fb23 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 8 Feb 2014 22:08:31 +0000 Subject: More build fixes. --- debian/rules | 2 +- wscript | 21 ++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 8973231b5..f24aabac1 100755 --- a/debian/rules +++ b/debian/rules @@ -14,7 +14,7 @@ override_dh_auto_configure: LINKFLAGS=$(CDIST_LINKFLAGS) CXXFLAGS="$(CXXFLAGS) $(CDIST_CXXFLAGS)" PKG_CONFIG_PATH=$(CDIST_PKG_CONFIG_PATH) \ - ./waf --nocache configure --prefix=/usr --static --enable-debug + ./waf --nocache configure --prefix=/usr --target-debian --enable-debug override_dh_auto_build: ./waf --nocache build diff --git a/wscript b/wscript index 76d86347f..2fea78dea 100644 --- a/wscript +++ b/wscript @@ -9,15 +9,15 @@ def options(opt): opt.load('compiler_cxx') opt.load('winres') - opt.add_option('--enable-debug', action='store_true', default=False, help='build with debugging information and without optimisation') - opt.add_option('--disable-gui', action='store_true', default=False, help='disable building of GUI tools') - opt.add_option('--target-windows', action='store_true', default=False, help='set up to do a cross-compile to make a Windows package') - opt.add_option('--target-debian', action='store_true', default=False, help='set up to compile for a Debian/Ubuntu package') - opt.add_option('--target-centos', action='store_true', default=False, help='set up to compile for a Centos package') - opt.add_option('--magickpp-config', action='store', default='Magick++-config', help='path to Magick++-config') - opt.add_option('--wx-config', action='store', default='wx-config', help='path to wx-config') + opt.add_option('--enable-debug', action='store_true', default=False, help='build with debugging information and without optimisation') + opt.add_option('--disable-gui', action='store_true', default=False, help='disable building of GUI tools') + opt.add_option('--target-windows', action='store_true', default=False, help='set up to do a cross-compile to make a Windows package') + opt.add_option('--target-debian', action='store_true', default=False, help='set up to compile for a Debian/Ubuntu package') + opt.add_option('--target-centos', action='store_true', default=False, help='set up to compile for a Centos package') + opt.add_option('--magickpp-config', action='store', default='Magick++-config', help='path to Magick++-config') + opt.add_option('--wx-config', action='store', default='wx-config', help='path to wx-config') opt.add_option('--address-sanitizer', action='store_true', default=False, help='build with address sanitizer') - opt.add_option('--install-prefix', default=None, help='prefix of where DCP-o-matic will be installed') + opt.add_option('--install-prefix', default=None, help='prefix of where DCP-o-matic will be installed') def static_ffmpeg(conf): conf.check_cfg(package='libavformat', args='--cflags', uselib_store='AVFORMAT', mandatory=True) @@ -225,9 +225,8 @@ def configure(conf): # libxml2 seems to be linked against this on Ubuntu but it doesn't mention it in its .pc file conf.check_cfg(package='liblzma', args='--cflags --libs', uselib_store='LZMA', mandatory=True) - if not conf.env.DISABLE_GUI: - if conf.env.TARGET_DEBIAN or conf.env.TARGET_CENTOS: - conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True) + if not conf.env.DISABLE_GUI and conf.env.TARGET_LINUX: + conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True) # OSX if conf.env.TARGET_OSX: -- cgit v1.2.3 From 4f37bfa3e43a36a2b659769e03580f90f7443e53 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 9 Feb 2014 01:31:17 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/ChangeLog b/ChangeLog index 17eca5cfa..1febaac51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-02-09 Carl Hetherington + + * Version 1.64.7 released. + 2014-02-08 Carl Hetherington * Fix exception when seeking with missing content (part of #317). diff --git a/debian/changelog b/debian/changelog index 8187396d3..217e00a09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.64.6-1) UNRELEASED; urgency=low +dcpomatic (1.64.7-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -87,8 +87,9 @@ dcpomatic (1.64.6-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Sat, 08 Feb 2014 18:47:29 +0000 + -- Carl Hetherington Sun, 09 Feb 2014 01:31:17 +0000 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 2fea78dea..9cafff461 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.64.6devel' +VERSION = '1.64.7' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 02144b73814c8bbd6135a8f2ff2dc41101dfe120 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 10 Feb 2014 00:59:23 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/ChangeLog b/ChangeLog index 0a6f52959..859d5e2ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-02-10 Carl Hetherington + + * Version 1.64.8 released. + 2014-02-09 Carl Hetherington * Build with a more careful version of libopenjpeg that handles diff --git a/debian/changelog b/debian/changelog index 217e00a09..78169f943 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.64.7-1) UNRELEASED; urgency=low +dcpomatic (1.64.8-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -88,8 +88,9 @@ dcpomatic (1.64.7-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Sun, 09 Feb 2014 01:31:17 +0000 + -- Carl Hetherington Mon, 10 Feb 2014 00:59:23 +0000 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 4fe7c3064..47369d807 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.64.7devel' +VERSION = '1.64.8' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 9eb6882a1050015b3dc56dc4a6d437d00f2fc555 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 10 Feb 2014 13:59:05 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/ChangeLog b/ChangeLog index 859d5e2ac..47880a583 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-02-10 Carl Hetherington + + * Version 1.64.9 released. + 2014-02-10 Carl Hetherington * Version 1.64.8 released. diff --git a/debian/changelog b/debian/changelog index 78169f943..f9a49b602 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.64.8-1) UNRELEASED; urgency=low +dcpomatic (1.64.9-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -89,8 +89,9 @@ dcpomatic (1.64.8-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Mon, 10 Feb 2014 00:59:23 +0000 + -- Carl Hetherington Mon, 10 Feb 2014 13:59:05 +0000 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 7d36d5da6..62773424f 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.64.8devel' +VERSION = '1.64.9' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From f580c205bc6f3c723a01c2cc2333c11cc0cabcb2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 10 Feb 2014 16:41:52 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/ChangeLog b/ChangeLog index 27e64b115..ba21e4cb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-02-10 Carl Hetherington + + * Version 1.64.10 released. + 2014-02-10 Carl Hetherington * Try to fix Centos RPM dependencies. diff --git a/debian/changelog b/debian/changelog index f9a49b602..8e86fee2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.64.9-1) UNRELEASED; urgency=low +dcpomatic (1.64.10-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -90,8 +90,9 @@ dcpomatic (1.64.9-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Mon, 10 Feb 2014 13:59:05 +0000 + -- Carl Hetherington Mon, 10 Feb 2014 16:41:52 +0000 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 9c3569671..83d5ac88b 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.64.9devel' +VERSION = '1.64.10' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 6ff5da039df0a51c627d4d18938b42afcf215377 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 10 Feb 2014 20:09:26 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/ChangeLog b/ChangeLog index ba21e4cb5..341a1be63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-02-10 Carl Hetherington + + * Version 1.64.11 released. + 2014-02-10 Carl Hetherington * Version 1.64.10 released. diff --git a/debian/changelog b/debian/changelog index 8e86fee2c..0b4453a31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.64.10-1) UNRELEASED; urgency=low +dcpomatic (1.64.11-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -91,8 +91,9 @@ dcpomatic (1.64.10-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Mon, 10 Feb 2014 16:41:52 +0000 + -- Carl Hetherington Mon, 10 Feb 2014 20:09:25 +0000 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 885645e48..b4c0da3b0 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.64.10devel' +VERSION = '1.64.11' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3