From 441026bd73b8829b8e2cffb2731ef05fb0ba8b71 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 24 Jun 2015 23:47:46 +0100 Subject: Fix test refs. --- test/colour_conversion_test.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/colour_conversion_test.cc b/test/colour_conversion_test.cc index 3b6a0e198..f8c764975 100644 --- a/test/colour_conversion_test.cc +++ b/test/colour_conversion_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -56,6 +56,7 @@ BOOST_AUTO_TEST_CASE (colour_conversion_test2) " 0.055\n" " 12.92\n" " \n" + " 0\n" " 0.64\n" " 0.33\n" " 0.3\n" @@ -86,6 +87,7 @@ BOOST_AUTO_TEST_CASE (colour_conversion_test3) " 0.099\n" " 4.5\n" " \n" + " 1\n" " 0.64\n" " 0.33\n" " 0.3\n" -- cgit v1.2.3 From deed8dd8eaf7c9cab203a9f6d27a45d52b8a89fa Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 24 Jun 2015 23:48:35 +0100 Subject: Install LiberationSans to share/dcpomatic2. --- wscript | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wscript b/wscript index e2e8fc941..d24dc03f4 100644 --- a/wscript +++ b/wscript @@ -404,7 +404,8 @@ def build(bld): bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dcpomatic2.png' % r) if not bld.env.TARGET_WINDOWS: - bld.install_files('${PREFIX}/share/dcpomatic', 'icons/taskbar_icon.png') + bld.install_files('${PREFIX}/share/dcpomatic2', 'icons/taskbar_icon.png') + bld.install_files('${PREFIX}/share/dcpomatic2', 'LiberationSans-Regular.ttf') bld.add_post_fun(post) -- cgit v1.2.3 From 903cf461f74c22202ecd44b0c3bbb372c686e421 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 24 Jun 2015 23:55:15 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8759abeb4..7b5507446 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-06-24 Carl Hetherington + + * Version 2.1.8 released. + 2015-06-24 c.hetherington * Bump libdcp for probable fix to various font ID problems (#620). diff --git a/debian/changelog b/debian/changelog index cd4bc25f4..d7409601a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (2.1.7-1) UNRELEASED; urgency=low +dcpomatic (2.1.8-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -238,8 +238,9 @@ dcpomatic (2.1.7-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Sun, 21 Jun 2015 02:51:48 +0100 + -- Carl Hetherington Wed, 24 Jun 2015 23:55:14 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index d24dc03f4..ef738d517 100644 --- a/wscript +++ b/wscript @@ -26,7 +26,7 @@ import distutils.spawn from waflib import Logs APPNAME = 'dcpomatic' -VERSION = '2.1.7devel' +VERSION = '2.1.8' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From c37217eaa8b517d37027e91e6874254692699109 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 24 Jun 2015 23:55:15 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index ef738d517..5e8b1ee53 100644 --- a/wscript +++ b/wscript @@ -26,7 +26,7 @@ import distutils.spawn from waflib import Logs APPNAME = 'dcpomatic' -VERSION = '2.1.8' +VERSION = '2.1.8devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From be6ef36430fdbb4299ab45ded46526483f03f590 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 25 Jun 2015 00:20:51 +0100 Subject: Fix taskbar icon path. --- cscript | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cscript b/cscript index 94ddd08f1..17835912b 100644 --- a/cscript +++ b/cscript @@ -190,7 +190,7 @@ def make_spec(filename, version, target): print >>f,'%{_datadir}/applications/dcpomatic2.desktop' print >>f,'%{_datadir}/applications/dcpomatic2_batch.desktop' print >>f,'%{_datadir}/applications/dcpomatic2_server.desktop' - print >>f,'%{_datadir}/dcpomatic/taskbar_icon.png' + print >>f,'%{_datadir}/dcpomatic2/taskbar_icon.png' for r in ['128x128', '22x22', '32x32', '48x48', '64x64']: print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2.png' % r for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU']: @@ -268,7 +268,7 @@ def package_debian(target, cpu, version): f = open('debian/files', 'w') print >>f,'dcpomatic_%s-1_%s.deb video extra' % (version, cpu) shutil.rmtree('build/deb', ignore_errors=True) - + os.makedirs('build/deb') os.chdir('build/deb') shutil.move('../../dcpomatic-%s.tar.bz2' % version, 'dcpomatic_%s.orig.tar.bz2' % version) @@ -288,11 +288,11 @@ def package_debian(target, cpu, version): target.set('CDIST_LOCALE_PREFIX', '/usr/local/share/locale') target.command('dpkg-buildpackage -uc -us') - + debs = [] for p in glob.glob('../*.deb'): debs.append(os.path.abspath(p)) - + return debs def package_centos(target, cpu, version): @@ -327,7 +327,7 @@ def package(target, version): elif target.platform == 'linux': if target.bits == 32: cpu = 'i386' - else: + else: cpu = 'amd64' if target.distro == 'debian' or target.distro == 'ubuntu': -- cgit v1.2.3 From 02347831e2b8bdc3f53c84988ab1bf46ad399b1e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 25 Jun 2015 00:47:25 +0100 Subject: Missing file on RPM install. --- cscript | 1 + 1 file changed, 1 insertion(+) diff --git a/cscript b/cscript index 17835912b..4acc14f4f 100644 --- a/cscript +++ b/cscript @@ -191,6 +191,7 @@ def make_spec(filename, version, target): print >>f,'%{_datadir}/applications/dcpomatic2_batch.desktop' print >>f,'%{_datadir}/applications/dcpomatic2_server.desktop' print >>f,'%{_datadir}/dcpomatic2/taskbar_icon.png' + print >>f,'%{_datadir}/dcpomatic2/LiberationSans-Regular.ttf' for r in ['128x128', '22x22', '32x32', '48x48', '64x64']: print >>f,'%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2.png' % r for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU']: -- cgit v1.2.3 From 55fff9cea0b4133c6fa1b4d436a5e9572622af56 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 25 Jun 2015 01:03:14 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b5507446..8509a066e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-06-25 Carl Hetherington + + * Version 2.1.9 released. + 2015-06-24 Carl Hetherington * Version 2.1.8 released. diff --git a/debian/changelog b/debian/changelog index d7409601a..1fa9dfdee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (2.1.8-1) UNRELEASED; urgency=low +dcpomatic (2.1.9-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -239,8 +239,9 @@ dcpomatic (2.1.8-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Wed, 24 Jun 2015 23:55:14 +0100 + -- Carl Hetherington Thu, 25 Jun 2015 01:03:14 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 5e8b1ee53..ed3985c3a 100644 --- a/wscript +++ b/wscript @@ -26,7 +26,7 @@ import distutils.spawn from waflib import Logs APPNAME = 'dcpomatic' -VERSION = '2.1.8devel' +VERSION = '2.1.9' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 637610a095ad8e25fc058b06b77ffc8d3bb77ceb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 25 Jun 2015 01:03:15 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index ed3985c3a..d23d847d6 100644 --- a/wscript +++ b/wscript @@ -26,7 +26,7 @@ import distutils.spawn from waflib import Logs APPNAME = 'dcpomatic' -VERSION = '2.1.9' +VERSION = '2.1.9devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3