From 3af10285b7d48db46b1e35a9d7f77da6a844c307 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mark=20M=C3=BCller?= <markmueller86@gmail.com>
Date: Fri, 13 Dec 2019 20:46:52 +0100
Subject: [PATCH] squeekboard-test-layout: correct dependencies and version for
 clap argument parsing

---
 Cargo.toml             | 2 +-
 debian/control         | 2 +-
 src/bin/test_layout.rs | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 54b3b45e..44e02b37 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,12 +4,12 @@ version = "0.1.0"
 
 [dependencies]
 bitflags = "1.0.*"
+clap = "2.32.*"
 maplit = "1.0.*"
 regex = "1.1.*"
 serde = { version = "1.0.*", features = ["derive"] }
 serde_yaml = "0.8.*"
 xkbcommon = { version = "0.4.*", features = ["wayland"] }
-clap = "2"
 
 [dependencies.gio]
 version = ""
diff --git a/debian/control b/debian/control
index d961cc9f..eba8e260 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
  libgtk-3-dev,
  libcroco3-dev,
  librust-bitflags-1-dev (>= 1.0),
- librust-clap-dev,
+ librust-clap-2+default-dev (>= 2.32),
  librust-gio+v2-44-dev,
  librust-glib+v2-44-dev,
  librust-glib-sys-dev,
diff --git a/src/bin/test_layout.rs b/src/bin/test_layout.rs
index 19274220..a5722809 100644
--- a/src/bin/test_layout.rs
+++ b/src/bin/test_layout.rs
@@ -7,7 +7,6 @@ use rs::tests::check_layout_file;
 fn main() -> () {
     let matches = clap_app!(test_layout =>
         (name: "squeekboard-test-layout")
-        (version: env!("CARGO_PKG_VERSION"))
         (about: "Test keyboard layout for errors. Returns OK or an error message containing further information.")
         (@arg INPUT: +required "Yaml keyboard layout file to test")
     ).get_matches();