Patch cargo to use im-rc 13

diff --git a/src/cargo/debian/patches/disable-pretty-env-logger.patch b/src/cargo/debian/patches/disable-pretty-env-logger.patch
index aca538a984145a6e0e2735d5b61c091f44351cce..401cf182c5df5551505d87df642537814b6fcb3e 100644 (file)
--- a/src/cargo/debian/patches/disable-pretty-env-logger.patch
+++ b/src/cargo/debian/patches/disable-pretty-env-logger.patch
@@ -1,6 +1,6 @@
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -122,10 +122,6 @@
+@@ -125,10 +125,6 @@
  version = "0.10.11"
  optional = true
  
@@ -11,7 +11,7 @@
  [dependencies.rustc-workspace-hack]
  version = "1.0.0"
  
-@@ -182,7 +178,7 @@
+@@ -188,7 +184,7 @@
  
  [features]
  deny-warnings = []
@@ -22,7 +22,7 @@
  version = "0.6.0"
 --- a/src/bin/cargo/main.rs
 +++ b/src/bin/cargo/main.rs
-@@ -17,9 +17,6 @@
+@@ -19,9 +19,6 @@
  use crate::command_prelude::*;
  
  fn main() {

diff --git a/src/cargo/debian/patches/disable-vendor.patch b/src/cargo/debian/patches/disable-vendor.patch
index 9393bc8e4801ca9e621505fc00a09a815ecce19f..9922f42c5c33f3db31428e232ec0dcf2ce8714b2 100644 (file)
--- a/src/cargo/debian/patches/disable-vendor.patch
+++ b/src/cargo/debian/patches/disable-vendor.patch
@@ -1,6 +1,6 @@
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -183,7 +183,7 @@
+@@ -189,7 +189,7 @@
  [features]
  deny-warnings = []
  pretty-env-logger = ["pretty_env_logger"]

diff --git a/src/cargo/debian/patches/relax-deps.diff b/src/cargo/debian/patches/relax-deps.diff
new file mode 100644 (file)
index 0000000..a66b5da
--- /dev/null
+++ b/src/cargo/debian/patches/relax-deps.diff
@@ -0,0 +1,11 @@
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -92,7 +92,7 @@
+ version = "0.4.7"
+ 
+ [dependencies.im-rc]
+-version = "12.1.0"
++version = "13"
+ 
+ [dependencies.jobserver]
+ version = "0.1.13"

diff --git a/src/cargo/debian/patches/series b/src/cargo/debian/patches/series
index 9e50271e99a8a5c3716d037bc35338a0cc89ea90..37197c48182cb53a72200e16e8a5e26004db298c 100644 (file)
--- a/src/cargo/debian/patches/series
+++ b/src/cargo/debian/patches/series
@@ -1,2 +1,3 @@
 disable-vendor.patch
 disable-pretty-env-logger.patch
+relax-deps.diff