Source: stgit
Version: 2.6.1-1.3
Severity: serious
Tags: patch
User: [email protected]
Usertags: gix-0.90 winnow-1
X-Debbugs-Cc: [email protected]

Dear maintainer,

I have prepared a gix transition to 0.90 and a winnow transition to 1, which 
has been uploaded.

stgit build-depends on librust-gix-dev (>= 0.89), librust-gix-dev (<< 0.90), so 
0.90 is rejected. It also pins winnow 0.7.

I have attached a debdiff fixing this.

Best regards,
Simon Quigley
[email protected]
diff -Nru stgit-2.6.1/debian/changelog stgit-2.6.1/debian/changelog
--- stgit-2.6.1/debian/changelog        2026-10-16 15:54:57.000000000 -0500
+++ stgit-2.6.1/debian/changelog        2026-11-15 18:00:44.000000000 -0600
@@ -1,3 +1,11 @@
+stgit (2.6.1-1.4) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Build against winnow 1.
+  * Allow gix 0.90.
+
+ -- Simon Quigley <[email protected]>  Sun, 15 Nov 2026 18:00:44 -0600
+
 stgit (2.6.1-1.3) unstable; urgency=medium
 
   * Non-maintainer upload (Closes: #1150661).
diff -Nru stgit-2.6.1/debian/control stgit-2.6.1/debian/control
--- stgit-2.6.1/debian/control  2026-10-16 15:54:06.000000000 -0500
+++ stgit-2.6.1/debian/control  2026-11-13 10:56:16.000000000 -0600
@@ -24,8 +24,8 @@
  librust-curl-dev,
  librust-encoding-rs-dev,
  librust-flate2-dev,
- librust-gix-dev (>= 0.89),
- librust-gix-dev (<< 0.90),
+ librust-gix-dev (>= 0.90),
+ librust-gix-dev (<< 0.91),
  librust-indexmap-dev,
  librust-is-terminal-dev,
  librust-jiff-dev (>= 0.2.1),
@@ -36,7 +36,7 @@
  librust-tempfile-dev,
  librust-termcolor-dev,
  librust-thiserror-dev,
- librust-winnow-dev (>= 0.7),
+ librust-winnow-dev (>= 1),
 Standards-Version: 4.7.4
 Homepage: https://github.com/stacked-git/stgit
 Vcs-Browser: https://salsa.debian.org/debian/stgit
diff -Nru stgit-2.6.1/debian/patches/gix-0.90.patch 
stgit-2.6.1/debian/patches/gix-0.90.patch
--- stgit-2.6.1/debian/patches/gix-0.90.patch   1969-12-31 18:00:00.000000000 
-0600
+++ stgit-2.6.1/debian/patches/gix-0.90.patch   2026-11-13 10:56:17.000000000 
-0600
@@ -0,0 +1,17 @@
+Description: Allow gix 0.90
+Author: Simon Quigley <[email protected]>
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2026-11-13
+---
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -43,7 +43,7 @@ clap = { version = "~4.6", default-featu
+ ctrlc = "3.4"
+ encoding_rs = "0.8"
+ flate2 = "1"
+-gix = { version = "0.89", default-features = false, features = [
++gix = { version = "0.90", default-features = false, features = [
+   "command",
+   "revision",
+   "sha1",
diff -Nru stgit-2.6.1/debian/patches/series stgit-2.6.1/debian/patches/series
--- stgit-2.6.1/debian/patches/series   2026-10-16 15:54:16.000000000 -0500
+++ stgit-2.6.1/debian/patches/series   2026-11-13 10:56:17.000000000 -0600
@@ -1,7 +1,7 @@
 use_editor_as_default
 disable_interactive_test
 use_bzip2_crate
-use_winnow_0_7
 gix-0.87.patch
 reject-lone-at-partial-ref.patch
 gix-0.89.patch
+gix-0.90.patch
diff -Nru stgit-2.6.1/debian/patches/use_winnow_0_7 
stgit-2.6.1/debian/patches/use_winnow_0_7
--- stgit-2.6.1/debian/patches/use_winnow_0_7   2026-10-08 20:39:58.000000000 
-0500
+++ stgit-2.6.1/debian/patches/use_winnow_0_7   1969-12-31 18:00:00.000000000 
-0600
@@ -1,23 +0,0 @@
-Description: Downgrade winnow dependency from 1.0 to 0.7
- winnow 1.0 introduced optional feature gates for the ascii and parser
- combinator modules, but stgit does not need any 1.0-specific APIs.
- All APIs used by stgit (ModalResult, ContextError, ErrMode, the combinator
- and ascii modules, 
Stream::iter_offsets/next_token/next_slice/checkpoint/reset)
- are present in winnow 0.7, which is the version packaged in Debian as
- librust-winnow-dev.
-Forwarded: no
-Last-Update: 2026-06-06
-
-Index: stgit/Cargo.toml
-===================================================================
---- stgit.orig/Cargo.toml
-+++ stgit/Cargo.toml
-@@ -58,7 +58,7 @@ tar = "0.4"
- tempfile = "3"
- termcolor = "1.4"
- thiserror = "~2.0"
--winnow = "1.0"
-+winnow = "0.7"
- 
- curl = { version = "0.4", optional = true }
- 

Attachment: OpenPGP_signature.asc
Description: OpenPGP digital signature

Reply via email to