Merge master.

4 files changed, 7 insertions, 37 deletions

diff --git a/platform/linux/dvdomatic.desktop.in b/platform/linux/dvdomatic.desktop.in
deleted file mode 100644
index 65067eb3b..000000000
--- a/platform/linux/dvdomatic.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Exec=@PREFIX@/bin/dvdomatic
-Name=DVD-o-matic
-Icon=dvdomatic
-Comment=DCP generator
-Categories=AudioVideo;Video
diff --git a/platform/linux/dvdomatic_batch.desktop.in b/platform/linux/dvdomatic_batch.desktop.in
deleted file mode 100644
index 8150fe849..000000000
--- a/platform/linux/dvdomatic_batch.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Exec=@PREFIX@/bin/dvdomatic_batch
-Name=DVD-o-matic Batch Converter
-Icon=dvdomatic
-Comment=Batch DCP generator
-Categories=AudioVideo;Video
diff --git a/platform/linux/servomatic.desktop.in b/platform/linux/servomatic.desktop.in
deleted file mode 100644
index 572b4c64c..000000000
--- a/platform/linux/servomatic.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Exec=@PREFIX@/bin/servomatic_gui
-Name=DVD-o-matic Encode Server
-Icon=dvdomatic
-Comment=DCP generator
-Categories=AudioVideo;Video
diff --git a/platform/linux/wscript b/platform/linux/wscript
index 1d9054b32..53a6efeac 100644
--- a/platform/linux/wscript
+++ b/platform/linux/wscript
@@ -2,18 +2,18 @@ def build(bld):
     d = { 'PREFIX' : '${PREFIX' }
 
     obj = bld(features = 'subst')
-    obj.source = 'dvdomatic.desktop.in'
-    obj.target = 'dvdomatic.desktop'
+    obj.source = 'dcpomatic.desktop.in'
+    obj.target = 'dcpomatic.desktop'
     obj.dict = d
 
     obj = bld(features = 'subst')
-    obj.source = 'dvdomatic_batch.desktop.in'
-    obj.target = 'dvdomatic_batch.desktop'
+    obj.source = 'dcpomatic_batch.desktop.in'
+    obj.target = 'dcpomatic_batch.desktop'
     obj.dict = d
 
     obj = bld(features = 'subst')
-    obj.source = 'servomatic.desktop.in'
-    obj.target = 'servomatic.desktop'
+    obj.source = 'dcpomatic_server.desktop.in'
+    obj.target = 'dcpomatic_server.desktop'
     obj.dict = d
 
-    bld.install_files('${PREFIX}/share/applications', ['dvdomatic.desktop', 'dvdomatic_batch.desktop', 'servomatic.desktop'])
+    bld.install_files('${PREFIX}/share/applications', ['dcpomatic.desktop', 'dcpomatic_batch.desktop', 'dcpomatic_server.desktop'])