Revert "parking-lot-core: new upstream release"

Temporary revert to allow for upload of patched version of current
upstream.

This reverts commit d0fb65c78b1d19906041b8e00883325eaea92d5a.

diff --git a/src/parking-lot-core/debian/changelog b/src/parking-lot-core/debian/changelog
index 46e04fa13005856023bc717f61f568f15fae19a9..fb0422a18ebde5869edcaa4eec811f9932bd4e37 100644 (file)
--- a/src/parking-lot-core/debian/changelog
+++ b/src/parking-lot-core/debian/changelog
@@ -1,9 +1,3 @@
-rust-parking-lot-core (0.8.5-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
-
-  * Package parking_lot_core 0.8.5 from crates.io using debcargo 2.5.0
-
- -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 18 Dec 2021 11:27:49 +0100
-
 rust-parking-lot-core (0.7.2-1) unstable; urgency=medium
 
   * Package parking_lot_core 0.7.2 from crates.io using debcargo 2.4.3

diff --git a/src/parking-lot-core/debian/copyright.debcargo.hint b/src/parking-lot-core/debian/copyright.debcargo.hint
index ed294de73294a0787977703142a7fc457d6f5089..a76ba9d28a9cb66a31aebcc4498136916745dea3 100644 (file)
--- a/src/parking-lot-core/debian/copyright.debcargo.hint
+++ b/src/parking-lot-core/debian/copyright.debcargo.hint
@@ -40,6 +40,13 @@ Comment:
  FIXME (overlay): These notices are extracted from files. Please review them
  before uploading to the archive.
 
+Files: ./src/thread_parker/cloudabi.rs
+Copyright: 2016 Amanieu d'Antras
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
 Files: ./src/thread_parker/generic.rs
 Copyright: 2016 Amanieu d'Antras
 License: UNKNOWN-LICENSE; FIXME (overlay)
@@ -126,9 +133,9 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2018-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2018-2021 Sylvestre Ledru <sylvestre@debian.org>
- 2018-2021 Wolfgang Silbermayr <wolfgang@silbermayr.at>
+ 2018-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2018-2020 Sylvestre Ledru <sylvestre@debian.org>
+ 2018-2020 Wolfgang Silbermayr <wolfgang@silbermayr.at>
 License: Apache-2.0 or MIT
 
 License: Apache-2.0

diff --git a/src/redox-syscall/debian/patches/no-nightly.patch b/src/redox-syscall/debian/patches/no-nightly.patch
index 5fbcab650a2cd2db133f06d1e478bf3649e40b14..0ecf4f5bc608ab64c59a5da7273f58f90c6f29a2 100644 (file)
--- a/src/redox-syscall/debian/patches/no-nightly.patch
+++ b/src/redox-syscall/debian/patches/no-nightly.patch
@@ -1,7 +1,8 @@
-Index: redox-syscall/build.rs
-===================================================================
+diff --git a/build.rs b/build.rs
+new file mode 100644
+index 0000000..ca906fa
 --- /dev/null
-+++ redox-syscall/build.rs
++++ b/build.rs
 @@ -0,0 +1,9 @@
 +use std::env;
 +
@@ -12,14 +13,15 @@ Index: redox-syscall/build.rs
 +        }
 +    }
 +}
-Index: redox-syscall/src/lib.rs
-===================================================================
---- redox-syscall.orig/src/lib.rs
-+++ redox-syscall/src/lib.rs
+diff --git a/src/lib.rs b/src/lib.rs
+index 6b8d130..42526f0 100644
+--- a/src/lib.rs
++++ b/src/lib.rs
 @@ -1,5 +1,5 @@
- #![feature(asm)]
 -#![feature(llvm_asm)]
+-#![feature(const_fn)]
 +#![cfg_attr(nightly, feature(llvm_asm))]
++#![cfg_attr(nightly, feature(const_fn))]
  #![cfg_attr(not(test), no_std)]
  
  #[cfg(test)]
@@ -31,7 +33,7 @@ Index: redox-syscall/src/lib.rs
  pub use self::io::*;
  pub use self::number::*;
  pub use self::scheme::*;
-@@ -51,6 +52,7 @@ pub mod error;
+@@ -47,6 +48,7 @@ pub mod error;
  pub mod flag;
  
  /// Functions for low level hardware control