thread_local: update to 1.1.4

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

diff --git a/src/thread-local/debian/changelog b/src/thread-local/debian/changelog
index 38876f3530cda03bb639bb27f29735cab1d4e55a..344636ef842eea640a2fd06524fb4db6dda9f7ba 100644 (file)
--- a/src/thread-local/debian/changelog
+++ b/src/thread-local/debian/changelog
@@ -1,3 +1,34 @@
+rust-thread-local (1.1.4-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package thread_local 1.1.4 from crates.io using debcargo 2.5.0
+
+ -- Fabian Grünbichler <f.gruenbichler@proxmox.com>  Tue, 26 Jul 2022 14:38:24 +0200
+
+rust-thread-local (1.1.3-3) unstable; urgency=medium
+
+  * Team upload.
+  * Package thread_local 1.1.3 from crates.io using debcargo 2.4.4
+  * Disable benches that depend on criterion which we don't have in Debian.
+    (Closes: 992778)
+
+ -- Peter Michael Green <plugwash@debian.org>  Tue, 24 Aug 2021 16:23:08 +0000
+
+rust-thread-local (1.1.3-2) unstable; urgency=medium
+
+  * Team upload.
+  * Package thread_local 1.1.3 from crates.io using debcargo 2.4.4
+  * Fix 1970 timestamps
+
+ -- Peter Michael Green <plugwash@debian.org>  Sun, 22 Aug 2021 17:52:37 +0000
+
+rust-thread-local (1.1.3-1) unstable; urgency=medium
+
+  * Team upload.
+  * Package thread_local 1.1.3 from crates.io using debcargo 2.4.4-alpha.0
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 21 Aug 2021 18:41:05 +0200
+
 rust-thread-local (1.0.1-1) unstable; urgency=medium
 
   * Team upload.

diff --git a/src/thread-local/debian/copyright.debcargo.hint b/src/thread-local/debian/copyright.debcargo.hint
index 074a8f31174ead3f521b213452b0b9a373b20256..3dca58fc3a6cd657f20ae84efa42ab436efacb74 100644 (file)
--- a/src/thread-local/debian/copyright.debcargo.hint
+++ b/src/thread-local/debian/copyright.debcargo.hint
@@ -42,8 +42,8 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2018-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2018-2020 Paride Legovini <pl@ninthfloor.org>
+ 2018-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2018-2022 Paride Legovini <paride@debian.org>
 License: Apache-2.0 or MIT
 
 License: Apache-2.0

diff --git a/src/thread-local/debian/debcargo.toml b/src/thread-local/debian/debcargo.toml
index 4c0c29697ff97baed806c68000d3c2a5544a9554..fbfd7a56518d6a1ac2d14d08d1cb4131bd8543cb 100644 (file)
--- a/src/thread-local/debian/debcargo.toml
+++ b/src/thread-local/debian/debcargo.toml
@@ -1,2 +1,3 @@
 overlay = "."
 uploaders = ["Paride Legovini <paride@debian.org>"]
+collapse_features = true

diff --git a/src/thread-local/debian/patches/disable-criteron.diff b/src/thread-local/debian/patches/disable-criteron.diff
new file mode 100644 (file)
index 0000000..56a5800
--- /dev/null
+++ b/src/thread-local/debian/patches/disable-criteron.diff
@@ -0,0 +1,52 @@
+Index: thread-local/Cargo.toml
+===================================================================
+--- thread-local.orig/Cargo.toml
++++ thread-local/Cargo.toml
+@@ -22,13 +22,13 @@ keywords = ["thread_local", "concurrent"
+ license = "Apache-2.0/MIT"
+ repository = "https://github.com/Amanieu/thread_local-rs"
+ 
+-[[bench]]
+-name = "thread_local"
+-harness = false
+-required-features = ["criterion"]
+-[dependencies.criterion]
+-version = "0.3.3"
+-optional = true
++#[[bench]]
++#name = "thread_local"
++#harness = false
++#required-features = ["criterion"]
++#[dependencies.criterion]
++#version = "0.3.3"
++#optional = true
+ 
+ [dependencies.once_cell]
+ version = "1.5.2"
+Index: thread-local/benches/thread_local.rs
+===================================================================
+--- thread-local.orig/benches/thread_local.rs
++++ thread-local/benches/thread_local.rs
+@@ -1,12 +1,12 @@
+-extern crate criterion;
++//extern crate criterion;
+ extern crate thread_local;
+ 
+-use criterion::{black_box, BatchSize};
++//use criterion::{black_box, BatchSize};
+ 
+ use thread_local::ThreadLocal;
+ 
+ fn main() {
+-    let mut c = criterion::Criterion::default().configure_from_args();
++    /*let mut c = criterion::Criterion::default().configure_from_args();
+ 
+     c.bench_function("get", |b| {
+         let local = ThreadLocal::new();
+@@ -24,5 +24,5 @@ fn main() {
+             },
+             BatchSize::SmallInput,
+         )
+-    });
++    });*/
+ }

diff --git a/src/thread-local/debian/patches/series b/src/thread-local/debian/patches/series
new file mode 100644 (file)
index 0000000..e52ae29
--- /dev/null
+++ b/src/thread-local/debian/patches/series
@@ -0,0 +1 @@
+disable-criteron.diff

diff --git a/src/thread-local/debian/rules b/src/thread-local/debian/rules
new file mode 100755 (executable)
index 0000000..00972f5
--- /dev/null
+++ b/src/thread-local/debian/rules
@@ -0,0 +1,9 @@
+#!/usr/bin/make -f
+%:
+       dh $@ --buildsystem cargo
+
+override_dh_auto_test:
+       dh_auto_test -- test --all
+
+execute_after_dh_testdir:
+       find . ! -newermt "jan 01, 2000" -exec touch {} +

diff --git a/src/thread-local/debian/rules.debcargo.hint b/src/thread-local/debian/rules.debcargo.hint
new file mode 100755 (executable)
index 0000000..92c239b
--- /dev/null
+++ b/src/thread-local/debian/rules.debcargo.hint
@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+%:
+       dh $@ --buildsystem cargo
+
+override_dh_auto_test:
+       dh_auto_test -- test --all