Another dependency just got updated. Debdiff to make the package build with
what is currently in sid attatched.
As before I have tested the package builds but not beyond that.
diff -Nru elan-1.3.1/debian/changelog elan-1.3.1/debian/changelog
--- elan-1.3.1/debian/changelog 2022-02-24 04:54:40.000000000 +0000
+++ elan-1.3.1/debian/changelog 2022-06-23 13:14:20.000000000 +0000
@@ -1,3 +1,14 @@
+elan (1.3.1-3.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix dependencies (Closes: 1012284)
+ + update cargo dependencies on remove_dir_all to allow 0.7
+ + update cargo dependencies on sha2 to allow version 0.10
+ + update cargo dependency on wait-timeout to allow version 0.2
+ + fix debian dependency on time so it can't be satisfied by time-0.1
package.
+
+ -- Peter Michael Green <plugw...@debian.org> Thu, 23 Jun 2022 13:14:20 +0000
+
elan (1.3.1-3) unstable; urgency=medium
* Update dependency patch for rand 0.8.3
diff -Nru elan-1.3.1/debian/control elan-1.3.1/debian/control
--- elan-1.3.1/debian/control 2022-01-27 08:26:12.000000000 +0000
+++ elan-1.3.1/debian/control 2022-06-23 13:14:20.000000000 +0000
@@ -20,7 +20,7 @@
librust-tar-dev,
librust-tempfile-dev,
librust-term-dev,
- librust-time-dev,
+ librust-time-0.3+default-dev (>= 0.3.4),
librust-toml-dev,
librust-url-dev,
librust-wait-timeout-dev,
diff -Nru
elan-1.3.1/debian/patches/0003-Revert-feat-support-tar.zst-archives.patch
elan-1.3.1/debian/patches/0003-Revert-feat-support-tar.zst-archives.patch
--- elan-1.3.1/debian/patches/0003-Revert-feat-support-tar.zst-archives.patch
2022-02-24 04:53:47.000000000 +0000
+++ elan-1.3.1/debian/patches/0003-Revert-feat-support-tar.zst-archives.patch
2022-06-02 22:59:07.000000000 +0000
@@ -11,10 +11,10 @@
src/elan-dist/src/manifestation.rs | 25 +++++++++++-----------
5 files changed, 15 insertions(+), 70 deletions(-)
-diff --git a/Cargo.lock b/Cargo.lock
-index 8b600ee..74a7d41 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
+Index: elan-1.3.1/Cargo.lock
+===================================================================
+--- elan-1.3.1.orig/Cargo.lock
++++ elan-1.3.1/Cargo.lock
@@ -394,7 +394,6 @@ dependencies = [
"winapi 0.3.9",
"winreg 0.8.0",
@@ -23,11 +23,10 @@
]
[[package]]
-@@ -777,15 +776,6 @@ version = "0.4.8"
- source = "registry+https://github.com/rust-lang/crates.io-index";
+@@ -778,15 +777,6 @@ source = "registry+https://github.com/ru
checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
--[[package]]
+ [[package]]
-name = "jobserver"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index";
@@ -36,9 +35,10 @@
- "libc",
-]
-
- [[package]]
+-[[package]]
name = "js-sys"
version = "0.3.55"
+ source = "registry+https://github.com/rust-lang/crates.io-index";
@@ -1873,32 +1863,3 @@ dependencies = [
"thiserror",
"time 0.1.43",
@@ -72,10 +72,10 @@
- "cc",
- "libc",
-]
-diff --git a/src/elan-dist/Cargo.toml b/src/elan-dist/Cargo.toml
-index 576f7bf..2bba186 100644
---- a/src/elan-dist/Cargo.toml
-+++ b/src/elan-dist/Cargo.toml
+Index: elan-1.3.1/src/elan-dist/Cargo.toml
+===================================================================
+--- elan-1.3.1.orig/src/elan-dist/Cargo.toml
++++ elan-1.3.1/src/elan-dist/Cargo.toml
@@ -14,7 +14,6 @@ itertools = "0.10.0"
url = "2.2.1"
tar = "0.4.33"
@@ -83,11 +83,11 @@
-zstd = "0.9"
walkdir = "2.3.1"
toml = "0.5.8"
- sha2 = "^0.9.2"
-diff --git a/src/elan-dist/src/component/package.rs
b/src/elan-dist/src/component/package.rs
-index c51e76d..8f70d4a 100644
---- a/src/elan-dist/src/component/package.rs
-+++ b/src/elan-dist/src/component/package.rs
+ sha2 = ">= 0.9.2, <0.11"
+Index: elan-1.3.1/src/elan-dist/src/component/package.rs
+===================================================================
+--- elan-1.3.1.orig/src/elan-dist/src/component/package.rs
++++ elan-1.3.1/src/elan-dist/src/component/package.rs
@@ -4,7 +4,6 @@
extern crate filetime;
@@ -96,10 +96,15 @@
extern crate tar;
use errors::*;
-@@ -145,18 +144,3 @@ impl<'a> TarGzPackage<'a> {
- Self::unpack(file, into)
+@@ -140,21 +139,6 @@ impl<'a> TarGzPackage<'a> {
+
+ TarPackage::unpack(stream, path)
}
- }
+- pub fn unpack_file(path: &Path, into: &Path) -> Result<()> {
+- let file = File::open(path).chain_err(||
ErrorKind::ExtractingPackage)?;
+- Self::unpack(file, into)
+- }
+-}
-
-#[derive(Debug)]
-pub struct TarZstdPackage<'a>(TarPackage<'a>);
@@ -110,15 +115,13 @@
-
- TarPackage::unpack(stream, path)
- }
-- pub fn unpack_file(path: &Path, into: &Path) -> Result<()> {
-- let file = File::open(path).chain_err(||
ErrorKind::ExtractingPackage)?;
-- Self::unpack(file, into)
-- }
--}
-diff --git a/src/elan-dist/src/download.rs b/src/elan-dist/src/download.rs
-index bd6cf92..7737958 100644
---- a/src/elan-dist/src/download.rs
-+++ b/src/elan-dist/src/download.rs
+ pub fn unpack_file(path: &Path, into: &Path) -> Result<()> {
+ let file = File::open(path).chain_err(||
ErrorKind::ExtractingPackage)?;
+ Self::unpack(file, into)
+Index: elan-1.3.1/src/elan-dist/src/download.rs
+===================================================================
+--- elan-1.3.1.orig/src/elan-dist/src/download.rs
++++ elan-1.3.1/src/elan-dist/src/download.rs
@@ -99,9 +99,9 @@ impl<'a> DownloadCfg<'a> {
Ok(())
}
@@ -131,10 +134,10 @@
utils::download_file(&url, &file, None, &|n|
(self.notify_handler)(n.into()))?;
-diff --git a/src/elan-dist/src/manifestation.rs
b/src/elan-dist/src/manifestation.rs
-index 8f62580..ca31b69 100644
---- a/src/elan-dist/src/manifestation.rs
-+++ b/src/elan-dist/src/manifestation.rs
+Index: elan-1.3.1/src/elan-dist/src/manifestation.rs
+===================================================================
+--- elan-1.3.1.orig/src/elan-dist/src/manifestation.rs
++++ elan-1.3.1/src/elan-dist/src/manifestation.rs
@@ -1,6 +1,6 @@
//! Manifest a particular Lean version by installing it from a distribution
server.
diff -Nru elan-1.3.1/debian/patches/dependencies.patch
elan-1.3.1/debian/patches/dependencies.patch
--- elan-1.3.1/debian/patches/dependencies.patch 2022-02-24
04:53:47.000000000 +0000
+++ elan-1.3.1/debian/patches/dependencies.patch 2022-06-23
13:14:20.000000000 +0000
@@ -9,10 +9,10 @@
src/elan-utils/Cargo.toml | 15 +++++----------
3 files changed, 15 insertions(+), 30 deletions(-)
-diff --git a/Cargo.toml b/Cargo.toml
-index f9f77c9..708bae1 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
+Index: elan-1.3.1/Cargo.toml
+===================================================================
+--- elan-1.3.1.orig/Cargo.toml
++++ elan-1.3.1/Cargo.toml
@@ -32,30 +32,25 @@ error-chain = "0.12.4"
itertools = "0.10.0"
libc = "0.2.82"
@@ -21,23 +21,24 @@
+rand = "^0.8.2"
regex = "1.4.3"
-remove_dir_all = "0.6.1"
-+remove_dir_all = "^0.5.2"
++remove_dir_all = ">= 0.5.2, < 0.8.0"
same-file = "1.0.6"
scopeguard = "1.1.0"
serde = "1.0.119"
serde_derive = "1.0.119"
-serde_json = "1.0.61"
-+serde_json = "^1.0.41"
- sha2 = "0.9.2"
+-sha2 = "0.9.2"
-tempfile = "3.2.0"
-term = "0.7.0"
++serde_json = "^1.0.41"
++sha2 = ">= 0.9.2, < 0.11.0"
+tempfile = "^3.1.0"
+term = "^0.5.2"
time = "0.3.4"
toml = "0.5.8"
url = "2.2.0"
-wait-timeout = "0.2.0"
-+wait-timeout = "^0.1.5"
++wait-timeout = ">= 0.1.5, < 0.3"
zip = "0.5.9"
tar = ">=0.4.36"
flate2 = "1.0.14"
@@ -51,10 +52,10 @@
[workspace]
members = ["src/download", "src/elan-dist", "src/elan-utils"]
-diff --git a/src/elan-dist/Cargo.toml b/src/elan-dist/Cargo.toml
-index 319468e..576f7bf 100644
---- a/src/elan-dist/Cargo.toml
-+++ b/src/elan-dist/Cargo.toml
+Index: elan-1.3.1/src/elan-dist/Cargo.toml
+===================================================================
+--- elan-1.3.1.orig/src/elan-dist/Cargo.toml
++++ elan-1.3.1/src/elan-dist/Cargo.toml
@@ -11,25 +11,20 @@ license = "MIT OR Apache-2.0"
[dependencies]
regex = "1.4.3"
@@ -68,8 +69,8 @@
toml = "0.5.8"
-sha2 = "0.9.3"
-remove_dir_all = "0.7.0"
-+sha2 = "^0.9.2"
-+remove_dir_all = "^0.5.2"
++sha2 = ">= 0.9.2, <0.11"
++remove_dir_all = ">= 0.5.2, <0.8"
elan-utils = { path = "../elan-utils" }
error-chain = "0.12.4"
-json = "0.12.4"
@@ -84,10 +85,10 @@
[target."cfg(not(windows))".dependencies]
libc = "0.2.88"
-diff --git a/src/elan-utils/Cargo.toml b/src/elan-utils/Cargo.toml
-index 19ed717..dc3aa11 100644
---- a/src/elan-utils/Cargo.toml
-+++ b/src/elan-utils/Cargo.toml
+Index: elan-1.3.1/src/elan-utils/Cargo.toml
+===================================================================
+--- elan-1.3.1.orig/src/elan-utils/Cargo.toml
++++ elan-1.3.1/src/elan-utils/Cargo.toml
@@ -11,19 +11,14 @@ license = "MIT OR Apache-2.0"
download = { path = "../download" }
error-chain = "0.12.4"
@@ -95,12 +96,12 @@
-rand = "0.8.3"
-remove_dir_all = "0.7.0"
+rand = "^0.8.3"
-+remove_dir_all = "^0.5.2"
++remove_dir_all = ">= 0.5.2, <0.8"
scopeguard = "1.1.0"
-semver = "0.11.0"
-sha2 = "0.9.3"
+semver = "0.9.0"
-+sha2 = "0.9.2"
++sha2 = ">= 0.9.2, < 0.11"
toml = "0.5.8"
url = "2.2.1"
curl = "0.4.34"
