diff -Nru btm-0.9.6/debian/changelog btm-0.9.6/debian/changelog --- btm-0.9.6/debian/changelog 2023-11-24 13:18:21.000000000 +0000 +++ btm-0.9.6/debian/changelog 2024-02-17 17:19:23.000000000 +0000 @@ -1,3 +1,21 @@ +btm (0.9.6-4) unstable; urgency=medium + + * drop patch 2001_serde_json.patch, + obsoleted by Debian package changes + * tighten build-dependency for crate ratatui + * drop patches 2001_fern.patch 2001_unicode-segmentation.patch, + obsoleted by Debian package changes; unfuzz patches + * drop patch 2001_backtrace, + obsoleted by Debian package changes + * update and unfuzz patches; + update DEP-3 headers + * add patch 2001_toml_edit + to accept newer branches of crate toml_edit; + relax build-dependency for crate toml_edit; + closes: bug#1064136, thanks to Paul Gevers + + -- Jonas Smedegaard Sat, 17 Feb 2024 18:19:23 +0100 + btm (0.9.6-3) unstable; urgency=medium * drop patches 2001_anyhow 2001_starship-battery 2001_crossterm.patch, diff -Nru btm-0.9.6/debian/control btm-0.9.6/debian/control --- btm-0.9.6/debian/control 2023-11-24 13:18:21.000000000 +0000 +++ btm-0.9.6/debian/control 2024-02-17 17:19:23.000000000 +0000 @@ -22,20 +22,16 @@ librust-fern-0.6+default-dev, librust-filedescriptor-0.8+default-dev, librust-hashbrown-dev (<< 0.15), - librust-hashbrown-dev (>= 0.12), librust-humantime-2+default-dev, librust-indexmap-dev (<< 3), - librust-indexmap-dev (>= 1.9.3), librust-itertools-dev (<< 0.12), - librust-itertools-dev (>= 0.10.5), librust-kstring-2+arc-dev, librust-kstring-2+default-dev, librust-libc-0.2+default-dev, librust-log-0.4+default-dev, librust-nvml-wrapper-0.9+default-dev, librust-once-cell-1+default-dev, - librust-ratatui-dev (>= 0.22), - librust-ratatui-dev (<< 0.24), + librust-ratatui-0.23+default-dev, librust-regex-1+default-dev, librust-rustix-0.38+default-dev, librust-rustix-0.38+fs-dev, @@ -46,15 +42,12 @@ librust-serde-json-1+default-dev, librust-starship-battery-0.8+default-dev, librust-sysctl-dev (<< 0.6), - librust-sysctl-dev (>= 0.4.4), librust-sysinfo-dev (<< 0.30), - librust-sysinfo-dev (>= 0.28.4), librust-thiserror-1+default-dev, librust-time-0.3+default-dev, librust-time-0.3+formatting-dev, librust-time-0.3+macros-dev, - librust-toml-edit-0.19+default-dev, - librust-toml-edit-0.19+serde-dev, + librust-toml-edit-dev (<< 0.22), librust-unicode-segmentation-1+default-dev, librust-unicode-width-0.1+default-dev, librust-assert-cmd-2+default-dev, diff -Nru btm-0.9.6/debian/copyright_hints btm-0.9.6/debian/copyright_hints --- btm-0.9.6/debian/copyright_hints 2023-11-24 13:18:21.000000000 +0000 +++ btm-0.9.6/debian/copyright_hints 2024-02-17 17:19:23.000000000 +0000 @@ -21,17 +21,14 @@ debian/manpages debian/patches/1001_ratatui.patch debian/patches/1001_serde.patch - debian/patches/2001_backtrace.patch + debian/patches/1001_toml_edit.patch debian/patches/2001_cargo_husky.patch - debian/patches/2001_fern.patch debian/patches/2001_hashbrown.patch debian/patches/2001_indexmap.patch debian/patches/2001_itertools.patch - debian/patches/2001_serde_json.patch debian/patches/2001_sysctl.patch debian/patches/2001_sysinfo.patch debian/patches/2001_time.patch - debian/patches/2001_unicode-segmentation.patch debian/patches/2002_no_mac.patch debian/patches/2002_no_windows.patch debian/patches/README diff -Nru btm-0.9.6/debian/patches/1001_ratatui.patch btm-0.9.6/debian/patches/1001_ratatui.patch --- btm-0.9.6/debian/patches/1001_ratatui.patch 2023-11-24 13:18:21.000000000 +0000 +++ btm-0.9.6/debian/patches/1001_ratatui.patch 2024-02-17 17:19:23.000000000 +0000 @@ -1,6 +1,6 @@ -Description: extend dependency to match newer releases of crate ratatui +Description: accept newer branch of crate ratatui Author: Jonas Smedegaard -Last-Update: 2023-11-24 +Last-Update: 2024-02-17 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/Cargo.toml @@ -10,7 +10,7 @@ time = { version = "0.3.26", features = ["formatting", "macros"] } toml_edit = { version = "0.19.14", features = ["serde"] } -tui = { version = "0.22.0", package = "ratatui" } -+tui = { version = ">= 0.22, < 0.24", package = "ratatui" } ++tui = { version = ">= 0.22, <= 0.23", package = "ratatui" } unicode-segmentation = "1.10.1" unicode-width = "0.1.10" diff -Nru btm-0.9.6/debian/patches/1001_serde.patch btm-0.9.6/debian/patches/1001_serde.patch --- btm-0.9.6/debian/patches/1001_serde.patch 2023-11-09 21:57:37.000000000 +0000 +++ btm-0.9.6/debian/patches/1001_serde.patch 2024-02-17 17:19:23.000000000 +0000 @@ -1,6 +1,6 @@ -Description: extend dependency to match newer releases of crate serde +Description: accept newer releases of crate serde Author: Jonas Smedegaard -Last-Update: 2023-11-09 +Last-Update: 2024-02-17 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/Cargo.toml diff -Nru btm-0.9.6/debian/patches/1001_toml_edit.patch btm-0.9.6/debian/patches/1001_toml_edit.patch --- btm-0.9.6/debian/patches/1001_toml_edit.patch 1970-01-01 00:00:00.000000000 +0000 +++ btm-0.9.6/debian/patches/1001_toml_edit.patch 2024-02-17 17:19:23.000000000 +0000 @@ -0,0 +1,17 @@ +Description: accept newer branches of crate toml_edit +Author: Jonas Smedegaard +Bug-Debian: https://bugs.debian.org/1064136 +Last-Update: 2024-02-17 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -98,7 +98,7 @@ + sysinfo = "=0.29.8" + thiserror = "1.0.47" + time = { version = "0.3.26", features = ["formatting", "macros"] } +-toml_edit = { version = "0.19.14", features = ["serde"] } ++toml_edit = { version = ">= 0.19.14, <= 0.21", features = ["serde"] } + tui = { version = ">= 0.22, <= 0.23", package = "ratatui" } + unicode-segmentation = "1.10.1" + unicode-width = "0.1.10" diff -Nru btm-0.9.6/debian/patches/2001_backtrace.patch btm-0.9.6/debian/patches/2001_backtrace.patch --- btm-0.9.6/debian/patches/2001_backtrace.patch 2023-11-13 11:11:39.000000000 +0000 +++ btm-0.9.6/debian/patches/2001_backtrace.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -Description: relax dependency to match older releases of crate backtrace -Author: Jonas Smedegaard -Bug-Debian: https://bugs.debian.org/1055090 -Forwarded: not-needed -Last-Update: 2023-10-31 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -75,7 +75,7 @@ - - [dependencies] - anyhow = "1.0.75" --backtrace = "0.3.69" -+backtrace = "0.3.68" - cfg-if = "1.0.0" - clap = { version = "4.3.23", features = ["default", "cargo", "wrap_help"] } - concat-string = "1.0.1" diff -Nru btm-0.9.6/debian/patches/2001_fern.patch btm-0.9.6/debian/patches/2001_fern.patch --- btm-0.9.6/debian/patches/2001_fern.patch 2023-10-31 12:11:48.000000000 +0000 +++ btm-0.9.6/debian/patches/2001_fern.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -Description: relax dependency to match older releases of crate fern -Author: Jonas Smedegaard -Bug-Debian: https://bugs.debian.org/1055091 -Forwarded: not-needed -Last-Update: 2023-10-31 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -83,7 +83,7 @@ - ctrlc = { version = "3.4.0", features = ["termination"] } - # dhat = "0.3.2" - dirs = "5.0.1" --fern = { version = "0.6.2", optional = true } -+fern = { version = "0.6.1", optional = true } - hashbrown = "0.14.0" - humantime = "2.1.0" - indexmap = "2.0.0" diff -Nru btm-0.9.6/debian/patches/2001_hashbrown.patch btm-0.9.6/debian/patches/2001_hashbrown.patch --- btm-0.9.6/debian/patches/2001_hashbrown.patch 2023-10-31 12:11:45.000000000 +0000 +++ btm-0.9.6/debian/patches/2001_hashbrown.patch 2024-02-17 17:19:23.000000000 +0000 @@ -1,8 +1,8 @@ -Description: relax dependency to match older releases of crate hashbrown +Description: accept older branches of crate hashbrown Author: Jonas Smedegaard Bug-Debian: https://bugs.debian.org/1055092 Forwarded: not-needed -Last-Update: 2023-10-31 +Last-Update: 2024-02-17 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/Cargo.toml @@ -10,9 +10,9 @@ @@ -84,7 +84,7 @@ # dhat = "0.3.2" dirs = "5.0.1" - fern = { version = "0.6.1", optional = true } + fern = { version = "0.6.2", optional = true } -hashbrown = "0.14.0" -+hashbrown = ">= 0.12.3, < 0.15" ++hashbrown = ">= 0.12.3, <= 0.14" humantime = "2.1.0" indexmap = "2.0.0" itertools = "0.11.0" diff -Nru btm-0.9.6/debian/patches/2001_indexmap.patch btm-0.9.6/debian/patches/2001_indexmap.patch --- btm-0.9.6/debian/patches/2001_indexmap.patch 2023-10-31 11:15:35.000000000 +0000 +++ btm-0.9.6/debian/patches/2001_indexmap.patch 2024-02-17 17:19:23.000000000 +0000 @@ -1,18 +1,18 @@ -Description: relax dependency to match older releases of crate indexmap +Description: accept older branch of crate indexmap Author: Jonas Smedegaard Bug-Debian: https://bugs.debian.org/1053953 Forwarded: not-needed -Last-Update: 2023-10-31 +Last-Update: 2024-02-17 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/Cargo.toml +++ b/Cargo.toml @@ -86,7 +86,7 @@ - fern = { version = "0.6.1", optional = true } - hashbrown = ">= 0.12.3, < 0.15" + fern = { version = "0.6.2", optional = true } + hashbrown = ">= 0.12.3, <= 0.14" humantime = "2.1.0" -indexmap = "2.0.0" -+indexmap = ">= 1.9.3, < 3" ++indexmap = ">= 1.9.3, <= 2" itertools = "0.11.0" kstring = { version = "2.0.0", features = ["arc"] } log = { version = "0.4.20", optional = true } diff -Nru btm-0.9.6/debian/patches/2001_itertools.patch btm-0.9.6/debian/patches/2001_itertools.patch --- btm-0.9.6/debian/patches/2001_itertools.patch 2023-10-31 11:16:41.000000000 +0000 +++ btm-0.9.6/debian/patches/2001_itertools.patch 2024-02-17 17:19:23.000000000 +0000 @@ -1,18 +1,18 @@ -Description: relax dependency to match older releases of crate itertools +Description: accept older branch of crate itertools Author: Jonas Smedegaard Bug-Debian: https://bugs.debian.org/1054075 Forwarded: not-needed -Last-Update: 2023-10-31 +Last-Update: 2024-02-17 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/Cargo.toml +++ b/Cargo.toml @@ -87,7 +87,7 @@ - hashbrown = ">= 0.12.3, < 0.15" + hashbrown = ">= 0.12.3, <= 0.14" humantime = "2.1.0" - indexmap = ">= 1.9.3, < 3" + indexmap = ">= 1.9.3, <= 2" -itertools = "0.11.0" -+itertools = ">= 0.10.5, < 0.12" ++itertools = ">= 0.10.5, <= 0.11" kstring = { version = "2.0.0", features = ["arc"] } log = { version = "0.4.20", optional = true } nvml-wrapper = { version = "0.9.0", optional = true } diff -Nru btm-0.9.6/debian/patches/2001_serde_json.patch btm-0.9.6/debian/patches/2001_serde_json.patch --- btm-0.9.6/debian/patches/2001_serde_json.patch 2023-10-31 12:11:38.000000000 +0000 +++ btm-0.9.6/debian/patches/2001_serde_json.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -Description: relax dependency to match older releases of crate serde_json -Author: Jonas Smedegaard -Bug-Debian: https://bugs.debian.org/1055093 -Forwarded: not-needed -Last-Update: 2023-10-31 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -125,7 +125,7 @@ - ] } - - [target.'cfg(target_os = "freebsd")'.dependencies] --serde_json = { version = "1.0.105" } -+serde_json = { version = "1.0.103" } - sysctl = { version = "0.5.4" } - filedescriptor = "0.8.2" - diff -Nru btm-0.9.6/debian/patches/2001_sysctl.patch btm-0.9.6/debian/patches/2001_sysctl.patch --- btm-0.9.6/debian/patches/2001_sysctl.patch 2023-10-31 12:11:32.000000000 +0000 +++ btm-0.9.6/debian/patches/2001_sysctl.patch 2024-02-17 17:19:23.000000000 +0000 @@ -1,8 +1,8 @@ -Description: relax dependency to match older releases of crate sysctl +Description: accept older bramch of crate sysctl Author: Jonas Smedegaard Bug-Debian: https://bugs.debian.org/1055095 Forwarded: not-needed -Last-Update: 2023-10-31 +Last-Update: 2024-02-17 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/Cargo.toml @@ -10,9 +10,9 @@ @@ -126,7 +126,7 @@ [target.'cfg(target_os = "freebsd")'.dependencies] - serde_json = { version = "1.0.103" } + serde_json = { version = "1.0.105" } -sysctl = { version = "0.5.4" } -+sysctl = { version = ">= 0.4.4, < 0.6" } ++sysctl = { version = ">= 0.4.4, <= 0.5" } filedescriptor = "0.8.2" [dev-dependencies] diff -Nru btm-0.9.6/debian/patches/2001_sysinfo.patch btm-0.9.6/debian/patches/2001_sysinfo.patch --- btm-0.9.6/debian/patches/2001_sysinfo.patch 2023-11-24 13:13:18.000000000 +0000 +++ btm-0.9.6/debian/patches/2001_sysinfo.patch 2024-02-17 17:19:23.000000000 +0000 @@ -1,8 +1,8 @@ -Description: relax dependency to match other releases of crate sysinfo +Description: accept older branch of crate sysinfo Author: Jonas Smedegaard Bug-Debian: https://bugs.debian.org/1055096 Forwarded: not-needed -Last-Update: 2023-10-31 +Last-Update: 2024-02-17 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/Cargo.toml @@ -12,7 +12,7 @@ serde = { version = "1.0.188", features = ["derive"] } starship-battery = { version = "0.8.2", optional = true } -sysinfo = "=0.29.8" -+sysinfo = ">= 0.28.4, < 0.30" ++sysinfo = ">= 0.28.4, <= 0.29" thiserror = "1.0.47" time = { version = "0.3.26", features = ["formatting", "macros"] } - toml_edit = { version = "0.19.14", features = ["serde"] } + toml_edit = { version = ">= 0.19.14, <= 0.21", features = ["serde"] } diff -Nru btm-0.9.6/debian/patches/2001_time.patch btm-0.9.6/debian/patches/2001_time.patch --- btm-0.9.6/debian/patches/2001_time.patch 2023-11-24 13:18:21.000000000 +0000 +++ btm-0.9.6/debian/patches/2001_time.patch 2024-02-17 17:19:23.000000000 +0000 @@ -1,18 +1,18 @@ -Description: relax dependency to match older releases of crate time +Description: accept older releases of crate time Author: Jonas Smedegaard Bug-Debian: https://bugs.debian.org/1055097 Forwarded: not-needed -Last-Update: 2023-10-31 +Last-Update: 2024-02-17 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/Cargo.toml +++ b/Cargo.toml @@ -97,7 +97,7 @@ starship-battery = { version = "0.8.2", optional = true } - sysinfo = ">= 0.28.4, < 0.30" + sysinfo = ">= 0.28.4, <= 0.29" thiserror = "1.0.47" -time = { version = "0.3.26", features = ["formatting", "macros"] } +time = { version = "0.3.23", features = ["formatting", "macros"] } - toml_edit = { version = "0.19.14", features = ["serde"] } - tui = { version = ">= 0.22, < 0.24", package = "ratatui" } + toml_edit = { version = ">= 0.19.14, <= 0.21", features = ["serde"] } + tui = { version = ">= 0.22, <= 0.23", package = "ratatui" } unicode-segmentation = "1.10.1" diff -Nru btm-0.9.6/debian/patches/2001_unicode-segmentation.patch btm-0.9.6/debian/patches/2001_unicode-segmentation.patch --- btm-0.9.6/debian/patches/2001_unicode-segmentation.patch 2023-11-24 13:18:21.000000000 +0000 +++ btm-0.9.6/debian/patches/2001_unicode-segmentation.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -Description: relax dependency to match older releases of crate unicode-segmentation -Author: Jonas Smedegaard -Bug-Debian: https://bugs.debian.org/1055098 -Forwarded: not-needed -Last-Update: 2023-10-31 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -100,7 +100,7 @@ - time = { version = "0.3.23", features = ["formatting", "macros"] } - toml_edit = { version = "0.19.14", features = ["serde"] } - tui = { version = ">= 0.22, < 0.24", package = "ratatui" } --unicode-segmentation = "1.10.1" -+unicode-segmentation = "1.9.0" - unicode-width = "0.1.10" - - [target.'cfg(unix)'.dependencies] diff -Nru btm-0.9.6/debian/patches/2002_no_windows.patch btm-0.9.6/debian/patches/2002_no_windows.patch --- btm-0.9.6/debian/patches/2002_no_windows.patch 2023-10-21 14:07:17.000000000 +0000 +++ btm-0.9.6/debian/patches/2002_no_windows.patch 2024-02-17 17:19:23.000000000 +0000 @@ -22,5 +22,5 @@ -] } - [target.'cfg(target_os = "freebsd")'.dependencies] - serde_json = { version = "1.0.103" } - sysctl = { version = ">= 0.4.4, < 0.6" } + serde_json = { version = "1.0.105" } + sysctl = { version = ">= 0.4.4, <= 0.5" } diff -Nru btm-0.9.6/debian/patches/series btm-0.9.6/debian/patches/series --- btm-0.9.6/debian/patches/series 2023-11-24 13:18:21.000000000 +0000 +++ btm-0.9.6/debian/patches/series 2024-02-17 17:19:23.000000000 +0000 @@ -1,15 +1,12 @@ 1001_ratatui.patch 1001_serde.patch -2001_backtrace.patch +1001_toml_edit.patch 2001_cargo_husky.patch -2001_fern.patch 2001_hashbrown.patch 2001_indexmap.patch 2001_itertools.patch -2001_serde_json.patch 2001_sysctl.patch 2001_sysinfo.patch 2001_time.patch -2001_unicode-segmentation.patch 2002_no_mac.patch 2002_no_windows.patch