Missing bits of packaging for combiner on Linux.

diff --git a/cscript b/cscript
index 5aeba3da30db0a3ffc243a63a0fe53a71c78a2ac..0865c5119f63bf8cb7c28a18ef688cc4c45b153b 100644 (file)
--- a/cscript
+++ b/cscript
@@ -286,6 +286,7 @@ def make_spec(filename, version, target, options, requires=None):
     print('%{_bindir}/dcpomatic2_player', file=f)
     print('%{_bindir}/dcpomatic2_playlist', file=f)
     print('%{_bindir}/dcpomatic2_openssl', file=f)
+    print('%{_bindir}/dcpomatic2_combiner', file=f)
     if options['variant'] == 'swaroop-studio':
         print('%{_bindir}/dcpomatic2_ecinema', file=f)
         print('%{_bindir}/dcpomatic2_uuid', file=f)
@@ -298,7 +299,7 @@ def make_spec(filename, version, target, options, requires=None):
     print('%{_datadir}/applications/dcpomatic2_kdm.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_player.desktop', file=f)
     print('%{_datadir}/applications/dcpomatic2_playlist.desktop', file=f)
-    print('%{_datadir}/applications/dcpomatic2_playlist.desktop', file=f)
+    print('%{_datadir}/applications/dcpomatic2_combiner.desktop', file=f)
     if os.path.exists(os.path.join(tools, "dcpomatic2_disk")):
         print('%{_datadir}/applications/dcpomatic2_disk.desktop', file=f)
     print('%{_datadir}/dcpomatic2/dcpomatic2_server_small.png', file=f)
@@ -323,6 +324,7 @@ def make_spec(filename, version, target, options, requires=None):
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_player.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_playlist.png' % r, file=f)
         print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_disk.png' % r, file=f)
+        print('%%{_datadir}/icons/hicolor/%s/apps/dcpomatic2_combiner.png' % r, file=f)
     for l in ['de_DE', 'es_ES', 'fr_FR', 'it_IT', 'sv_SE', 'nl_NL', 'ru_RU', 'pl_PL', 'da_DK',
               'pt_PT', 'pt_BR', 'sk_SK', 'cs_CZ', 'uk_UA', 'zh_CN', 'tr_TR']:
         print('%%{_datadir}/locale/%s/LC_MESSAGES/dcpomatic2.mo' % l, file=f)

diff --git a/graphics/wscript b/graphics/wscript
index 5b51abb947d5a67297aca693da16a34a642d809a..157b2c77e82ef400efc4689dbcbe86a44a6146a8 100644 (file)
--- a/graphics/wscript
+++ b/graphics/wscript
@@ -23,7 +23,7 @@ def build(bld):
     # Linux application icons
     if bld.env.TARGET_LINUX:
         for r in [16, 22, 32, 48, 64, 128, 256, 512]:
-            for p in ['dcpomatic2', 'dcpomatic2_kdm', 'dcpomatic2_server', 'dcpomatic2_batch', 'dcpomatic2_player', 'dcpomatic2_playlist', 'dcpomatic2_disk']:
+            for p in ['dcpomatic2', 'dcpomatic2_kdm', 'dcpomatic2_server', 'dcpomatic2_batch', 'dcpomatic2_player', 'dcpomatic2_playlist', 'dcpomatic2_disk', 'dcpomatic2_combiner']:
                 bld.install_files('${PREFIX}/share/icons/hicolor/%dx%d/apps' % (r, r), 'linux/%d/%s.png' % (r, p))
 
     # Install stuff for POSIX systems