update anstream/anstyle* to 0.6.4

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/src/anstream/debian/changelog b/src/anstream/debian/changelog
index 55b95c7767d17dbe100954cef78fce1512e5ee54..7faa911c2aeca14e7098c6bb0cdb70ce5fa765e6 100644 (file)
--- a/src/anstream/debian/changelog
+++ b/src/anstream/debian/changelog
@@ -1,15 +1,24 @@
-rust-anstream (0.5.0-1~bpo12+pve1) proxmox-rust; urgency=medium
+rust-anstream (0.6.4-1) unstable; urgency=medium
 
-  * Rebuild for Debian Bookworm / Proxmox
+  * Package anstream 0.6.4 from crates.io using debcargo 2.6.0
+  * Update relax-dep.diff for new upstream.
 
- -- Proxmox Support Team <support@proxmox.com>  Wed, 20 Sep 2023 11:56:52 +0200
+  [ Blair Noctis ]
+  * Team upload.
+  * Package anstream 0.6.4 from crates.io using debcargo 2.6.0
+
+ -- Peter Michael Green <plugwash@debian.org>  Tue, 10 Oct 2023 01:28:50 +0000
 
-rust-anstream (0.5.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+rust-anstream (0.5.0-1) unstable; urgency=medium
 
   * Team upload.
   * Package anstream 0.5.0 from crates.io using debcargo 2.6.0
+  * Relax dev-dependency on proptest.
+  * Disable benches, they require test data which is not included in the
+    crates.io release.
+  * Bump criterion dev-dependency to 0.5
 
- -- Fabian Grünbichler <f.gruenbichler@proxmox.com>  Wed, 20 Sep 2023 11:56:35 +0200
+ -- Peter Michael Green <plugwash@debian.org>  Sun, 24 Sep 2023 11:23:10 +0000
 
 rust-anstream (0.3.2-1) unstable; urgency=medium
 

diff --git a/src/anstream/debian/patches/disable-benches-missing-testdata.patch b/src/anstream/debian/patches/disable-benches-missing-testdata.patch
new file mode 100644 (file)
index 0000000..9802fe1
--- /dev/null
+++ b/src/anstream/debian/patches/disable-benches-missing-testdata.patch
@@ -0,0 +1,29 @@
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -37,6 +37,7 @@
+ categories = ["command-line-interface"]
+ license = "MIT OR Apache-2.0"
+ repository = "https://github.com/rust-cli/anstyle.git"
++autobenches = false
+ 
+ [package.metadata.docs.rs]
+ cargo-args = [
+@@ -83,18 +84,6 @@
+ [Unreleased]: https://github.com/rust-cli/anstyle/compare/{{tag_name}}...HEAD"""
+ search = "<!-- next-url -->"
+ 
+-[[bench]]
+-name = "strip"
+-harness = false
+-
+-[[bench]]
+-name = "wincon"
+-harness = false
+-
+-[[bench]]
+-name = "stream"
+-harness = false
+-
+ [dependencies.anstyle]
+ version = "1.0.0"
+ 

diff --git a/src/anstream/debian/patches/drop-non-linux.patch b/src/anstream/debian/patches/drop-non-linux.patch
index 4b3c9a9ed3e436aa7109ee46e3206d1df64b2de9..f5312575b73426e3c85e07dd4c9a8c49aeeb7c0a 100644 (file)
--- a/src/anstream/debian/patches/drop-non-linux.patch
+++ b/src/anstream/debian/patches/drop-non-linux.patch
@@ -1,15 +1,14 @@
-Index: anstream/Cargo.toml
-===================================================================
---- anstream.orig/Cargo.toml
-+++ anstream/Cargo.toml
-@@ -131,10 +131,4 @@ auto = [
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -131,11 +131,5 @@
  ]
  default = [
      "auto",
 -    "wincon",
  ]
+ test = []
 -wincon = ["dep:anstyle-wincon"]
 -
 -[target."cfg(windows)".dependencies.anstyle-wincon]
--version = "2.0.0"
+-version = "3.0.1"
 -optional = true

diff --git a/src/anstream/debian/patches/relax-dep.diff b/src/anstream/debian/patches/relax-dep.diff
new file mode 100644 (file)
index 0000000..ac63dfe
--- /dev/null
+++ b/src/anstream/debian/patches/relax-dep.diff
@@ -0,0 +1,17 @@
+Index: anstream/Cargo.toml
+===================================================================
+--- anstream.orig/Cargo.toml
++++ anstream/Cargo.toml
+@@ -108,10 +108,10 @@ version = "0.5.1"
+ version = "3.5.0"
+ 
+ [dev-dependencies.proptest]
+-version = "1.2.0"
++version = "1.0.0"
+ 
+ [dev-dependencies.strip-ansi-escapes]
+-version = "0.2.0"
++version = ">= 0.1.1, < 0.3"
+ 
+ [features]
+ auto = [

diff --git a/src/anstream/debian/patches/series b/src/anstream/debian/patches/series
index 2cf8a255b758351a4225ce06af3663879a2051f1..50af6665fff5aa38ede4ac76db891f6c7afe6acd 100644 (file)
--- a/src/anstream/debian/patches/series
+++ b/src/anstream/debian/patches/series
@@ -1 +1,3 @@
 drop-non-linux.patch
+disable-benches-missing-testdata.patch
+relax-dep.diff

diff --git a/src/anstyle-parse/debian/changelog b/src/anstyle-parse/debian/changelog
index 5c4ce6aaf77e224d0f1f9ea1feeb60e016d4ce36..5ee764d2e2aed9a05c4b5464c0bc7c7203ced95c 100644 (file)
--- a/src/anstyle-parse/debian/changelog
+++ b/src/anstyle-parse/debian/changelog
@@ -1,9 +1,3 @@
-rust-anstyle-parse (0.2.1-1~bpo12+pve1) proxmox-rust; urgency=medium
-
-  * Rebuild for Debian Bookworm / Proxmox
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 20 Sep 2023 10:38:56 +0200
-
 rust-anstyle-parse (0.2.1-1) unstable; urgency=medium
 
   * Package anstyle-parse 0.2.1 from crates.io using debcargo 2.6.0

diff --git a/src/anstyle-query/debian/changelog b/src/anstyle-query/debian/changelog
index 1ca8294f72e132ab4789fccd53a54c14443c8cbb..c01d1219bdbb71202e70fce939068e96df4192fd 100644 (file)
--- a/src/anstyle-query/debian/changelog
+++ b/src/anstyle-query/debian/changelog
@@ -1,9 +1,3 @@
-rust-anstyle-query (1.0.0-1~bpo12+pve1) proxmox-rust; urgency=medium
-
-  * Rebuild for Debian Bookworm / Proxmox
-
- -- Proxmox Support Team <support@proxmox.com>  Wed, 20 Sep 2023 10:38:53 +0200
-
 rust-anstyle-query (1.0.0-1) unstable; urgency=medium
 
   * Package anstyle-query 1.0.0 from crates.io using debcargo 2.6.0

diff --git a/src/anstyle/debian/changelog b/src/anstyle/debian/changelog
index dff2f0bd38aeb20fdcfa8a5488d66fb108ae1ee5..76425677963dcdbf771d95143d98a6a81f93b5ff 100644 (file)
--- a/src/anstyle/debian/changelog
+++ b/src/anstyle/debian/changelog
@@ -1,8 +1,13 @@
-rust-anstyle (1.0.1-1~bpo12+pve1) proxmox-rust; urgency=medium
+rust-anstyle (1.0.4-1) unstable; urgency=medium
 
-  * Rebuild for Debian Bookworm / Proxmox
+  * Package anstyle 1.0.4 from crates.io using debcargo 2.6.0
 
- -- Proxmox Support Team <support@proxmox.com>  Wed, 20 Sep 2023 10:38:48 +0200
+  [ Blair Noctis ]
+  * Team upload.
+  * Package anstyle 1.0.4 from crates.io using debcargo 2.6.0
+  * Drop gate-test-on-relevant-feature.patch, outdated
+
+ -- Peter Michael Green <plugwash@debian.org>  Sun, 19 Nov 2023 17:46:34 +0000
 
 rust-anstyle (1.0.1-1) unstable; urgency=medium
 

diff --git a/src/anstyle/debian/patches/gate-test-on-relevant-feature.patch b/src/anstyle/debian/patches/gate-test-on-relevant-feature.patch
deleted file mode 100644 (file)
index 4f644bc..0000000
--- a/src/anstyle/debian/patches/gate-test-on-relevant-feature.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/color.rs b/src/color.rs
-index cbf0b47..a0d17c3 100644
---- a/src/color.rs
-+++ b/src/color.rs
-@@ -598,6 +598,7 @@ impl core::fmt::Display for DisplayBuffer {
- }
- 
- #[cfg(test)]
-+#[cfg(feature = "std")]
- mod test {
-     use super::*;
- 

diff --git a/src/anstyle/debian/patches/series b/src/anstyle/debian/patches/series
deleted file mode 100644 (file)
index cc4f443..0000000
--- a/src/anstyle/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-gate-test-on-relevant-feature.patch