exa: Bump git2 version so git feature can be re-enabled

diff --git a/src/exa/debian/changelog b/src/exa/debian/changelog
index 94c3c8b296de43df9f092bfaf4cd5f78a4836948..2637747bee76c46d5e1722ebaf3d4dd08815baf8 100644 (file)
--- a/src/exa/debian/changelog
+++ b/src/exa/debian/changelog
@@ -3,8 +3,9 @@ rust-exa (0.10.1-3) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
   * Team upload.
   * Package exa 0.10.1 from crates.io using debcargo 2.6.0
   * Fix installation of bash completions (Closes: #1017358)
+  * Bump git2 version so git feature can be re-enabled (Closes: #993768)
 
- -- James McCoy <jamessan@debian.org>  Sun, 20 Nov 2022 13:35:04 -0500
+ -- James McCoy <jamessan@debian.org>  Sun, 20 Nov 2022 14:01:40 -0500
 
 rust-exa (0.10.1-2) unstable; urgency=medium
 

diff --git a/src/exa/debian/patches/bump-git2.diff b/src/exa/debian/patches/bump-git2.diff
new file mode 100644 (file)
index 0000000..1128483
--- /dev/null
+++ b/src/exa/debian/patches/bump-git2.diff
@@ -0,0 +1,11 @@
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -45,7 +45,7 @@ features = ["format"]
+ default-features = false
+ 
+ [dependencies.git2]
+-version = "0.13"
++version = ">= 0.13, < 0.15"
+ optional = true
+ default-features = false
+ 

diff --git a/src/exa/debian/patches/disable-git.diff b/src/exa/debian/patches/disable-git.diff
deleted file mode 100644 (file)
index 0d799aa..0000000
--- a/src/exa/debian/patches/disable-git.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: exa/Cargo.toml
-===================================================================
---- exa.orig/Cargo.toml
-+++ exa/Cargo.toml
-@@ -44,10 +44,10 @@ version = "0.5.2"
- features = ["format"]
- default-features = false
- 
--[dependencies.git2]
--version = "0.13"
--optional = true
--default-features = false
-+#[dependencies.git2]
-+#version = "0.13"
-+#optional = true
-+#default-features = false
- 
- [dependencies.glob]
- version = "0.3"
-@@ -94,7 +94,7 @@ version = "0.5.1"
- version = "0.5.2"
- default-features = false
- 
--[features]
--default = ["git"]
--git = ["git2"]
--vendored-openssl = ["git2/vendored-openssl"]
-+#[features]
-+#default = ["git"]
-+#git = ["git2"]
-+#vendored-openssl = ["git2/vendored-openssl"]

diff --git a/src/exa/debian/patches/disable-vendored-openssl.diff b/src/exa/debian/patches/disable-vendored-openssl.diff
new file mode 100644 (file)
index 0000000..6a99f35
--- /dev/null
+++ b/src/exa/debian/patches/disable-vendored-openssl.diff
@@ -0,0 +1,8 @@
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -97,4 +97,4 @@ default-features = false
+ [features]
+ default = ["git"]
+ git = ["git2"]
+-vendored-openssl = ["git2/vendored-openssl"]
++#vendored-openssl = ["git2/vendored-openssl"]

diff --git a/src/exa/debian/patches/series b/src/exa/debian/patches/series
index 8228720f34b13d8ec3cc26dacf8dc6b431a8eda5..18680a4f9beef199be1213eeaa06c3511f6ac39d 100644 (file)
--- a/src/exa/debian/patches/series
+++ b/src/exa/debian/patches/series
@@ -1 +1,2 @@
-disable-git.diff
+bump-git2.diff
+disable-vendored-openssl.diff