From a02ffb9eed7509747ff39f0fe699b3a24cacb5b8 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Thu, 22 Oct 2015 18:07:55 +0200
Subject: set executable and icon name in desktop-file

Also opt for version-agnostic mime-type (file-format version
is independent of program-version and of file-extension)
---
 gtk2_ardour/ardour-mime-info.xml | 2 +-
 gtk2_ardour/ardour.desktop.in    | 6 +++---
 gtk2_ardour/wscript              | 7 +++++++
 3 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'gtk2_ardour')

diff --git a/gtk2_ardour/ardour-mime-info.xml b/gtk2_ardour/ardour-mime-info.xml
index b8eda2206e..28b19d0280 100644
--- a/gtk2_ardour/ardour-mime-info.xml
+++ b/gtk2_ardour/ardour-mime-info.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="application/x-ardour4">
+  <mime-type type="application/x-ardour">
   <sub-class-of type="application/xml"/>
   <comment>Ardour session file</comment>
   <glob pattern="*.ardour"/>
diff --git a/gtk2_ardour/ardour.desktop.in b/gtk2_ardour/ardour.desktop.in
index 6eaa924437..cbd7a5341f 100644
--- a/gtk2_ardour/ardour.desktop.in
+++ b/gtk2_ardour/ardour.desktop.in
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Name=Ardour
 Comment=Ardour Digital Audio Workstation
-Exec=ardour4
-Icon=ardour4
+Exec=@ARDOUR_EXEC@
+Icon=@ARDOUR_ICON@
 Terminal=false
-MimeType=application/x-ardour4;
+MimeType=application/x-ardour;
 Type=Application
 Categories=AudioVideo;Audio;AudioEditing;X-Recorders;X-Multitrack;X-Jack;
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index ec3bed9afc..cc7679bced 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -669,11 +669,18 @@ def build(bld):
         bld.install_files (bld.env['CONFDIR'], program + '.menus')
 
     # Freedesktop
+    freedesktop_subst_dict = {
+                    'ARDOUR_EXEC' : 'ardour' + str (bld.env['MAJOR']),
+                    'ARDOUR_ICON' : 'ardour' + str (bld.env['MAJOR'])
+    }
+
     if bld.env['FREEDESKTOP']:
         obj              = bld(features = 'subst')
         obj.source       = 'ardour.desktop.in'
         obj.target       = bld.env['PROGRAM_NAME'].lower() + str (bld.env['MAJOR']) + '.desktop'
         obj.chmod        = Utils.O644
+        obj.dict         = freedesktop_subst_dict
+        set_subst_dict(obj, freedesktop_subst_dict)
 
         obj              = bld(features = 'subst')
         obj.source       = 'ardour-mime-info.xml'
-- 
cgit v1.2.3