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)

diff --git a/gtk2_ardour/ardour-mime-info.xml b/gtk2_ardour/ardour-mime-info.xml
index b8eda2206e598ea276ca986641274cf6d1e2f0ed..28b19d0280cd2989485d1cd32d7e163b6b67ae35 100644 (file)
--- 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 6eaa92443751dce0d5df5dc8c76fd72651a90a10..cbd7a5341fb7bfbec5665d02bb099015228ac08f 100644 (file)
--- 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 ec3bed9afc1d40086699861c5b8c8467585ec6ab..cc7679bced7cca44c7bd7835e31460f134fa0d62 100644 (file)
--- 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'