From db38f48eb12b8876b81fc25f42d46e731f7799b2 Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Thu, 20 Oct 2022 15:24:50 +0000 Subject: [PATCH] value-bag - Re-enable serde-fmt and sval related features. --- src/value-bag/debian/changelog | 8 ++ ...d-alloc-feature-to-erased-serde-dependency | 4 +- .../debian/patches/drop-features.diff | 73 ------------------- .../debian/patches/remove-serde-json.diff | 18 +++-- .../patches/remove-wasm-bindgen-test.diff | 14 ++++ src/value-bag/debian/patches/series | 2 +- src/value-bag/debian/tests/control | 46 ++++++++++-- .../debian/tests/control.debcargo.hint | 46 ++++++++++-- 8 files changed, 111 insertions(+), 100 deletions(-) delete mode 100644 src/value-bag/debian/patches/drop-features.diff create mode 100644 src/value-bag/debian/patches/remove-wasm-bindgen-test.diff diff --git a/src/value-bag/debian/changelog b/src/value-bag/debian/changelog index 0429429ba..5bd457656 100644 --- a/src/value-bag/debian/changelog +++ b/src/value-bag/debian/changelog @@ -1,3 +1,11 @@ +rust-value-bag (1.0.0~alpha.9-3) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Team upload. + * Package value-bag 1.0.0-alpha.9 from crates.io using debcargo 2.5.0 + * Re-enable serde-fmt and sval related features. + + -- Peter Michael Green Thu, 20 Oct 2022 15:36:28 +0000 + rust-value-bag (1.0.0~alpha.9-2) unstable; urgency=medium * Team upload. diff --git a/src/value-bag/debian/patches/add-alloc-feature-to-erased-serde-dependency b/src/value-bag/debian/patches/add-alloc-feature-to-erased-serde-dependency index 706b79f1a..a80f4570a 100644 --- a/src/value-bag/debian/patches/add-alloc-feature-to-erased-serde-dependency +++ b/src/value-bag/debian/patches/add-alloc-feature-to-erased-serde-dependency @@ -2,11 +2,11 @@ Index: value-bag/Cargo.toml =================================================================== --- value-bag.orig/Cargo.toml +++ value-bag/Cargo.toml -@@ -45,6 +45,7 @@ version = "0.3" +@@ -47,6 +47,7 @@ version = "0.3" optional = true default-features = false package = "erased-serde" +features = ["alloc"] - [dependencies.serde1_lib] + [dependencies.serde1_fmt] version = "1" diff --git a/src/value-bag/debian/patches/drop-features.diff b/src/value-bag/debian/patches/drop-features.diff deleted file mode 100644 index 9abda927c..000000000 --- a/src/value-bag/debian/patches/drop-features.diff +++ /dev/null @@ -1,73 +0,0 @@ -Index: value-bag/Cargo.toml -=================================================================== ---- value-bag.orig/Cargo.toml -+++ value-bag/Cargo.toml -@@ -34,8 +34,6 @@ repository = "https://github.com/sval-rs - features = [ - "std", - "error", -- "sval", -- "serde", - "test", - ] - -@@ -48,24 +46,12 @@ optional = true - default-features = false - package = "erased-serde" - --[dependencies.serde1_fmt] --version = "1" --optional = true --package = "serde_fmt" -- - [dependencies.serde1_lib] - version = "1" - optional = true - default-features = false - package = "serde" - --[dependencies.sval1_lib] --version = "=1.0.0-alpha.5" --features = ["fmt"] --optional = true --default-features = false --package = "sval" -- - [dev-dependencies.serde1_json] - version = "1" - package = "serde_json" -@@ -74,16 +60,6 @@ package = "serde_json" - version = "1" - package = "serde_test" - --[dev-dependencies.sval1_json] --version = "=1.0.0-alpha.5" --features = ["std"] --package = "sval_json" -- --[dev-dependencies.sval1_lib] --version = "=1.0.0-alpha.5" --features = ["test"] --package = "sval" -- - [dev-dependencies.wasm-bindgen] - version = "0.2" - -@@ -97,17 +73,6 @@ package = "version_check" - [features] - error = [ - "std", -- "sval1_lib/std", --] --serde = ["serde1"] --serde1 = [ -- "serde1_lib", -- "sval1_lib/serde1", -- "sval1_lib/alloc", -- "erased-serde1/alloc", -- "serde1_fmt", - ] - std = [] --sval = ["sval1"] --sval1 = ["sval1_lib"] - test = ["std"] diff --git a/src/value-bag/debian/patches/remove-serde-json.diff b/src/value-bag/debian/patches/remove-serde-json.diff index 20f6a6ebe..7f1a010dd 100644 --- a/src/value-bag/debian/patches/remove-serde-json.diff +++ b/src/value-bag/debian/patches/remove-serde-json.diff @@ -2,13 +2,15 @@ Index: value-bag/Cargo.toml =================================================================== --- value-bag.orig/Cargo.toml +++ value-bag/Cargo.toml -@@ -64,9 +64,6 @@ package = "serde_test" - [dev-dependencies.wasm-bindgen] - version = "0.2" +@@ -75,11 +75,6 @@ package = "serde_json" + version = "1" + package = "serde_test" --[dev-dependencies.wasm-bindgen-test] --version = "0.3" +-[dev-dependencies.sval1_json] +-version = "=1.0.0-alpha.5" +-features = ["std"] +-package = "sval_json" - - [build-dependencies.rustc] - version = "0.9" - package = "version_check" + [dev-dependencies.sval1_lib] + version = "=1.0.0-alpha.5" + features = ["test"] diff --git a/src/value-bag/debian/patches/remove-wasm-bindgen-test.diff b/src/value-bag/debian/patches/remove-wasm-bindgen-test.diff new file mode 100644 index 000000000..20f6a6ebe --- /dev/null +++ b/src/value-bag/debian/patches/remove-wasm-bindgen-test.diff @@ -0,0 +1,14 @@ +Index: value-bag/Cargo.toml +=================================================================== +--- value-bag.orig/Cargo.toml ++++ value-bag/Cargo.toml +@@ -64,9 +64,6 @@ package = "serde_test" + [dev-dependencies.wasm-bindgen] + version = "0.2" + +-[dev-dependencies.wasm-bindgen-test] +-version = "0.3" +- + [build-dependencies.rustc] + version = "0.9" + package = "version_check" diff --git a/src/value-bag/debian/patches/series b/src/value-bag/debian/patches/series index e3a352b92..795a56f1d 100644 --- a/src/value-bag/debian/patches/series +++ b/src/value-bag/debian/patches/series @@ -1,3 +1,3 @@ -drop-features.diff add-alloc-feature-to-erased-serde-dependency +remove-wasm-bindgen-test.diff remove-serde-json.diff diff --git a/src/value-bag/debian/tests/control b/src/value-bag/debian/tests/control index 8711bef20..fb797645b 100644 --- a/src/value-bag/debian/tests/control +++ b/src/value-bag/debian/tests/control @@ -1,39 +1,69 @@ Test-Command: /usr/share/cargo/bin/cargo-auto-test value-bag 1.0.0-alpha.9 --all-targets --all-features Features: test-name=rust-value-bag:@ -Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-wasm-bindgen-0.2+default-dev, @ +Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-sval-1.0.0+default-dev, librust-sval-1.0.0+test-dev, librust-wasm-bindgen-0.2+default-dev, @ Restrictions: allow-stderr, skip-not-installable Test-Command: /usr/share/cargo/bin/cargo-auto-test value-bag 1.0.0-alpha.9 --all-targets Features: test-name=librust-value-bag-dev:default -Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-wasm-bindgen-0.2+default-dev, @ +Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-sval-1.0.0+default-dev, librust-sval-1.0.0+test-dev, librust-wasm-bindgen-0.2+default-dev, @ Restrictions: allow-stderr, skip-not-installable Test-Command: /usr/share/cargo/bin/cargo-auto-test value-bag 1.0.0-alpha.9 --all-targets --no-default-features --features erased-serde1 Features: test-name=librust-value-bag-dev:erased-serde1 -Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-wasm-bindgen-0.2+default-dev, @ +Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-sval-1.0.0+default-dev, librust-sval-1.0.0+test-dev, librust-wasm-bindgen-0.2+default-dev, @ Restrictions: allow-stderr, skip-not-installable Test-Command: /usr/share/cargo/bin/cargo-auto-test value-bag 1.0.0-alpha.9 --all-targets --no-default-features --features error Features: test-name=librust-value-bag-dev:error -Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-wasm-bindgen-0.2+default-dev, @ +Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-sval-1.0.0+default-dev, librust-sval-1.0.0+test-dev, librust-wasm-bindgen-0.2+default-dev, @ +Restrictions: allow-stderr, skip-not-installable + +Test-Command: /usr/share/cargo/bin/cargo-auto-test value-bag 1.0.0-alpha.9 --all-targets --no-default-features --features serde +Features: test-name=librust-value-bag-dev:serde +Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-sval-1.0.0+default-dev, librust-sval-1.0.0+test-dev, librust-wasm-bindgen-0.2+default-dev, @ +Restrictions: allow-stderr, skip-not-installable + +Test-Command: /usr/share/cargo/bin/cargo-auto-test value-bag 1.0.0-alpha.9 --all-targets --no-default-features --features serde1 +Features: test-name=librust-value-bag-dev:serde1 +Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-sval-1.0.0+default-dev, librust-sval-1.0.0+test-dev, librust-wasm-bindgen-0.2+default-dev, @ +Restrictions: allow-stderr, skip-not-installable + +Test-Command: /usr/share/cargo/bin/cargo-auto-test value-bag 1.0.0-alpha.9 --all-targets --no-default-features --features serde1_fmt +Features: test-name=librust-value-bag-dev:serde1_fmt +Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-sval-1.0.0+default-dev, librust-sval-1.0.0+test-dev, librust-wasm-bindgen-0.2+default-dev, @ Restrictions: allow-stderr, skip-not-installable Test-Command: /usr/share/cargo/bin/cargo-auto-test value-bag 1.0.0-alpha.9 --all-targets --no-default-features --features serde1_lib Features: test-name=librust-value-bag-dev:serde1_lib -Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-wasm-bindgen-0.2+default-dev, @ +Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-sval-1.0.0+default-dev, librust-sval-1.0.0+test-dev, librust-wasm-bindgen-0.2+default-dev, @ Restrictions: allow-stderr, skip-not-installable Test-Command: /usr/share/cargo/bin/cargo-auto-test value-bag 1.0.0-alpha.9 --all-targets --no-default-features --features std Features: test-name=librust-value-bag-dev:std -Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-wasm-bindgen-0.2+default-dev, @ +Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-sval-1.0.0+default-dev, librust-sval-1.0.0+test-dev, librust-wasm-bindgen-0.2+default-dev, @ +Restrictions: allow-stderr, skip-not-installable + +Test-Command: /usr/share/cargo/bin/cargo-auto-test value-bag 1.0.0-alpha.9 --all-targets --no-default-features --features sval +Features: test-name=librust-value-bag-dev:sval +Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-sval-1.0.0+default-dev, librust-sval-1.0.0+test-dev, librust-wasm-bindgen-0.2+default-dev, @ +Restrictions: allow-stderr, skip-not-installable + +Test-Command: /usr/share/cargo/bin/cargo-auto-test value-bag 1.0.0-alpha.9 --all-targets --no-default-features --features sval1 +Features: test-name=librust-value-bag-dev:sval1 +Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-sval-1.0.0+default-dev, librust-sval-1.0.0+test-dev, librust-wasm-bindgen-0.2+default-dev, @ +Restrictions: allow-stderr, skip-not-installable + +Test-Command: /usr/share/cargo/bin/cargo-auto-test value-bag 1.0.0-alpha.9 --all-targets --no-default-features --features sval1_lib +Features: test-name=librust-value-bag-dev:sval1_lib +Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-sval-1.0.0+default-dev, librust-sval-1.0.0+test-dev, librust-wasm-bindgen-0.2+default-dev, @ Restrictions: allow-stderr, skip-not-installable Test-Command: /usr/share/cargo/bin/cargo-auto-test value-bag 1.0.0-alpha.9 --all-targets --no-default-features --features test Features: test-name=librust-value-bag-dev:test -Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-wasm-bindgen-0.2+default-dev, @ +Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-sval-1.0.0+default-dev, librust-sval-1.0.0+test-dev, librust-wasm-bindgen-0.2+default-dev, @ Restrictions: allow-stderr, skip-not-installable Test-Command: /usr/share/cargo/bin/cargo-auto-test value-bag 1.0.0-alpha.9 --all-targets --no-default-features Features: test-name=librust-value-bag-dev: -Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-wasm-bindgen-0.2+default-dev, @ +Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-sval-1.0.0+default-dev, librust-sval-1.0.0+test-dev, librust-wasm-bindgen-0.2+default-dev, @ Restrictions: allow-stderr, skip-not-installable diff --git a/src/value-bag/debian/tests/control.debcargo.hint b/src/value-bag/debian/tests/control.debcargo.hint index 03fe56258..1bfd40e44 100644 --- a/src/value-bag/debian/tests/control.debcargo.hint +++ b/src/value-bag/debian/tests/control.debcargo.hint @@ -1,39 +1,69 @@ Test-Command: /usr/share/cargo/bin/cargo-auto-test value-bag 1.0.0~alpha.9 --all-targets --all-features Features: test-name=rust-value-bag:@ -Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-wasm-bindgen-0.2+default-dev, @ +Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-sval-1.0.0+default-dev, librust-sval-1.0.0+test-dev, librust-wasm-bindgen-0.2+default-dev, @ Restrictions: allow-stderr, skip-not-installable Test-Command: /usr/share/cargo/bin/cargo-auto-test value-bag 1.0.0~alpha.9 --all-targets Features: test-name=librust-value-bag-dev:default -Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-wasm-bindgen-0.2+default-dev, @ +Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-sval-1.0.0+default-dev, librust-sval-1.0.0+test-dev, librust-wasm-bindgen-0.2+default-dev, @ Restrictions: allow-stderr, skip-not-installable Test-Command: /usr/share/cargo/bin/cargo-auto-test value-bag 1.0.0~alpha.9 --all-targets --no-default-features --features erased-serde1 Features: test-name=librust-value-bag-dev:erased-serde1 -Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-wasm-bindgen-0.2+default-dev, @ +Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-sval-1.0.0+default-dev, librust-sval-1.0.0+test-dev, librust-wasm-bindgen-0.2+default-dev, @ Restrictions: allow-stderr, skip-not-installable Test-Command: /usr/share/cargo/bin/cargo-auto-test value-bag 1.0.0~alpha.9 --all-targets --no-default-features --features error Features: test-name=librust-value-bag-dev:error -Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-wasm-bindgen-0.2+default-dev, @ +Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-sval-1.0.0+default-dev, librust-sval-1.0.0+test-dev, librust-wasm-bindgen-0.2+default-dev, @ +Restrictions: allow-stderr, skip-not-installable + +Test-Command: /usr/share/cargo/bin/cargo-auto-test value-bag 1.0.0~alpha.9 --all-targets --no-default-features --features serde +Features: test-name=librust-value-bag-dev:serde +Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-sval-1.0.0+default-dev, librust-sval-1.0.0+test-dev, librust-wasm-bindgen-0.2+default-dev, @ +Restrictions: allow-stderr, skip-not-installable + +Test-Command: /usr/share/cargo/bin/cargo-auto-test value-bag 1.0.0~alpha.9 --all-targets --no-default-features --features serde1 +Features: test-name=librust-value-bag-dev:serde1 +Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-sval-1.0.0+default-dev, librust-sval-1.0.0+test-dev, librust-wasm-bindgen-0.2+default-dev, @ +Restrictions: allow-stderr, skip-not-installable + +Test-Command: /usr/share/cargo/bin/cargo-auto-test value-bag 1.0.0~alpha.9 --all-targets --no-default-features --features serde1_fmt +Features: test-name=librust-value-bag-dev:serde1_fmt +Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-sval-1.0.0+default-dev, librust-sval-1.0.0+test-dev, librust-wasm-bindgen-0.2+default-dev, @ Restrictions: allow-stderr, skip-not-installable Test-Command: /usr/share/cargo/bin/cargo-auto-test value-bag 1.0.0~alpha.9 --all-targets --no-default-features --features serde1_lib Features: test-name=librust-value-bag-dev:serde1_lib -Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-wasm-bindgen-0.2+default-dev, @ +Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-sval-1.0.0+default-dev, librust-sval-1.0.0+test-dev, librust-wasm-bindgen-0.2+default-dev, @ Restrictions: allow-stderr, skip-not-installable Test-Command: /usr/share/cargo/bin/cargo-auto-test value-bag 1.0.0~alpha.9 --all-targets --no-default-features --features std Features: test-name=librust-value-bag-dev:std -Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-wasm-bindgen-0.2+default-dev, @ +Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-sval-1.0.0+default-dev, librust-sval-1.0.0+test-dev, librust-wasm-bindgen-0.2+default-dev, @ +Restrictions: allow-stderr, skip-not-installable + +Test-Command: /usr/share/cargo/bin/cargo-auto-test value-bag 1.0.0~alpha.9 --all-targets --no-default-features --features sval +Features: test-name=librust-value-bag-dev:sval +Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-sval-1.0.0+default-dev, librust-sval-1.0.0+test-dev, librust-wasm-bindgen-0.2+default-dev, @ +Restrictions: allow-stderr, skip-not-installable + +Test-Command: /usr/share/cargo/bin/cargo-auto-test value-bag 1.0.0~alpha.9 --all-targets --no-default-features --features sval1 +Features: test-name=librust-value-bag-dev:sval1 +Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-sval-1.0.0+default-dev, librust-sval-1.0.0+test-dev, librust-wasm-bindgen-0.2+default-dev, @ +Restrictions: allow-stderr, skip-not-installable + +Test-Command: /usr/share/cargo/bin/cargo-auto-test value-bag 1.0.0~alpha.9 --all-targets --no-default-features --features sval1_lib +Features: test-name=librust-value-bag-dev:sval1_lib +Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-sval-1.0.0+default-dev, librust-sval-1.0.0+test-dev, librust-wasm-bindgen-0.2+default-dev, @ Restrictions: allow-stderr, skip-not-installable Test-Command: /usr/share/cargo/bin/cargo-auto-test value-bag 1.0.0~alpha.9 --all-targets --no-default-features --features test Features: test-name=librust-value-bag-dev:test -Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-wasm-bindgen-0.2+default-dev, @ +Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-sval-1.0.0+default-dev, librust-sval-1.0.0+test-dev, librust-wasm-bindgen-0.2+default-dev, @ Restrictions: allow-stderr, skip-not-installable Test-Command: /usr/share/cargo/bin/cargo-auto-test value-bag 1.0.0~alpha.9 --all-targets --no-default-features Features: test-name=librust-value-bag-dev: -Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-wasm-bindgen-0.2+default-dev, @ +Depends: dh-cargo (>= 18), librust-serde-json-1+default-dev, librust-serde-test-1+default-dev, librust-sval-1.0.0+default-dev, librust-sval-1.0.0+test-dev, librust-wasm-bindgen-0.2+default-dev, @ Restrictions: allow-stderr, skip-not-installable -- 2.39.5