From 5ffe3d44b3701b5eb240b36254744292691414cd Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Tue, 20 Nov 2012 18:01:35 -0800
Subject: [PATCH] Restore installation of .desktop files lost in WAF
 conversion.

---
 mixer/non-mixer.desktop.in                     | 2 +-
 mixer/wscript                                  | 7 +++++++
 sequencer/non-sequencer.desktop.in             | 2 +-
 sequencer/wscript                              | 7 +++++++
 session-manager/non-session-manager.desktop.in | 2 +-
 session-manager/wscript                        | 8 ++++++++
 timeline/non-daw.desktop.in                    | 2 +-
 timeline/wscript                               | 7 +++++++
 8 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/mixer/non-mixer.desktop.in b/mixer/non-mixer.desktop.in
index 216df38..cde6fa7 100644
--- a/mixer/non-mixer.desktop.in
+++ b/mixer/non-mixer.desktop.in
@@ -5,4 +5,4 @@ Exec=@BIN_PATH@/non-mixer
 Terminal=false
 Type=Application
 Icon=non-mixer
-Categories=Application;AudioVideo;Audio;
+Categories=AudioVideo;Audio;
diff --git a/mixer/wscript b/mixer/wscript
index c6cb16e..5984929 100644
--- a/mixer/wscript
+++ b/mixer/wscript
@@ -68,6 +68,13 @@ src/main.C
               uselib = [ 'JACK', 'LIBLO', 'LRDF', 'XPM', 'NTK', 'NTK_IMAGES' ],
               install_path = '${BINDIR}')
 
+    bld( features = 'subst',
+         source = 'non-mixer.desktop.in',
+         target = 'non-mixer.desktop',
+         encoding = 'utf8',
+         install_path = "${DATADIR}" + '/applications',
+         BIN_PATH = bld.env.BINDIR )
+
     start_dir = bld.path.find_dir( 'icons/hicolor' )
 
     bld.install_files('${DATADIR}/icons/hicolor', start_dir.ant_glob('**/*.png'),
diff --git a/sequencer/non-sequencer.desktop.in b/sequencer/non-sequencer.desktop.in
index 620c797..f54f91d 100644
--- a/sequencer/non-sequencer.desktop.in
+++ b/sequencer/non-sequencer.desktop.in
@@ -5,4 +5,4 @@ Exec=@BIN_PATH@/non-sequencer
 Terminal=false
 Type=Application
 Icon=non-sequencer
-Categories=Application;AudioVideo;Audio;Midi;
+Categories=AudioVideo;Audio;Midi;
diff --git a/sequencer/wscript b/sequencer/wscript
index 9ce2584..fc49cd5 100644
--- a/sequencer/wscript
+++ b/sequencer/wscript
@@ -71,6 +71,13 @@ src/transport.C
               uselib = [ 'JACK', 'SIGCPP', 'LIBLO', 'XPM', 'NTK', 'NTK_IMAGES'],
               install_path = '${BINDIR}')
 
+    bld( features = 'subst',
+         source = 'non-sequencer.desktop.in',
+         target = 'non-sequencer.desktop',
+         encoding = 'utf8',
+         install_path = "${DATADIR}" + '/applications',
+         BIN_PATH = bld.env.BINDIR )
+
     bld.install_files('/'.join( [ '${DATADIR}', APPNAME, 'instruments'] ), bld.path.ant_glob('instruments/*'))
 
     start_dir = bld.path.find_dir( 'icons/hicolor' )
diff --git a/session-manager/non-session-manager.desktop.in b/session-manager/non-session-manager.desktop.in
index 02e0144..5bab024 100644
--- a/session-manager/non-session-manager.desktop.in
+++ b/session-manager/non-session-manager.desktop.in
@@ -5,4 +5,4 @@ Exec=@BIN_PATH@/non-session-manager
 Terminal=false
 Type=Application
 Icon=non-session-manager
-Categories=Application;AudioVideo;Audio;
+Categories=AudioVideo;Audio;
diff --git a/session-manager/wscript b/session-manager/wscript
index 9cda12b..66068ac 100644
--- a/session-manager/wscript
+++ b/session-manager/wscript
@@ -92,6 +92,14 @@ src/send_osc.C
               use = [ 'nonlib'],
               install_path = None )
 
+    bld( features = 'subst',
+         source = 'non-session-manager.desktop.in',
+         target = 'non-session-manager.desktop',
+         encoding = 'utf8',
+         install_path = "${DATADIR}" + '/applications',
+         BIN_PATH = bld.env.BINDIR,
+         
+ );
 
     start_dir = bld.path.find_dir( 'icons/hicolor' )
 
diff --git a/timeline/non-daw.desktop.in b/timeline/non-daw.desktop.in
index bf3b4ab..e2304fd 100644
--- a/timeline/non-daw.desktop.in
+++ b/timeline/non-daw.desktop.in
@@ -5,4 +5,4 @@ Exec=@BIN_PATH@/non-daw
 Terminal=false
 Type=Application
 Icon=non-daw
-Categories=Application;AudioVideo;Audio;
+Categories=AudioVideo;Audio;
diff --git a/timeline/wscript b/timeline/wscript
index 63c6216..49a893f 100644
--- a/timeline/wscript
+++ b/timeline/wscript
@@ -94,6 +94,13 @@ src/main.C
               use = [ 'fl_widgets', 'nonlib'],
               install_path = '${BINDIR}')
 
+    bld( features = 'subst',
+         source = 'non-daw.desktop.in',
+         target = 'non-daw.desktop',
+         encoding = 'utf8',
+         install_path = "${DATADIR}" + '/applications',
+         BIN_PATH = bld.env.BINDIR )
+
     start_dir = bld.path.find_dir( 'icons/hicolor' )
 
     bld.install_files('${DATADIR}/icons/hicolor', start_dir.ant_glob('**/*.png'),