]> git.proxmox.com Git - debcargo-conf.git/commitdiff
Package clap_derive
authorBen Westover <kwestover.kw@gmail.com>
Thu, 31 Mar 2022 02:03:53 +0000 (22:03 -0400)
committerBen Westover <kwestover.kw@gmail.com>
Thu, 31 Mar 2022 02:03:53 +0000 (22:03 -0400)
src/clap-derive/debian/RFS [new file with mode: 0644]
src/clap-derive/debian/changelog [new file with mode: 0644]
src/clap-derive/debian/copyright [new file with mode: 0644]
src/clap-derive/debian/copyright.debcargo.hint [new file with mode: 0644]
src/clap-derive/debian/debcargo.toml [new file with mode: 0644]
src/clap-derive/debian/patches/relax-heck.patch [new file with mode: 0644]
src/clap-derive/debian/patches/series [new file with mode: 0644]
src/clap/debian/RFS [new file with mode: 0644]
src/clap/debian/changelog
src/clap/debian/patches/disable-derive.diff [deleted file]
src/clap/debian/patches/series

diff --git a/src/clap-derive/debian/RFS b/src/clap-derive/debian/RFS
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/src/clap-derive/debian/changelog b/src/clap-derive/debian/changelog
new file mode 100644 (file)
index 0000000..46c083e
--- /dev/null
@@ -0,0 +1,5 @@
+rust-clap-derive (3.1.4-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Package clap_derive 3.1.4 from crates.io using debcargo 2.5.0
+
+ -- Ben Westover <kwestover.kw@gmail.com>  Wed, 30 Mar 2022 21:13:25 -0400
diff --git a/src/clap-derive/debian/copyright b/src/clap-derive/debian/copyright
new file mode 100644 (file)
index 0000000..f95bfc3
--- /dev/null
@@ -0,0 +1,40 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: clap_derive
+Upstream-Contact: Kevin B. Knapp <kbknapp@gmail.com>
+Source: https://github.com/clap-rs/clap/tree/master/clap_derive
+
+Files: *
+Copyright:
+ 2015-2022 Kevin B. Knapp <kbknapp@gmail.com>
+ 2018 Guillaume Pinot <texitoi@texitoi.eu>
+ 2018 Ana Hobden <operator@hoverbear.org>
+License: MIT or Apache-2.0
+
+Files: debian/*
+Copyright:
+ 2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2022 Ben Westover <kwestover.kw@gmail.com>
+License: MIT
+
+License: Apache-2.0
+ Debian systems provide the Apache 2.0 license in
+ /usr/share/common-licenses/Apache-2.0
+
+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/clap-derive/debian/copyright.debcargo.hint b/src/clap-derive/debian/copyright.debcargo.hint
new file mode 100644 (file)
index 0000000..81973c9
--- /dev/null
@@ -0,0 +1,105 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: clap_derive
+Upstream-Contact: FIXME (overlay) UNKNOWN-AUTHORS
+Source: https://github.com/clap-rs/clap/tree/master/clap_derive
+
+Files: *
+Copyright: FIXME (overlay) UNKNOWN-AUTHORS FIXME (overlay) UNKNOWN-YEARS
+License: MIT or Apache-2.0
+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: ./LICENSE-MIT
+Copyright: 2015-2016 Kevin B. Knapp
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: ./src/attrs.rs
+Copyright: 2018 Guillaume Pinot (@TeXitoi) <texitoi@texitoi.eu>,
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: ./src/derives/arg_enum.rs
+Copyright: 2018 Guillaume Pinot (@TeXitoi) <texitoi@texitoi.eu>,
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: ./src/derives/args.rs
+Copyright: 2018 Guillaume Pinot (@TeXitoi) <texitoi@texitoi.eu>,
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: ./src/derives/into_app.rs
+Copyright: 2018 Guillaume Pinot (@TeXitoi) <texitoi@texitoi.eu>,
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: ./src/derives/mod.rs
+Copyright: 2018 Guillaume Pinot (@TeXitoi) <texitoi@texitoi.eu>,
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: ./src/derives/parser.rs
+Copyright: 2018 Guillaume Pinot (@TeXitoi) <texitoi@texitoi.eu>,
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: ./src/derives/subcommand.rs
+Copyright: 2018 Guillaume Pinot (@TeXitoi) <texitoi@texitoi.eu>,
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: ./src/lib.rs
+Copyright: 2018 Guillaume Pinot (@TeXitoi) <texitoi@texitoi.eu>,
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: debian/*
+Copyright:
+ 2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2022 Ben Westover <kwestover.kw@gmail.com>
+License: MIT or Apache-2.0
+
+License: Apache-2.0
+ Debian systems provide the Apache 2.0 license in
+ /usr/share/common-licenses/Apache-2.0
+
+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/clap-derive/debian/debcargo.toml b/src/clap-derive/debian/debcargo.toml
new file mode 100644 (file)
index 0000000..384c9c3
--- /dev/null
@@ -0,0 +1,2 @@
+overlay = "."
+uploaders = ["Ben Westover <kwestover.kw@gmail.com>"]
diff --git a/src/clap-derive/debian/patches/relax-heck.patch b/src/clap-derive/debian/patches/relax-heck.patch
new file mode 100644 (file)
index 0000000..a6a96d6
--- /dev/null
@@ -0,0 +1,55 @@
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -40,7 +40,7 @@
+ bench = false
+ proc-macro = true
+ [dependencies.heck]
+-version = "0.4.0"
++version = "0.3"
+ [dependencies.proc-macro-error]
+ version = "1"
+--- a/src/attrs.rs
++++ b/src/attrs.rs
+@@ -19,7 +19,7 @@
+ use std::env;
+-use heck::{ToKebabCase, ToLowerCamelCase, ToShoutySnakeCase, ToSnakeCase, ToUpperCamelCase};
++use heck::{CamelCase, KebabCase, MixedCase, ShoutySnakeCase, SnakeCase};
+ use proc_macro2::{self, Span, TokenStream};
+ use proc_macro_error::abort;
+ use quote::{quote, quote_spanned, ToTokens};
+@@ -892,7 +892,7 @@
+     fn from_lit(name: LitStr) -> Sp<Self> {
+         use self::CasingStyle::*;
+-        let normalized = name.value().to_upper_camel_case().to_lowercase();
++        let normalized = name.value().to_camel_case().to_lowercase();
+         let cs = |kind| Sp::new(kind, name.span());
+         match normalized.as_ref() {
+@@ -924,9 +924,9 @@
+             Name::Derived(ident) => {
+                 let s = ident.unraw().to_string();
+                 let s = match style {
+-                    Pascal => s.to_upper_camel_case(),
++                    Pascal => s.to_camel_case(),
+                     Kebab => s.to_kebab_case(),
+-                    Camel => s.to_lower_camel_case(),
++                    Camel => s.to_mixed_case(),
+                     ScreamingSnake => s.to_shouty_snake_case(),
+                     Snake => s.to_snake_case(),
+                     Lower => s.to_snake_case().replace('_', ""),
+@@ -946,9 +946,9 @@
+             Name::Derived(ident) => {
+                 let s = ident.unraw().to_string();
+                 let s = match style {
+-                    Pascal => s.to_upper_camel_case(),
++                    Pascal => s.to_camel_case(),
+                     Kebab => s.to_kebab_case(),
+-                    Camel => s.to_lower_camel_case(),
++                    Camel => s.to_mixed_case(),
+                     ScreamingSnake => s.to_shouty_snake_case(),
+                     Snake => s.to_snake_case(),
+                     Lower => s.to_snake_case(),
diff --git a/src/clap-derive/debian/patches/series b/src/clap-derive/debian/patches/series
new file mode 100644 (file)
index 0000000..e476b06
--- /dev/null
@@ -0,0 +1 @@
+relax-heck.patch
diff --git a/src/clap/debian/RFS b/src/clap/debian/RFS
new file mode 100644 (file)
index 0000000..e69de29
index 87f6f355e58e61ea775ba658202af05c7e1df61a..d0ac7f67c689f434585703b287eee854969be07a 100644 (file)
@@ -1,3 +1,11 @@
+rust-clap (3.1.6-3) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package clap 3.1.6 from crates.io using debcargo 2.5.0
+  * Re-enable derive feature now that rust-clap-derive is packaged
+
+ -- Ben Westover <kwestover.kw@gmail.com>  Wed, 30 Mar 2022 21:36:12 -0400
+
 rust-clap (3.1.6-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/src/clap/debian/patches/disable-derive.diff b/src/clap/debian/patches/disable-derive.diff
deleted file mode 100644 (file)
index 98f9066..0000000
+++ /dev/null
@@ -1,181 +0,0 @@
-Index: clap/Cargo.toml
-===================================================================
---- clap.orig/Cargo.toml
-+++ clap/Cargo.toml
-@@ -21,6 +21,7 @@ keywords = ["argument", "cli", "arg", "p
- categories = ["command-line-interface"]
- license = "MIT OR Apache-2.0"
- repository = "https://github.com/clap-rs/clap"
-+autoexamples = false
- [package.metadata.docs.rs]
- cargo-args = ["-Zunstable-options", "-Zrustdoc-scrape-examples=examples"]
- features = ["unstable-doc"]
-@@ -94,32 +95,15 @@ opt-level = 1
- bench = false
- [[example]]
--name = "demo"
--required-features = ["derive"]
--
--[[example]]
- name = "cargo-example"
- required-features = ["cargo"]
- [[example]]
--name = "cargo-example-derive"
--required-features = ["derive"]
--
--[[example]]
- name = "escaped-positional"
- required-features = ["cargo"]
- [[example]]
--name = "escaped-positional-derive"
--required-features = ["derive"]
--
--[[example]]
--name = "git-derive"
--required-features = ["derive"]
--
--[[example]]
--name = "keyvalue-derive"
--required-features = ["derive"]
-+name = "git"
- [[example]]
- name = "busybox"
-@@ -186,11 +170,6 @@ path = "examples/tutorial_builder/04_01_
- required-features = ["cargo"]
- [[example]]
--name = "04_01_enum"
--path = "examples/tutorial_builder/04_01_enum.rs"
--required-features = ["cargo", "derive"]
--
--[[example]]
- name = "04_02_parse"
- path = "examples/tutorial_builder/04_02_parse.rs"
- required-features = ["cargo"]
-@@ -217,95 +196,7 @@ test = true
- required-features = ["cargo"]
- [[example]]
--name = "01_quick_derive"
--path = "examples/tutorial_derive/01_quick.rs"
--required-features = ["derive"]
--
--[[example]]
--name = "02_apps_derive"
--path = "examples/tutorial_derive/02_apps.rs"
--required-features = ["derive"]
--
--[[example]]
--name = "02_crate_derive"
--path = "examples/tutorial_derive/02_crate.rs"
--required-features = ["derive"]
--
--[[example]]
--name = "02_app_settings_derive"
--path = "examples/tutorial_derive/02_app_settings.rs"
--required-features = ["derive"]
--
--[[example]]
--name = "03_01_flag_bool_derive"
--path = "examples/tutorial_derive/03_01_flag_bool.rs"
--required-features = ["derive"]
--
--[[example]]
--name = "03_01_flag_count_derive"
--path = "examples/tutorial_derive/03_01_flag_count.rs"
--required-features = ["derive"]
--
--[[example]]
--name = "03_02_option_derive"
--path = "examples/tutorial_derive/03_02_option.rs"
--required-features = ["derive"]
--
--[[example]]
--name = "03_03_positional_derive"
--path = "examples/tutorial_derive/03_03_positional.rs"
--required-features = ["derive"]
--
--[[example]]
--name = "03_04_subcommands_derive"
--path = "examples/tutorial_derive/03_04_subcommands.rs"
--required-features = ["derive"]
--
--[[example]]
--name = "03_04_subcommands_alt_derive"
--path = "examples/tutorial_derive/03_04_subcommands_alt.rs"
--required-features = ["derive"]
--
--[[example]]
--name = "03_05_default_values_derive"
--path = "examples/tutorial_derive/03_05_default_values.rs"
--required-features = ["derive"]
--
--[[example]]
--name = "04_01_enum_derive"
--path = "examples/tutorial_derive/04_01_enum.rs"
--required-features = ["derive"]
--
--[[example]]
--name = "04_02_parse_derive"
--path = "examples/tutorial_derive/04_02_parse.rs"
--required-features = ["derive"]
--
--[[example]]
--name = "04_02_validate_derive"
--path = "examples/tutorial_derive/04_02_validate.rs"
--required-features = ["derive"]
--
--[[example]]
--name = "04_03_relations_derive"
--path = "examples/tutorial_derive/04_03_relations.rs"
--required-features = ["derive"]
--
--[[example]]
--name = "04_04_custom_derive"
--path = "examples/tutorial_derive/04_04_custom.rs"
--required-features = ["derive"]
--
--[[example]]
--name = "05_01_assert_derive"
--path = "examples/tutorial_derive/05_01_assert.rs"
--test = true
--required-features = ["derive"]
--
--[[example]]
--name = "custom-bool"
--path = "examples/derive_ref/custom-bool.rs"
--required-features = ["derive"]
-+name = "pacman"
- [[bench]]
- name = "01_default"
-@@ -347,10 +238,6 @@ optional = true
- [dependencies.bitflags]
- version = "1.2"
--[dependencies.clap_derive]
--version = "3.1.4"
--optional = true
--
- [dependencies.indexmap]
- version = "1"
-@@ -405,14 +292,11 @@ version = "1.0.18"
- [features]
- cargo = ["lazy_static"]
- color = ["atty", "termcolor"]
--debug = ["clap_derive/debug", "backtrace"]
- default = ["std", "color", "suggestions"]
--derive = ["clap_derive", "lazy_static"]
- env = []
- std = ["indexmap/std"]
- suggestions = ["strsim"]
- unicode = ["textwrap/unicode-width", "unicase"]
--unstable-doc = ["derive", "cargo", "wrap_help", "yaml", "env", "unicode", "regex", "unstable-replace", "unstable-multicall", "unstable-grouped"]
- unstable-grouped = []
- unstable-multicall = []
- unstable-replace = []
index 6d4f96b3d513b12ea3d9d59d1a02439e44a2b3bc..89ee0d43971c40ad620d6e47c3ec3fd52c821964 100644 (file)
@@ -2,4 +2,3 @@ no-clippy.patch
 relax-dep-versions.patch
 disable-criterion.patch
 disable-trycmd.diff
-disable-derive.diff