Bug#1115432: gnome-authenticator - upcoming rust-zip update

[Peter Green]

Package: gnome-authenticator

I hope to update rust-zip to the latest upstream version soon,
gnome-authenticator needs some dependency adjustments
(both Debian and Cargo) to build with the new version.

Debdiff is attatched, I may NMU this later.
-------------- next part --------------
diff -Nru gnome-authenticator-4.6.2/debian/changelog gnome-authenticator-4.6.2/debian/changelog
--- gnome-authenticator-4.6.2/debian/changelog	2025-09-15 03:55:32.000000000 +0000
+++ gnome-authenticator-4.6.2/debian/changelog	2025-09-16 20:04:41.000000000 +0000
@@ -1,3 +1,10 @@
+gnome-authenticator (4.6.2-7.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Relax dependencies on rust-zip.
+
+ -- Peter Michael Green <plugwash at debian.org>  Tue, 16 Sep 2025 20:04:41 +0000
+
 gnome-authenticator (4.6.2-7) unstable; urgency=medium
 
   * Cherry-pick patch to build with rust-gtk4 0.10 etc
diff -Nru gnome-authenticator-4.6.2/debian/control gnome-authenticator-4.6.2/debian/control
--- gnome-authenticator-4.6.2/debian/control	2025-09-15 03:55:32.000000000 +0000
+++ gnome-authenticator-4.6.2/debian/control	2025-09-16 20:04:41.000000000 +0000
@@ -66,8 +66,10 @@
  librust-uuid-1+v4-dev (>= 1.10-~~),
  librust-zeroize-1+default-dev,
  librust-zeroize-1+zeroize-derive-dev,
- librust-zip-2+aes-crypto-dev (>= 2.1-~~),
- librust-zip-2+default-dev (>= 2.1-~~)
+ librust-zip+aes-crypto-dev (>= 2.1-~~),
+ librust-zip+default-dev (>= 2.1-~~),
+ librust-zip+aes-crypto-dev (<< 6),
+ librust-zip+default-dev (<< 6)
 Standards-Version: 4.7.2
 Homepage: https://apps.gnome.org/Authenticator/
 Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-authenticator
diff -Nru gnome-authenticator-4.6.2/debian/patches/0003-Relax-dependency-versions.patch gnome-authenticator-4.6.2/debian/patches/0003-Relax-dependency-versions.patch
--- gnome-authenticator-4.6.2/debian/patches/0003-Relax-dependency-versions.patch	2025-09-15 03:55:32.000000000 +0000
+++ gnome-authenticator-4.6.2/debian/patches/0003-Relax-dependency-versions.patch	2025-09-16 20:04:41.000000000 +0000
@@ -8,10 +8,10 @@
  favicon-scrapper/Cargo.toml |  2 +-
  2 files changed, 7 insertions(+), 7 deletions(-)
 
-diff --git a/Cargo.toml b/Cargo.toml
-index e38f24d..6ac0823 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
+Index: gnome-authenticator-4.6.2/Cargo.toml
+===================================================================
+--- gnome-authenticator-4.6.2.orig/Cargo.toml
++++ gnome-authenticator-4.6.2/Cargo.toml
 @@ -18,7 +18,7 @@ aes-gcm = "0.10"
  anyhow = "1.0"
  aperture = "0.9"
@@ -21,7 +21,7 @@
  diesel = {version = "2.0", features = ["sqlite", "r2d2"]}
  diesel_migrations = {version = "2.0", features = ["sqlite"]}
  favicon-scrapper = {path = "./favicon-scrapper"}
-@@ -29,23 +29,23 @@ gettext-rs = {version = "0.7", features = ["gettext-system"]}
+@@ -29,25 +29,25 @@ gettext-rs = {version = "0.7", features
  gtk = {package = "gtk4", version = "0.9", features = ["v4_10"]}
  hex = {version = "0.4.3", features = ["serde"]}
  image = {version = "0.25", default-features = false, features = ["png"]}
@@ -48,12 +48,15 @@
 -uuid = {version = "1.13", features = ["v4"]}
 +uuid = {version = "1.10", features = ["v4"]}
  zeroize = {version = "1", features = ["zeroize_derive"]}
- zip = { version = "2.1", features = ["aes-crypto"] }
+-zip = { version = "2.1", features = ["aes-crypto"] }
++zip = { version = ">= 2.1, < 6", features = ["aes-crypto"] }
  
-diff --git a/favicon-scrapper/Cargo.toml b/favicon-scrapper/Cargo.toml
-index 949dbce..348bb47 100644
---- a/favicon-scrapper/Cargo.toml
-+++ b/favicon-scrapper/Cargo.toml
+ [profile.dev.package.rqrr]
+ opt-level = 3
+Index: gnome-authenticator-4.6.2/favicon-scrapper/Cargo.toml
+===================================================================
+--- gnome-authenticator-4.6.2.orig/favicon-scrapper/Cargo.toml
++++ gnome-authenticator-4.6.2/favicon-scrapper/Cargo.toml
 @@ -7,7 +7,7 @@ name = "favicon-scrapper"
  data-encoding = "2.3"
  image = {version = "0.25", features = ["ico", "png"], default-features = false}