Various fixes for dcpomatic2.

diff --git a/ChangeLog b/ChangeLog
index de25e314660a89aae6c2149f11e4e19b91d427c4..64f4022fccfc4a1b3b05f4aa0aeda490a8468919 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2015-06-18  Carl Hetherington  <cth@carlh.net>
 
+       * Fixes to Linux .desktop files.
+
        * Stop playback when we reach the end of the film.
 
 2015-06-16  c.hetherington  <cth@carlh.net>

diff --git a/platform/linux/dcpomatic.desktop.in b/platform/linux/dcpomatic.desktop.in
index a950f35e9cc65f1da914e0bd567239549886b06f..f368d2086d688a4f47ac80b2c0e9e23c3de4b312 100644 (file)
--- a/platform/linux/dcpomatic.desktop.in
+++ b/platform/linux/dcpomatic.desktop.in
@@ -5,6 +5,6 @@ Type=Application
 Terminal=false
 Exec=@INSTALL_PREFIX@/bin/dcpomatic2
 Name=DCP-o-matic 2
-Icon=dcpomatic
+Icon=dcpomatic2
 Comment=DCP generator
 Categories=AudioVideo;Video

diff --git a/platform/linux/dcpomatic_batch.desktop.in b/platform/linux/dcpomatic_batch.desktop.in
index ec32a735357d6485288f26110ee52e1d738a4ce6..23eb2e4a105218c28bdd9f893f4a56261b24e7a5 100644 (file)
--- a/platform/linux/dcpomatic_batch.desktop.in
+++ b/platform/linux/dcpomatic_batch.desktop.in
@@ -3,8 +3,8 @@ Encoding=UTF-8
 Version=1.0
 Type=Application
 Terminal=false
-Exec=@INSTALL_PREFIX@/bin/dcpomatic_batch
-Name=DCP-o-matic Batch Converter
-Icon=dcpomatic
+Exec=@INSTALL_PREFIX@/bin/dcpomatic2_batch
+Name=DCP-o-matic 2 Batch Converter
+Icon=dcpomatic2
 Comment=DCP generator
 Categories=AudioVideo;Video

diff --git a/platform/linux/dcpomatic_server.desktop.in b/platform/linux/dcpomatic_server.desktop.in
index c51c2778a67080cc06cd943142522ed48583bd4b..f28ab052f8c56049a36ef6ca72d74e91bd1c2542 100644 (file)
--- a/platform/linux/dcpomatic_server.desktop.in
+++ b/platform/linux/dcpomatic_server.desktop.in
@@ -3,8 +3,8 @@ Encoding=UTF-8
 Version=1.0
 Type=Application
 Terminal=false
-Exec=@INSTALL_PREFIX@/bin/dcpomatic_server
-Name=DCP-o-matic Encode Server
-Icon=dcpomatic
+Exec=@INSTALL_PREFIX@/bin/dcpomatic2_server
+Name=DCP-o-matic 2 Encode Server
+Icon=dcpomatic2
 Comment=DCP generator
 Categories=AudioVideo;Video