From 3ff925fedbd425e06a96dc636df6179a2e76e798 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Tue, 1 Sep 2015 22:07:37 -0400
Subject: [PATCH] change name of default bindings to us.bindings (and thus
 binding definitions to us.bindings.in)

"us" indicates keyboard layout.
---
 gtk2_ardour/keyboard.cc                                 | 2 +-
 gtk2_ardour/{mnemonic-us.bindings.in => us.bindings.in} | 0
 gtk2_ardour/wscript                                     | 8 +-------
 3 files changed, 2 insertions(+), 8 deletions(-)
 rename gtk2_ardour/{mnemonic-us.bindings.in => us.bindings.in} (100%)

diff --git a/gtk2_ardour/keyboard.cc b/gtk2_ardour/keyboard.cc
index 4856cea4fa..6e19e73808 100644
--- a/gtk2_ardour/keyboard.cc
+++ b/gtk2_ardour/keyboard.cc
@@ -52,7 +52,7 @@ void
 ArdourKeyboard::setup_keybindings ()
 {
 	using namespace ARDOUR_COMMAND_LINE;
-	string default_bindings = "mnemonic-us.bindings";
+	string default_bindings = "us.bindings";
 	vector<string> strs;
 
 	binding_files.clear ();
diff --git a/gtk2_ardour/mnemonic-us.bindings.in b/gtk2_ardour/us.bindings.in
similarity index 100%
rename from gtk2_ardour/mnemonic-us.bindings.in
rename to gtk2_ardour/us.bindings.in
diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
index 251c7c06c4..d9e67c4a9d 100644
--- a/gtk2_ardour/wscript
+++ b/gtk2_ardour/wscript
@@ -715,15 +715,11 @@ def build(bld):
 
     # Keybindings
 
-    # 'SAE-de-keypad', 'SAE-de-nokeypad', 'SAE-us-keypad',
-    # 'SAE-us-nokeypad', 'ergonomic-us'
-
     # NATIVE ARDOUR BINDING FILES
     # explicitly state the use of perl here so that it works on windows too
     # 
     a_rule = 'perl ../tools/fmt-bindings --platform="%s" --winkey="%s" --accelmap ${SRC} >${TGT}' % (sys.platform, bld.env['WINDOWS_KEY'] )
-
-    for b in [ 'mnemonic-us' ] :
+    for b in [ 'us' ] :
         obj = bld(
             target = b + '.bindings',
             source = b + '.bindings.in',
@@ -733,8 +729,6 @@ def build(bld):
         
     # not modified at present
     bld.install_files(bld.env['CONFDIR'], 'dark.colors')
-    bld.install_files(bld.env['CONFDIR'], 'step_editing.bindings')
-    bld.install_files(bld.env['CONFDIR'], 'mixer.bindings')
 
     # Icons/Images
     bld.install_files(os.path.join (bld.env['DATADIR'], 'icons'), bld.path.ant_glob('icons/*.png'))