yansi: update to 0.5.1

compatible version, cargo dependency

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>

diff --git a/src/yansi/debian/RFS b/src/yansi/debian/RFS
new file mode 100644 (file)
index 0000000..30b070e
--- /dev/null
+++ b/src/yansi/debian/RFS
@@ -0,0 +1 @@
+cargo dependency

diff --git a/src/yansi/debian/changelog b/src/yansi/debian/changelog
index 25119b9253e89609196952e36b13b8052fc0e054..971adc9a8ab227ecf6065bb2dbdd929d551b97f1 100644 (file)
--- a/src/yansi/debian/changelog
+++ b/src/yansi/debian/changelog
@@ -1,3 +1,10 @@
+rust-yansi (0.5.1-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package yansi 0.5.1 from crates.io using debcargo 2.5.0
+
+ -- Fabian Gruenbichler <debian@fabian.gruenbichler.email>  Thu, 13 Oct 2022 20:42:06 +0200
+
 rust-yansi (0.5.0-1) unstable; urgency=medium
 
   * Package yansi 0.5.0 from crates.io using debcargo 2.5.0

diff --git a/src/yansi/debian/patches/0001-Move-from-parking_lot-Mutex-to-serial_test.patch b/src/yansi/debian/patches/0001-Move-from-parking_lot-Mutex-to-serial_test.patch
deleted file mode 100644 (file)
index 929e36b..0000000
--- a/src/yansi/debian/patches/0001-Move-from-parking_lot-Mutex-to-serial_test.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From fe7c07c4f51e9d46cf0a50bc2aaf1d5c595268fb Mon Sep 17 00:00:00 2001
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Wed, 9 Mar 2022 19:02:06 -0500
-Subject: [PATCH] Move from parking_lot::Mutex to serial_test
-
-Closes: #34
----
- Cargo.toml   |  2 +-
- src/tests.rs | 14 +++++++-------
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/Cargo.toml b/Cargo.toml
-index 04debd5..e0e08c0 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -23,9 +23,8 @@
- repository = "https://github.com/SergioBenitez/yansi"
- 
- [dependencies]
--[dev-dependencies.parking_lot]
--version = "0.5"
--features = ["nightly"]
-+[dev-dependencies.serial_test]
-+version = "*"
- [badges.travis-ci]
- branch = "master"
- repository = "SergioBenitez/yansi"
-diff --git a/src/tests.rs b/src/tests.rs
-index 50a0127..f869ffe 100644
---- a/src/tests.rs
-+++ b/src/tests.rs
-@@ -1,15 +1,11 @@
--extern crate parking_lot;
-+extern crate serial_test;
-+use self::serial_test::serial;
- 
- use super::Color::*;
- use super::{Paint, Style};
- 
--use self::parking_lot::Mutex;
--
--static LOCK: Mutex<()> = Mutex::new(());
--
- macro_rules! assert_renders {
-     ($($input:expr => $expected:expr,)*) => {
--        let _lock = LOCK.lock();
-         $(
-             let (input, expected) = ($input.to_string(), $expected.to_string());
-             if input != expected {
-@@ -22,7 +18,6 @@ macro_rules! assert_renders {
- 
- macro_rules! assert_disabled_renders {
-     ($($input:expr => $expected:expr,)*) => {
--        let _lock = LOCK.lock();
-         $(
-             Paint::disable();
-             let (actual, expected) = ($input.to_string(), $expected.to_string());
-@@ -33,6 +28,7 @@ macro_rules! assert_disabled_renders {
- }
- 
- #[test]
-+#[serial]
- fn colors_enabled() {
-     assert_renders! {
-         Paint::new("text/plain") => "text/plain",
-@@ -70,6 +66,7 @@ fn colors_enabled() {
- }
- 
- #[test]
-+#[serial]
- fn colors_disabled() {
-     assert_disabled_renders! {
-         Paint::new("text/plain") => "text/plain",
-@@ -109,6 +106,7 @@ fn colors_disabled() {
- }
- 
- #[test]
-+#[serial]
- fn masked_when_disabled() {
-     assert_disabled_renders! {
-         Paint::masked("text/plain") => "",
-@@ -124,6 +122,7 @@ fn masked_when_disabled() {
- }
- 
- #[test]
-+#[serial]
- fn masked_when_enabled() {
-     assert_renders! {
-         Paint::masked("text/plain") => "text/plain",
-@@ -141,6 +140,7 @@ fn masked_when_enabled() {
- }
- 
- #[test]
-+#[serial]
- fn wrapping() {
-     let inner = || format!("{} b {}", Paint::red("a"), Paint::green("c"));
-     let inner2 = || format!("0 {} 1", Paint::magenta(&inner()).wrap());
--- 
-2.34.1
-

diff --git a/src/yansi/debian/patches/relax-serial-test.patch b/src/yansi/debian/patches/relax-serial-test.patch
new file mode 100644 (file)
index 0000000..e736567
--- /dev/null
+++ b/src/yansi/debian/patches/relax-serial-test.patch
@@ -0,0 +1,24 @@
+From fe7c07c4f51e9d46cf0a50bc2aaf1d5c595268fb Mon Sep 17 00:00:00 2001
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Wed, 9 Mar 2022 19:02:06 -0500
+Subject: [PATCH] Move from parking_lot::Mutex to serial_test
+
+Closes: #34
+---
+ Cargo.toml   |  2 +-
+ src/tests.rs | 14 +++++++-------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+Index: yansi/Cargo.toml
+===================================================================
+--- yansi.orig/Cargo.toml
++++ yansi/Cargo.toml
+@@ -30,7 +30,7 @@ repository = "https://github.com/SergioB
+ [dependencies]
+ 
+ [dev-dependencies.serial_test]
+-version = "0.6"
++version = "0.5"
+ 
+ [badges.travis-ci]
+ branch = "master"

diff --git a/src/yansi/debian/patches/series b/src/yansi/debian/patches/series
index be0ce2baf52ada0e4bbdb6581edc1c0835e1e18d..3035698dc2de5c49d1d56a41bfc70f8db59ce526 100644 (file)
--- a/src/yansi/debian/patches/series
+++ b/src/yansi/debian/patches/series
@@ -1 +1 @@
-0001-Move-from-parking_lot-Mutex-to-serial_test.patch
+relax-serial-test.patch