]> git.proxmox.com Git - debcargo-conf.git/commitdiff
package cursive_core needed for cursive, that's needed for ripasso
authorAlexander Kjäll <alexander.kjall@gmail.com>
Sat, 16 Jul 2022 14:39:22 +0000 (16:39 +0200)
committerAlexander Kjäll <alexander.kjall@gmail.com>
Sat, 16 Jul 2022 14:39:22 +0000 (16:39 +0200)
src/cursive-core/debian/RFS [new file with mode: 0644]
src/cursive-core/debian/changelog [new file with mode: 0644]
src/cursive-core/debian/copyright [new file with mode: 0644]
src/cursive-core/debian/copyright.debcargo.hint [new file with mode: 0644]
src/cursive-core/debian/debcargo.toml [new file with mode: 0644]
src/cursive-core/debian/patches/remove-unstable-feature.patch [new file with mode: 0644]
src/cursive-core/debian/patches/series [new file with mode: 0644]
src/cursive-core/debian/patches/tweak-deps.patch [new file with mode: 0644]

diff --git a/src/cursive-core/debian/RFS b/src/cursive-core/debian/RFS
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/src/cursive-core/debian/changelog b/src/cursive-core/debian/changelog
new file mode 100644 (file)
index 0000000..420a550
--- /dev/null
@@ -0,0 +1,5 @@
+rust-cursive-core (0.3.2-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Package cursive_core 0.3.2 from crates.io using debcargo 2.5.0
+
+ -- Alexander Kjäll <alexander.kjall@gmail.com>  Sat, 16 Jul 2022 16:24:21 +0200
diff --git a/src/cursive-core/debian/copyright b/src/cursive-core/debian/copyright
new file mode 100644 (file)
index 0000000..f69bb02
--- /dev/null
@@ -0,0 +1 @@
+FIXME fill me in using ./copyright.debcargo.hint as a guide
diff --git a/src/cursive-core/debian/copyright.debcargo.hint b/src/cursive-core/debian/copyright.debcargo.hint
new file mode 100644 (file)
index 0000000..d437145
--- /dev/null
@@ -0,0 +1,38 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: cursive_core
+Upstream-Contact: Alexandre Bury <alexandre.bury@gmail.com>
+Source: https://github.com/gyscos/cursive
+
+Files: *
+Copyright: FIXME (overlay) UNKNOWN-YEARS Alexandre Bury <alexandre.bury@gmail.com>
+License: MIT
+Comment:
+ FIXME (overlay): Since upstream copyright years are not available in
+ Cargo.toml, they were extracted from the upstream Git repository. This may not
+ be correct information so you should review and fix this before uploading to
+ the archive.
+
+Files: debian/*
+Copyright:
+ 2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2022 Alexander Kjäll <alexander.kjall@gmail.com>
+License: MIT
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
diff --git a/src/cursive-core/debian/debcargo.toml b/src/cursive-core/debian/debcargo.toml
new file mode 100644 (file)
index 0000000..11b8b27
--- /dev/null
@@ -0,0 +1,2 @@
+overlay = "."
+uploaders = ["Alexander Kjäll <alexander.kjall@gmail.com>"]
diff --git a/src/cursive-core/debian/patches/remove-unstable-feature.patch b/src/cursive-core/debian/patches/remove-unstable-feature.patch
new file mode 100644 (file)
index 0000000..80b3275
--- /dev/null
@@ -0,0 +1,83 @@
+diff --git a/src/lib.rs b/src/lib.rs
+index 976e0cf..4e7056c 100644
+--- a/src/lib.rs
++++ b/src/lib.rs
+@@ -8,7 +8,6 @@
+ //!
+ //! [`cursive`]: https://docs.rs/cursive
+ #![deny(missing_docs)]
+-#![cfg_attr(feature = "doc-cfg", feature(doc_cfg))]
+ macro_rules! new_default(
+     ($c:ident<$t:ident>) => {
+diff --git a/src/theme/mod.rs b/src/theme/mod.rs
+index 7a06f1a..edbb0cb 100644
+--- a/src/theme/mod.rs
++++ b/src/theme/mod.rs
+@@ -242,7 +242,6 @@ impl Default for Theme {
+ impl Theme {
+     #[cfg(feature = "toml")]
+-    #[cfg_attr(feature = "doc-cfg", doc(cfg(feature = "toml")))]
+     fn load_toml(&mut self, table: &toml::value::Table) {
+         if let Some(&toml::Value::Boolean(shadow)) = table.get("shadow") {
+             self.shadow = shadow;
+@@ -265,13 +264,11 @@ pub enum Error {
+     Io(io::Error),
+     #[cfg(feature = "toml")]
+-    #[cfg_attr(feature = "doc-cfg", doc(cfg(feature = "toml")))]
+     /// An error occured when parsing the toml content.
+     Parse(toml::de::Error),
+ }
+ #[cfg(feature = "toml")]
+-#[cfg_attr(feature = "doc-cfg", doc(cfg(feature = "toml")))]
+ impl From<io::Error> for Error {
+     fn from(err: io::Error) -> Self {
+         Error::Io(err)
+@@ -279,7 +276,6 @@ impl From<io::Error> for Error {
+ }
+ #[cfg(feature = "toml")]
+-#[cfg_attr(feature = "doc-cfg", doc(cfg(feature = "toml")))]
+ impl From<toml::de::Error> for Error {
+     fn from(err: toml::de::Error) -> Self {
+         Error::Parse(err)
+@@ -290,7 +286,6 @@ impl From<toml::de::Error> for Error {
+ ///
+ /// Must have the `toml` feature enabled.
+ #[cfg(feature = "toml")]
+-#[cfg_attr(feature = "doc-cfg", doc(cfg(feature = "toml")))]
+ pub fn load_theme_file<P: AsRef<Path>>(filename: P) -> Result<Theme, Error> {
+     let content = {
+         let mut content = String::new();
+@@ -306,7 +301,6 @@ pub fn load_theme_file<P: AsRef<Path>>(filename: P) -> Result<Theme, Error> {
+ ///
+ /// Must have the `toml` feature enabled.
+ #[cfg(feature = "toml")]
+-#[cfg_attr(feature = "doc-cfg", doc(cfg(feature = "toml")))]
+ pub fn load_toml(content: &str) -> Result<Theme, Error> {
+     let table = toml::de::from_str(content)?;
+diff --git a/src/utils/markup/markdown.rs b/src/utils/markup/markdown.rs
+index 6f3ce4a..f977343 100644
+--- a/src/utils/markup/markdown.rs
++++ b/src/utils/markup/markdown.rs
+@@ -2,7 +2,6 @@
+ //!
+ //! Needs the `markdown` feature to be enabled.
+ #![cfg(feature = "markdown")]
+-#![cfg_attr(feature = "doc-cfg", doc(cfg(feature = "markdown")))]
+ use std::borrow::Cow;
+@@ -30,7 +29,7 @@ pub struct Parser<'a> {
+     first: bool,
+     stack: Vec<Style>,
+     input: &'a str,
+-    parser: pulldown_cmark::Parser<'a, 'a>,
++    parser: pulldown_cmark::Parser<'a>,
+ }
+ impl<'a> Parser<'a> {
diff --git a/src/cursive-core/debian/patches/series b/src/cursive-core/debian/patches/series
new file mode 100644 (file)
index 0000000..22e8f7b
--- /dev/null
@@ -0,0 +1,2 @@
+tweak-deps.patch
+remove-unstable-feature.patch
diff --git a/src/cursive-core/debian/patches/tweak-deps.patch b/src/cursive-core/debian/patches/tweak-deps.patch
new file mode 100644 (file)
index 0000000..b5eeb11
--- /dev/null
@@ -0,0 +1,85 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index d2f73f2..2e1859c 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -42,10 +42,10 @@ version = "0.7"
+ 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"
+@@ -61,7 +61,7 @@ default-features = false
+ version = "0.4"
+ [dependencies.pulldown-cmark]
+-version = "0.9"
++version = "0.8"
+ optional = true
+ default-features = false
+@@ -83,7 +83,7 @@ version = "1"
+ version = "0.1"
+ [dependencies.xi-unicode]
+-version = "0.3"
++version = "0.1"
+ [features]
+ doc-cfg = []
+diff --git a/src/lib.rs b/src/lib.rs
+index 92d742d..976e0cf 100644
+--- a/src/lib.rs
++++ b/src/lib.rs
+@@ -39,7 +39,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.
+ ///