Merge.

5 files changed, 24 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 8e182f80c..3c384d14c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,14 @@
 
 	* Add decode debugging option.
 
+2015-06-25  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.1.9 released.
+
+2015-06-24  Carl Hetherington  <cth@carlh.net>
+
+	* Version 2.1.8 released.
+
 2015-06-24  c.hetherington  <cth@carlh.net>
 
 	* Bump libdcp for probable fix to various font ID problems (#620).
diff --git a/cscript b/cscript
index 94ddd08f1..4acc14f4f 100644
--- a/cscript
+++ b/cscript
@@ -190,7 +190,8 @@ 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'
+    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']:
@@ -268,7 +269,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 +289,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 +328,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':
diff --git a/debian/changelog b/debian/changelog
index cd4bc25f4..1fa9dfdee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.1.7-1) UNRELEASED; urgency=low
+dcpomatic (2.1.9-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -238,8 +238,10 @@ dcpomatic (2.1.7-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Sun, 21 Jun 2015 02:51:48 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Thu, 25 Jun 2015 01:03:14 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
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 <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     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)
 		"    <A>0.055</A>\n"
 		"    <B>12.92</B>\n"
 		"  </InputTransferFunction>\n"
+		"  <YUVToRGB>0</YUVToRGB>\n"
 		"  <RedX>0.64</RedX>\n"
 		"  <RedY>0.33</RedY>\n"
 		"  <GreenX>0.3</GreenX>\n"
@@ -86,6 +87,7 @@ BOOST_AUTO_TEST_CASE (colour_conversion_test3)
 		"    <A>0.099</A>\n"
 		"    <B>4.5</B>\n"
 		"  </InputTransferFunction>\n"
+		"  <YUVToRGB>1</YUVToRGB>\n"
 		"  <RedX>0.64</RedX>\n"
 		"  <RedY>0.33</RedY>\n"
 		"  <GreenX>0.3</GreenX>\n"
diff --git a/wscript b/wscript
index e2e8fc941..d23d847d6 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.9devel'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -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)