log: update to 0.4.17

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/src/log/debian/changelog b/src/log/debian/changelog
index 1c1d071a0e763caab0ad18fd384e3b7d6804c907..dedf11a56f81b31fdfd969efe79f7d8f4430071c 100644 (file)
--- a/src/log/debian/changelog
+++ b/src/log/debian/changelog
@@ -1,3 +1,10 @@
+rust-log (0.4.17-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package log 0.4.17 from crates.io using debcargo 2.5.0
+
+ -- Fabian Grünbichler <f.gruenbichler@proxmox.com>  Mon, 16 May 2022 14:41:20 +0200
+
 rust-log (0.4.11-2) unstable; urgency=medium
 
   * Package log 0.4.11 from crates.io using debcargo 2.4.3

diff --git a/src/log/debian/copyright.debcargo.hint b/src/log/debian/copyright.debcargo.hint
index 20173e5de4cf665a1106c2c6a47fa7dff29631be..c8d58d048b5468c4a00a8b07a27a8f49ddef150d 100644 (file)
--- a/src/log/debian/copyright.debcargo.hint
+++ b/src/log/debian/copyright.debcargo.hint
@@ -35,8 +35,8 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2018-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2018-2020 Sylvestre Ledru <sylvestre@debian.org>
+ 2018-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2018-2022 Sylvestre Ledru <sylvestre@debian.org>
 License: MIT or Apache-2.0
 
 License: Apache-2.0

diff --git a/src/log/debian/debcargo.toml b/src/log/debian/debcargo.toml
index eceda97439ca1f169d138b84a19df5acc21cc0dd..6ee5d78c193e522666f86cdfbf0609104afb78f6 100644 (file)
--- a/src/log/debian/debcargo.toml
+++ b/src/log/debian/debcargo.toml
@@ -1,5 +1,6 @@
 overlay = "."
 uploaders = ["Sylvestre Ledru <sylvestre@debian.org>"]
+allow_prerelease_deps = true
 
 [packages."lib+@"]
 test_is_broken = true

diff --git a/src/log/debian/patches/ignore-sval.diff b/src/log/debian/patches/ignore-sval.diff
deleted file mode 100644 (file)
index 47c35a4..0000000
--- a/src/log/debian/patches/ignore-sval.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: log/Cargo.toml
-===================================================================
---- log.orig/Cargo.toml
-+++ log/Cargo.toml
-@@ -24,7 +24,7 @@ categories = ["development-tools::debugg
- license = "MIT OR Apache-2.0"
- repository = "https://github.com/rust-lang/log"
- [package.metadata.docs.rs]
--features = ["std", "serde", "kv_unstable_sval"]
-+features = ["std", "serde"]
- 
- [[test]]
- name = "filters"
-@@ -41,20 +41,21 @@ version = "1.0"
- optional = true
- default-features = false
- 
--[dependencies.sval]
--version = "0.5.2"
--optional = true
--default-features = false
-+# [dependencies.sval]
-+# version = "0.5.2"
-+# optional = true
-+# default-features = false
-+
- [dev-dependencies.serde_test]
- version = "1.0"
- 
--[dev-dependencies.sval]
--version = "0.5.2"
--features = ["test"]
-+# [dev-dependencies.sval]
-+# version = "0.5.2"
-+# features = ["test"]
- 
- [features]
- kv_unstable = []
--kv_unstable_sval = ["kv_unstable", "sval/fmt"]
-+kv_unstable_sval = ["kv_unstable"]#, "sval/fmt"]
- max_level_debug = []
- max_level_error = []
- max_level_info = []

diff --git a/src/log/debian/patches/remove-prerelease-deps.diff b/src/log/debian/patches/remove-prerelease-deps.diff
new file mode 100644 (file)
index 0000000..c28cbd3
--- /dev/null
+++ b/src/log/debian/patches/remove-prerelease-deps.diff
@@ -0,0 +1,61 @@
+Index: log/Cargo.toml
+===================================================================
+--- log.orig/Cargo.toml
++++ log/Cargo.toml
+@@ -30,7 +30,6 @@ features = [
+     "std",
+     "serde",
+     "kv_unstable_std",
+-    "kv_unstable_sval",
+     "kv_unstable_serde",
+ ]
+ 
+@@ -52,16 +51,6 @@ version = "1.0"
+ optional = true
+ default-features = false
+ 
+-[dependencies.sval]
+-version = "=1.0.0-alpha.5"
+-optional = true
+-default-features = false
+-
+-[dependencies.value-bag]
+-version = "=1.0.0-alpha.9"
+-optional = true
+-default-features = false
+-
+ [dev-dependencies.rustversion]
+ version = "1.0"
+ 
+@@ -72,31 +61,7 @@ features = ["derive"]
+ [dev-dependencies.serde_test]
+ version = "1.0"
+ 
+-[dev-dependencies.sval]
+-version = "=1.0.0-alpha.5"
+-features = ["derive"]
+-
+-[dev-dependencies.value-bag]
+-version = "=1.0.0-alpha.9"
+-features = ["test"]
+-
+ [features]
+-kv_unstable = ["value-bag"]
+-kv_unstable_serde = [
+-    "kv_unstable_std",
+-    "value-bag/serde",
+-    "serde",
+-]
+-kv_unstable_std = [
+-    "std",
+-    "kv_unstable",
+-    "value-bag/error",
+-]
+-kv_unstable_sval = [
+-    "kv_unstable",
+-    "value-bag/sval",
+-    "sval",
+-]
+ max_level_debug = []
+ max_level_error = []
+ max_level_info = []

diff --git a/src/log/debian/patches/series b/src/log/debian/patches/series
index a1c6122ceb27b31933497018c2eadbf4d5f1c06c..77aba44b251a609d1f1f8dc2c0e2cd87df23170f 100644 (file)
--- a/src/log/debian/patches/series
+++ b/src/log/debian/patches/series
@@ -1 +1 @@
-ignore-sval.diff
+remove-prerelease-deps.diff