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(-) (limited to 'wscript') 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(-) (limited to 'wscript') 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(-) (limited to 'wscript') 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 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(-) (limited to 'wscript') 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(-) (limited to 'wscript') 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