cursive-core - new upstream release.

diff --git a/src/cursive-core/debian/changelog b/src/cursive-core/debian/changelog
index 4a3118b34d5101428535bb9e8121dc62c7907f8b..a5e0aa5e7593b134cbd1b531778371ac9b037497 100644 (file)
--- a/src/cursive-core/debian/changelog
+++ b/src/cursive-core/debian/changelog
@@ -1,3 +1,13 @@
+rust-cursive-core (0.3.5-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package cursive_core 0.3.5 from crates.io using debcargo 2.5.0
+  * Stop patching crate to use wasmer-enumset instead of enumset,
+    wasmer-enumset is an obsolete fork of enumset.
+  * Revert upstream bump of ahash dependency.
+
+ -- Peter Michael Green <plugwash@debian.org>  Sun, 13 Nov 2022 11:10:19 +0000
+
 rust-cursive-core (0.3.4-2) unstable; urgency=medium
 
   * Package cursive_core 0.3.4 from crates.io using debcargo 2.5.0

diff --git a/src/cursive-core/debian/patches/tweak-deps.patch b/src/cursive-core/debian/patches/tweak-deps.patch
index 1a829ae533ae08f24f18d148338909ea9aedc932..f1f36aa1e94576d4e4e052bf83b866ccb1e9dfab 100644 (file)
--- a/src/cursive-core/debian/patches/tweak-deps.patch
+++ b/src/cursive-core/debian/patches/tweak-deps.patch
@@ -1,74 +1,29 @@
-diff --git a/Cargo.toml b/Cargo.toml
-index 92c60ef..3bbec37 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -42,10 +42,10 @@ version = "0.7"
+Index: cursive-core/Cargo.toml
+===================================================================
+--- cursive-core.orig/Cargo.toml
++++ cursive-core/Cargo.toml
+@@ -36,7 +36,7 @@ all-features = true
+ name = "cursive_core"
+ 
+ [dependencies.ahash]
+-version = "0.8"
++version = "0.7"
+ 
+ [dependencies.ansi-parser]
+ version = "0.8.0"
+@@ -46,7 +46,7 @@ optional = true
  version = "0.5"
  
  [dependencies.enum-map]
 -version = "2.0"
 +version = "0.6"
  
--[dependencies.enumset]
--version = "1.0.4"
-+[dependencies.wasmer_enumset]
-+version = "1"
- 
- [dependencies.lazy_static]
- version = "1"
-diff --git a/src/lib.rs b/src/lib.rs
-index 16efd30..4e7056c 100644
---- a/src/lib.rs
-+++ b/src/lib.rs
-@@ -38,7 +38,7 @@ macro_rules! new_default(
- pub mod reexports {
-     pub use ahash;
-     pub use crossbeam_channel;
--    pub use enumset;
-+    pub use wasmer_enumset;
-     pub use log;
-     pub use time;
- 
-diff --git a/src/printer.rs b/src/printer.rs
-index 1019bca..0e550a7 100644
---- a/src/printer.rs
-+++ b/src/printer.rs
-@@ -10,7 +10,7 @@ use crate::utils::lines::simple::{prefix, suffix};
- use crate::with::With;
- use crate::Vec2;
- 
--use enumset::EnumSet;
-+use wasmer_enumset::EnumSet;
- use std::cell::Cell;
- use std::cmp::min;
- use unicode_segmentation::UnicodeSegmentation;
-diff --git a/src/theme/effect.rs b/src/theme/effect.rs
-index 1ba17f3..f2cf1a3 100644
---- a/src/theme/effect.rs
-+++ b/src/theme/effect.rs
-@@ -1,4 +1,4 @@
--use enumset::EnumSetType;
-+use wasmer_enumset::EnumSetType;
- 
- /// Text effect
- #[allow(clippy::derive_hash_xor_eq)] // We do derive it through EnumSetType
-diff --git a/src/theme/style.rs b/src/theme/style.rs
-index e8a681d..fa8ad72 100644
---- a/src/theme/style.rs
-+++ b/src/theme/style.rs
-@@ -1,7 +1,7 @@
- use std::iter::FromIterator;
- 
- use super::{Color, ColorStyle, ColorType, Effect, PaletteColor};
--use enumset::EnumSet;
-+use wasmer_enumset::EnumSet;
- 
- /// Combine a color and an effect.
- ///
-diff --git a/src/utils/markup/markdown.rs b/src/utils/markup/markdown.rs
-index f977343..6cb60c6 100644
---- a/src/utils/markup/markdown.rs
-+++ b/src/utils/markup/markdown.rs
+ [dependencies.enumset]
+ version = "1.0.4"
+Index: cursive-core/src/utils/markup/markdown.rs
+===================================================================
+--- cursive-core.orig/src/utils/markup/markdown.rs
++++ cursive-core/src/utils/markup/markdown.rs
 @@ -29,7 +29,7 @@ pub struct Parser<'a> {
      first: bool,
      stack: Vec<Style>,