Package: elan

I hope to update the rust-zip package to the latest upstream version soon,
elan requires a tweak to it's cargo dependencies to build with the new
version.

While working on this I discovered that elan fails to build if
librust-semver-dev is installed. The debian dependencies of the
package depend on the librust-semver-0.9-dev package, but the
Cargo dependencies allow either version. I tightened the cargo
dependencies to fix this.

debdiff is attatched, I may NMU this later.
diff -Nru elan-4.1.2/debian/changelog elan-4.1.2/debian/changelog
--- elan-4.1.2/debian/changelog 2025-09-16 02:01:57.000000000 +0000
+++ elan-4.1.2/debian/changelog 2025-09-16 18:22:02.000000000 +0000
@@ -1,3 +1,12 @@
+elan (4.1.2-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Relax cargo dependency on zip to allow for upcoming update.
+  * Tighten cargo dependency on elan to avoid FTBFS if both 
+    0.9 and 1.x are installed.
+
+ -- Peter Michael Green <[email protected]>  Tue, 16 Sep 2025 18:22:02 +0000
+
 elan (4.1.2-1) unstable; urgency=medium
 
   * Import new upstream version (4.1.2)
diff -Nru elan-4.1.2/debian/patches/dependencies.patch 
elan-4.1.2/debian/patches/dependencies.patch
--- elan-4.1.2/debian/patches/dependencies.patch        2025-09-16 
01:38:09.000000000 +0000
+++ elan-4.1.2/debian/patches/dependencies.patch        2025-09-16 
18:22:02.000000000 +0000
@@ -1,6 +1,8 @@
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -30,15 +30,15 @@
+Index: elan-4.1.2/Cargo.toml
+===================================================================
+--- elan-4.1.2.orig/Cargo.toml
++++ elan-4.1.2/Cargo.toml
+@@ -30,15 +30,15 @@ elan-utils = { path = "src/elan-utils" }
  download = { path = "src/download" }
  clap = "2.33.3"
  error-chain = "0.12.4"
@@ -15,13 +17,24 @@
  same-file = "1.0.6"
  scopeguard = "1.1.0"
 -semver = "1.0.23"
-+semver = ">= 0.9.0"
++semver = "0.9.0"
  serde = "1.0.119"
  serde_derive = "1.0.119"
  serde_json = "1.0.61"
---- a/src/elan-dist/Cargo.toml
-+++ b/src/elan-dist/Cargo.toml
-@@ -11,11 +11,11 @@
+@@ -48,7 +48,7 @@ time = "0.3.4"
+ toml = "0.5.8"
+ url = "2.2.0"
+ wait-timeout = "0.2.0"
+-zip = "2.5.0"
++zip = ">=2.5.0"
+ tar = ">=0.4.36"
+ flate2 = "1.0.14"
+ json = "0.12.4"
+Index: elan-4.1.2/src/elan-dist/Cargo.toml
+===================================================================
+--- elan-4.1.2.orig/src/elan-dist/Cargo.toml
++++ elan-4.1.2/src/elan-dist/Cargo.toml
+@@ -11,17 +11,17 @@ license = "MIT OR Apache-2.0"
  
  [dependencies]
  regex = "1.4.3"
@@ -35,14 +48,23 @@
  toml = "0.5.8"
  remove_dir_all = "0.8.0"
  elan-utils = { path = "../elan-utils" }
---- a/src/elan-utils/Cargo.toml
-+++ b/src/elan-utils/Cargo.toml
-@@ -15,13 +15,13 @@
+ error-chain = "0.12.4"
+ json = "0.12.4"
+-zip = "2.5.0"
++zip = ">=2.5.0"
+ filetime = "0.2.14"
+ time = "0.3"
+ serde = "1.0.119"
+Index: elan-4.1.2/src/elan-utils/Cargo.toml
+===================================================================
+--- elan-4.1.2.orig/src/elan-utils/Cargo.toml
++++ elan-4.1.2/src/elan-utils/Cargo.toml
+@@ -15,13 +15,13 @@ libc = "0.2.88"
  rand = "0.8.3"
  remove_dir_all = "0.8.0"
  scopeguard = "1.1.0"
 -semver = "0.11.0"
-+semver = ">= 0.9.0"
++semver = "0.9.0"
  toml = "0.5.8"
  url = "2.2.1"
  curl = "0.4.34"

Reply via email to