rayon-core - new upstream release.

(cherry picked from commit de8007fd741080d3c10112ead6f20884d2c75ded)

diff --git a/src/rayon-core/debian/changelog b/src/rayon-core/debian/changelog
index 7bc5ae552b280e7bc06984b572144fe1d986ecfc..c78f83a5479febc6d95bdfd33f9dcda282ad4f30 100644 (file)
--- a/src/rayon-core/debian/changelog
+++ b/src/rayon-core/debian/changelog
@@ -1,3 +1,11 @@
+rust-rayon-core (1.11.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package rayon-core 1.11.0 from crates.io using debcargo 2.6.0
+  * Update constrain-thread-count.patch for new upstream.
+
+ -- Peter Michael Green <plugwash@debian.org>  Sat, 29 Jul 2023 03:49:31 +0000
+
 rust-rayon-core (1.10.1-1) unstable; urgency=medium
 
   * Team upload.

diff --git a/src/rayon-core/debian/copyright b/src/rayon-core/debian/copyright
index d9b846f0af2289a8be1e33e6781312d6bf65995d..1d9c4a28846fb582238630488a4ef79f40163033 100644 (file)
--- a/src/rayon-core/debian/copyright
+++ b/src/rayon-core/debian/copyright
@@ -8,12 +8,12 @@ Source: https://github.com/rayon-rs/rayon
 Files: *
 Copyright:
  2014-2020 Niko Matsakis <niko@alum.mit.edu>
- 2016-2020 Josh Stone <cuviper@gmail.com>
+ 2016-2023 Josh Stone <cuviper@gmail.com>
 License: MIT or Apache-2.0
 
 Files: debian/*
 Copyright:
- 2018-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2018-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
  2018 Wolfgang Silbermayr <wolfgang@silbermayr.at>
  2022 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 License: MIT or Apache-2.0

diff --git a/src/rayon-core/debian/copyright.debcargo.hint b/src/rayon-core/debian/copyright.debcargo.hint
index 376c2d099594459dc806e44a832f8f705f5aed25..99b4ff6fdbb6d6d0b24c9a73b413eb073c432312 100644 (file)
--- a/src/rayon-core/debian/copyright.debcargo.hint
+++ b/src/rayon-core/debian/copyright.debcargo.hint
@@ -25,10 +25,10 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2018-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2018-2022 Wolfgang Silbermayr <wolfgang@silbermayr.at>
- 2018-2022 kpcyrd <git@rxv.cc>
- 2018-2022 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+ 2018-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2018-2023 Wolfgang Silbermayr <wolfgang@silbermayr.at>
+ 2018-2023 kpcyrd <git@rxv.cc>
+ 2018-2023 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 License: MIT or Apache-2.0
 
 License: Apache-2.0

diff --git a/src/rayon-core/debian/patches/constrain-thread-count.patch b/src/rayon-core/debian/patches/constrain-thread-count.patch
index 2d5b4a450dc7e30503e65cb2a5a0396eb5844185..04be16516f607c4ee4e0a73cd73c35783d13d8c0 100644 (file)
--- a/src/rayon-core/debian/patches/constrain-thread-count.patch
+++ b/src/rayon-core/debian/patches/constrain-thread-count.patch
@@ -2,22 +2,16 @@ Index: rayon-core/tests/stack_overflow_crash.rs
 ===================================================================
 --- rayon-core.orig/tests/stack_overflow_crash.rs
 +++ rayon-core/tests/stack_overflow_crash.rs
-@@ -69,10 +69,15 @@ fn main() {
-         }
-     } else {
-         let stack_size_in_mb: usize = env::args().nth(1).unwrap().parse().unwrap();
--        let pool = ThreadPoolBuilder::new()
--            .stack_size(stack_size_in_mb * 1024 * 1024)
-+        let mut poolbuilder = ThreadPoolBuilder::new()
-+            .stack_size(stack_size_in_mb * 1024 * 1024);
-+        #[cfg(target_pointer_width = "32")]
-+        if num_cpus::get() > 8 {
-+            poolbuilder = poolbuilder.num_threads(8);
-+        }
-+        let pool = poolbuilder
-             .build()
--            .unwrap();
-+            .expect(&format!("failed to initialise a thread pool with a stack size of {} MB",stack_size_in_mb));
-         pool.install(|| {
-             #[cfg(unix)]
-             disable_core();
+@@ -72,4 +72,9 @@ fn main() {
+-    let pool = ThreadPoolBuilder::new()
+-        .stack_size(stack_size_in_mb * 1024 * 1024)
++    let mut poolbuilder = ThreadPoolBuilder::new()
++        .stack_size(stack_size_in_mb * 1024 * 1024);
++    #[cfg(target_pointer_width = "32")]
++    if num_cpus::get() > 8 {
++        poolbuilder = poolbuilder.num_threads(8);
++    }
++    let pool = poolbuilder
+         .build()
+-        .unwrap();
++        .expect(&format!("failed to initialise a thread pool with a stack size of {} MB",stack_size_in_mb));