derive-builder - new upstream release.

diff --git a/src/derive-builder/debian/changelog b/src/derive-builder/debian/changelog
index bc893f94d6e6f4c3923de5633cf28f143e3debb4..78dd7fcb6e1cb5245fd96b355223df13e55aeb5c 100644 (file)
--- a/src/derive-builder/debian/changelog
+++ b/src/derive-builder/debian/changelog
@@ -1,3 +1,13 @@
+rust-derive-builder (0.11.2-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package derive_builder 0.11.2 from crates.io using debcargo 2.6.0 (Closes: #1024376)
+  * Drop env-logger.diff and drop-features.diff, the dependencies they
+    relate to no longer exist in the new upstream version.
+  * Update remaining patches for new upstream.
+
+ -- Peter Michael Green <plugwash@debian.org>  Sun, 20 Nov 2022 08:08:40 +0000
+
 rust-derive-builder (0.9.0-5) unstable; urgency=medium
 
   * Team upload.

diff --git a/src/derive-builder/debian/copyright.debcargo.hint b/src/derive-builder/debian/copyright.debcargo.hint
index 99b76c6745b11de3cbdc45291de2f1a857b04119..a7722e69533e394ceeb33118f828e5b61df17b2a 100644 (file)
--- a/src/derive-builder/debian/copyright.debcargo.hint
+++ b/src/derive-builder/debian/copyright.debcargo.hint
@@ -20,7 +20,7 @@ Comment:
  be correct information so you should review and fix this before uploading to
  the archive.
 
-Files: ./LICENSE-MIT
+Files: LICENSE-MIT
 Copyright: 2016 rust-derive-builder contributors
 License: UNKNOWN-LICENSE; FIXME (overlay)
 Comment:

diff --git a/src/derive-builder/debian/patches/dont-fail-build-due-to-warnings.diff b/src/derive-builder/debian/patches/dont-fail-build-due-to-warnings.diff
index 697f07222ad4e0253e0b2a876fbe30a90d07f6d3..ec630f7e58bf26f634f979a17eb45cf2c727ca8b 100644 (file)
--- a/src/derive-builder/debian/patches/dont-fail-build-due-to-warnings.diff
+++ b/src/derive-builder/debian/patches/dont-fail-build-due-to-warnings.diff
@@ -2,11 +2,5 @@ Index: derive-builder/src/lib.rs
 ===================================================================
 --- derive-builder.orig/src/lib.rs
 +++ derive-builder/src/lib.rs
-@@ -553,7 +553,6 @@
- //! [`derive_builder_core`]: https://crates.io/crates/derive_builder_core
- 
- #![crate_type = "proc-macro"]
+@@ -556,1 +556,0 @@
 -#![deny(warnings)]
- 
- #[macro_use]
- extern crate darling;

diff --git a/src/derive-builder/debian/patches/drop-features.diff b/src/derive-builder/debian/patches/drop-features.diff
deleted file mode 100644 (file)
index 55dae55..0000000
--- a/src/derive-builder/debian/patches/drop-features.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: derive-builder/Cargo.toml
-===================================================================
---- derive-builder.orig/Cargo.toml
-+++ derive-builder/Cargo.toml
-@@ -25,9 +25,6 @@ repository = "https://github.com/colin-k
- 
- [lib]
- proc-macro = true
--[dependencies.compiletest_rs]
--version = "0.3.18"
--optional = true
- 
- [dependencies.darling]
- version = "0.10.2"
-@@ -49,10 +46,6 @@ version = "1.0"
- [dependencies.quote]
- version = "1.0"
- 
--[dependencies.skeptic]
--version = "0.13"
--optional = true
--
- [dependencies.syn]
- version = "1.0"
- features = ["full", "extra-traits"]
-@@ -66,13 +59,7 @@ optional = true
- version = "0.4"
- optional = true
- 
--[build-dependencies.skeptic]
--version = "0.13"
--optional = true
--
- [features]
- logging = ["log", "env_logger", "derive_builder_core/logging"]
--nightlytests = ["compiletest_rs"]
--skeptic_tests = ["skeptic"]
- [badges.travis-ci]
- repository = "colin-kiegel/rust-derive-builder"

diff --git a/src/derive-builder/debian/patches/env-logger.diff b/src/derive-builder/debian/patches/env-logger.diff
deleted file mode 100644 (file)
index 4cba964..0000000
--- a/src/derive-builder/debian/patches/env-logger.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: derive-builder/Cargo.toml
-===================================================================
---- derive-builder.orig/Cargo.toml
-+++ derive-builder/Cargo.toml
-@@ -36,7 +36,7 @@ version = "0.10.2"
- version = "=0.9.0"
- 
- [dependencies.env_logger]
--version = "0.5"
-+version = ">=0.5, <0.8"
- optional = true
- 
- [dependencies.log]
-@@ -59,7 +59,7 @@ features = ["full", "extra-traits"]
- [dev-dependencies.pretty_assertions]
- version = "0.6"
- [build-dependencies.env_logger]
--version = "0.5"
-+version = ">=0.5, <0.8"
- optional = true
- 
- [build-dependencies.log]
-Index: derive-builder/src/lib.rs
-===================================================================
---- derive-builder.orig/src/lib.rs
-+++ derive-builder/src/lib.rs
-@@ -590,7 +590,7 @@ static INIT_LOGGER: Once = ONCE_INIT;
- pub fn derive(input: TokenStream) -> TokenStream {
-     #[cfg(feature = "logging")]
-     INIT_LOGGER.call_once(|| {
--        env_logger::init().unwrap();
-+        env_logger::init();
-     });
- 
-     let ast = parse_macro_input!(input as syn::DeriveInput);

diff --git a/src/derive-builder/debian/patches/relax-dep.diff b/src/derive-builder/debian/patches/relax-dep.diff
index 1e030eb88146437311435eefc8a0a9137f6d8f5c..5081c405dd4bf092653026c47b8cba0a616096ce 100644 (file)
--- a/src/derive-builder/debian/patches/relax-dep.diff
+++ b/src/derive-builder/debian/patches/relax-dep.diff
@@ -2,21 +2,8 @@ Index: derive-builder/Cargo.toml
 ===================================================================
 --- derive-builder.orig/Cargo.toml
 +++ derive-builder/Cargo.toml
-@@ -27,7 +27,7 @@ repository = "https://github.com/colin-k
- proc-macro = true
- 
- [dependencies.darling]
--version = "0.10.2"
-+version = "0.14"
- 
- [dependencies.derive_builder_core]
- version = "=0.9.0"
-@@ -50,7 +50,7 @@ version = "1.0"
- version = "1.0"
- features = ["full", "extra-traits"]
+@@ -52,3 +52,3 @@ version = "1.0"
  [dev-dependencies.pretty_assertions]
--version = "0.6"
+-version = "0.6.1"
 +version = "1.0"
- [build-dependencies.env_logger]
- version = ">=0.5, <0.8"
- optional = true
+ 

diff --git a/src/derive-builder/debian/patches/series b/src/derive-builder/debian/patches/series
index e1f0c2de97fa2700b058c0c04bc460eb55c9c858..d0a75eb69f8f1744f7d25a93c499c1326a1b419b 100644 (file)
--- a/src/derive-builder/debian/patches/series
+++ b/src/derive-builder/debian/patches/series
@@ -1,4 +1,2 @@
-env-logger.diff
-drop-features.diff
 dont-fail-build-due-to-warnings.diff
 relax-dep.diff