Package: fontship
Version: 0.10.1+ds-3
Tags: patch

I hope to update rust-console and rust-indicatif to the latest
versions soon. Fontship needs a small dependency patch to build
with the new versions.

diff -Nru fontship-0.10.1+ds/debian/changelog 
fontship-0.10.1+ds/debian/changelog
--- fontship-0.10.1+ds/debian/changelog 2026-08-29 10:04:00.000000000 +0000
+++ fontship-0.10.1+ds/debian/changelog 2026-09-29 19:05:36.000000000 +0000
@@ -1,3 +1,10 @@
+fontship (0.10.1+ds-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Relax cargo dependencies on console and indicatif.
+
+ -- Peter Michael Green <[email protected]>  Tue, 29 Sep 2026 19:05:36 +0000
+
 fontship (0.10.1+ds-3) unstable; urgency=medium
 
   * Debianization:
diff -Nru fontship-0.10.1+ds/debian/patches/debianization.patch 
fontship-0.10.1+ds/debian/patches/debianization.patch
--- fontship-0.10.1+ds/debian/patches/debianization.patch       2026-08-29 
09:29:12.000000000 +0000
+++ fontship-0.10.1+ds/debian/patches/debianization.patch       2026-09-29 
19:05:36.000000000 +0000
@@ -6,13 +6,17 @@
 Author: Jerome Benoit <[email protected]>
 Last-Update: 2026-08-21
 
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -15,16 +15,16 @@
+Index: fontship-0.10.1+ds/Cargo.toml
+===================================================================
+--- fontship-0.10.1+ds.orig/Cargo.toml
++++ fontship-0.10.1+ds/Cargo.toml
+@@ -14,17 +14,17 @@ build = "build-aux/build.rs"
+ lto = true
  
  [dependencies]
- console = "0.15"
+-console = "0.15"
 -fluent = "0.16"
++console = ">= 0.15"
 +fluent = "0.17"
  fluent-fallback = "0.7"
  fluent-langneg = "0.13"
@@ -28,7 +32,7 @@
  subprocess = "0.2"
  unic-langid = "0.9"
  unic-langid-impl = "0.9"
-@@ -39,12 +39,12 @@
+@@ -39,15 +39,15 @@ version = "4.5"
  features = ["derive", "wrap_help"]
  
  [dependencies.git2]
@@ -44,8 +48,12 @@
 +##default-features = false
  
  [dependencies.indicatif]
- version = "0.17"
-@@ -60,7 +60,7 @@
+-version = "0.17"
++version = ">= 0.17"
+ features = ["improved_unicode", "rayon"]
+ 
+ [dependencies.Inflector]
+@@ -60,7 +60,7 @@ default-features = false
  features = ["std"]
  
  [build-dependencies.clap_mangen]
@@ -54,7 +62,7 @@
  
  [build-dependencies.clap]
  version = "4.5"
-@@ -70,9 +70,9 @@
+@@ -70,9 +70,9 @@ features = ["derive"]
  version = "4.5"
  
  [build-dependencies.vergen]
@@ -66,9 +74,11 @@
  
  [package.metadata.typos.default]
  locale = "en-us"
---- a/build-aux/build.rs
-+++ b/build-aux/build.rs
-@@ -21,7 +21,9 @@
+Index: fontship-0.10.1+ds/build-aux/build.rs
+===================================================================
+--- fontship-0.10.1+ds.orig/build-aux/build.rs
++++ fontship-0.10.1+ds/build-aux/build.rs
+@@ -21,7 +21,9 @@ fn main() {
      if let Ok(val) = env::var("VERSION_FROM_AUTOTOOLS") {
          println!("cargo:rustc-env=VERGEN_GIT_DESCRIBE={val}")
      } else {
@@ -78,9 +88,11 @@
      };
      builder.emit().expect("Unable to generate the cargo keys!");
      pass_on_configure_details();
---- a/src/setup/mod.rs
-+++ b/src/setup/mod.rs
-@@ -7,7 +7,7 @@
+Index: fontship-0.10.1+ds/src/setup/mod.rs
+===================================================================
+--- fontship-0.10.1+ds.orig/src/setup/mod.rs
++++ fontship-0.10.1+ds/src/setup/mod.rs
+@@ -7,7 +7,7 @@ use crate::*;
  
  use console::style;
  use git2::{Repository, Status};
@@ -89,7 +101,7 @@
  use std::io::prelude::*;
  use std::sync::{Arc, RwLock};
  use std::{fs, io, path};
-@@ -182,6 +182,7 @@
+@@ -182,6 +182,7 @@ fn regen_gitignore(repo: Repository) ->
  }
  
  fn warp_time(repo: Repository) -> Result<()> {
@@ -97,7 +109,7 @@
      let opts = git_warp_time::Options::new();
      let text = LocalText::new("setup-warp-time").fmt();
      eprintln!("{} {}", style("┠┄").cyan(), text);
-@@ -198,6 +199,7 @@
+@@ -198,6 +199,7 @@ fn warp_time(repo: Repository) -> Result
          }
          false => {}
      }
@@ -105,9 +117,11 @@
      Ok(())
  }
  
---- a/build-aux/que_rust_boilerplate.am
-+++ b/build-aux/que_rust_boilerplate.am
-@@ -12,7 +12,7 @@
+Index: fontship-0.10.1+ds/build-aux/que_rust_boilerplate.am
+===================================================================
+--- fontship-0.10.1+ds.orig/build-aux/que_rust_boilerplate.am
++++ fontship-0.10.1+ds/build-aux/que_rust_boilerplate.am
+@@ -12,7 +12,7 @@ CARGO_RELEASE_ARGS += --release --locked
  endif
  
  CARGO_ENV = CARGO_TARGET_DIR=@builddir@/target
@@ -116,9 +130,11 @@
  _RUST_OUT = @builddir@/target/@RUST_TARGET_SUBDIR@/.cargo_out_dir
  
  distclean-local: distclean-local-rust
---- a/configure.ac
-+++ b/configure.ac
-@@ -15,6 +15,7 @@
+Index: fontship-0.10.1+ds/configure.ac
+===================================================================
+--- fontship-0.10.1+ds.orig/configure.ac
++++ fontship-0.10.1+ds/configure.ac
+@@ -15,6 +15,7 @@ QUE_DIST_CHECKSUMS
  AC_PROG_AWK
  AC_PROG_GREP
  AC_PROG_SED
@@ -126,7 +142,7 @@
  QUE_PROGVAR([cmp])
  QUE_PROGVAR([find])
  QUE_PROGVAR([jq])
-@@ -49,7 +50,7 @@
+@@ -49,7 +50,7 @@ AM_COND_IF([DEPENDENCY_CHECKS], [
      QUE_PROGVAR([ttx])
      QUE_PROGVAR([ufonormalizer])
      QUE_PROGVAR([woff2_compress])
@@ -135,9 +151,11 @@
  
      AM_PATH_PYTHON([3.6])
      AX_PYTHON_MODULE(babelfont, true)
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -12,7 +12,7 @@
+Index: fontship-0.10.1+ds/Makefile.am
+===================================================================
+--- fontship-0.10.1+ds.orig/Makefile.am
++++ fontship-0.10.1+ds/Makefile.am
+@@ -12,7 +12,7 @@ datadir = $(datarootdir)/$(TRANSFORMED_P
  pkgdatadir = $(datadir)
  
  dist_doc_DATA = README.md CHANGELOG.md

Reply via email to