]> git.proxmox.com Git - debcargo-conf.git/commitdiff
Merge branch 'pending-bkt'
authorJames McCoy <jamessan@debian.org>
Sat, 28 May 2022 17:52:54 +0000 (13:52 -0400)
committerJames McCoy <jamessan@debian.org>
Sat, 28 May 2022 17:52:54 +0000 (13:52 -0400)
104 files changed:
release.sh
src/annotate-snippets/debian/changelog [new file with mode: 0644]
src/annotate-snippets/debian/copyright [new file with mode: 0644]
src/annotate-snippets/debian/copyright.debcargo.hint [new file with mode: 0644]
src/annotate-snippets/debian/debcargo.toml [new file with mode: 0644]
src/anyhow/debian/changelog
src/anyhow/debian/copyright
src/anyhow/debian/copyright.debcargo.hint
src/anyhow/debian/patches/drop-backtrace.patch
src/assert-cli/debian/changelog
src/assert-cli/debian/patches/disable-tests-permission-denied.diff [new file with mode: 0644]
src/assert-cli/debian/patches/series
src/atomic-waker/debian/RFS [new file with mode: 0644]
src/atomic-waker/debian/changelog [new file with mode: 0644]
src/atomic-waker/debian/copyright [new file with mode: 0644]
src/atomic-waker/debian/copyright.debcargo.hint [new file with mode: 0644]
src/atomic-waker/debian/debcargo.toml [new file with mode: 0644]
src/automod/debian/changelog
src/automod/debian/copyright
src/automod/debian/copyright.debcargo.hint
src/bkt/debian/bkt.manpages [new file with mode: 0644]
src/bkt/debian/changelog
src/bkt/debian/debcargo.toml
src/bkt/debian/rules [new file with mode: 0755]
src/bkt/debian/rules.debcargo.hint [new file with mode: 0755]
src/chic/debian/changelog [new file with mode: 0644]
src/chic/debian/copyright [new file with mode: 0644]
src/chic/debian/copyright.debcargo.hint [new file with mode: 0644]
src/chic/debian/debcargo.toml [new file with mode: 0644]
src/compiler-builtins/debian/changelog
src/compiler-builtins/debian/copyright
src/compiler-builtins/debian/copyright.debcargo.hint
src/coreutils/debian/cargo-checksum.json.debcargo.hint [new file with mode: 0644]
src/coreutils/debian/changelog
src/coreutils/debian/compat.debcargo.hint [new file with mode: 0644]
src/coreutils/debian/control.debcargo.hint
src/coreutils/debian/copyright.debcargo.hint
src/coreutils/debian/source/format.debcargo.hint [new file with mode: 0644]
src/crossbeam-channel/debian/changelog
src/crossbeam-channel/debian/debcargo.toml
src/crossbeam-channel/debian/patches/add-assert-info.patch [new file with mode: 0644]
src/crossbeam-channel/debian/patches/constrain-bench-thread-count.patch [new file with mode: 0644]
src/crossbeam-channel/debian/patches/fix-tests-no-default-features.patch [new file with mode: 0644]
src/crossbeam-channel/debian/patches/series [new file with mode: 0644]
src/crossbeam-epoch/debian/changelog
src/crossbeam-epoch/debian/patches/fix-tests-no-default-features.patch [new file with mode: 0644]
src/crossbeam-epoch/debian/patches/series
src/crossbeam-utils/debian/changelog
src/crossbeam-utils/debian/copyright
src/crossbeam-utils/debian/copyright.debcargo.hint
src/crossbeam-utils/debian/debcargo.toml
src/crossbeam-utils/debian/patches/disable-loom.diff
src/crossbeam-utils/debian/patches/relax-dep.diff
src/crypto-common/debian/changelog [new file with mode: 0644]
src/crypto-common/debian/copyright [new file with mode: 0644]
src/crypto-common/debian/copyright.debcargo.hint [new file with mode: 0644]
src/crypto-common/debian/debcargo.toml [new file with mode: 0644]
src/digest/debian/changelog
src/digest/debian/copyright.debcargo.hint
src/magnet-uri/debian/copyright
src/pathdiff/debian/copyright
src/rayon-core/debian/changelog
src/rayon-core/debian/patches/constrain-thread-count.patch [new file with mode: 0644]
src/rayon-core/debian/patches/series [new file with mode: 0644]
src/rustversion/debian/changelog
src/rustversion/debian/copyright
src/rustversion/debian/copyright.debcargo.hint
src/scale-info/debian/changelog [new file with mode: 0644]
src/scale-info/debian/copyright [new file with mode: 0644]
src/scale-info/debian/copyright.debcargo.hint [new file with mode: 0644]
src/scale-info/debian/debcargo.toml [new file with mode: 0644]
src/sequoia-openpgp/debian/changelog
src/sequoia-openpgp/debian/patches/cleanup-deps.patch
src/sequoia-openpgp/debian/patches/drop-criterion.patch
src/sequoia-openpgp/debian/patches/drop-experimental-and-variable-time-crypto-backends.patch
src/sequoia-openpgp/debian/tests/control
src/sequoia-openpgp/debian/tests/control.debcargo.hint
src/serde-derive/debian/RFS [deleted file]
src/serde-derive/debian/changelog
src/serde-ignored/debian/RFS [deleted file]
src/serde-ignored/debian/changelog
src/sha1/debian/changelog
src/sha1/debian/copyright.debcargo.hint
src/sha1/debian/debcargo.toml
src/typenum/debian/changelog
src/typenum/debian/copyright.debcargo.hint
src/typenum/debian/debcargo.toml
src/typenum/debian/patches/disable-scale-info.diff [new file with mode: 0644]
src/typenum/debian/patches/series [new file with mode: 0644]
src/zram-generator/debian/changelog
src/zram-generator/debian/control [deleted file]
src/zram-generator/debian/copyright
src/zram-generator/debian/copyright.debcargo.hint
src/zram-generator/debian/debcargo.toml
src/zram-generator/debian/manpages [deleted file]
src/zram-generator/debian/patches/series [new file with mode: 0644]
src/zram-generator/debian/patches/systemd-dir.patch [new file with mode: 0644]
src/zram-generator/debian/postinst [deleted file]
src/zram-generator/debian/rules
src/zram-generator/debian/rules.debcargo.hint [new file with mode: 0755]
src/zram-generator/debian/systemd-zram-generator.install [new file with mode: 0755]
src/zram-generator/debian/systemd-zram-generator.lintian-overrides [deleted file]
src/zram-generator/debian/systemd-zram-generator.manpages [new file with mode: 0644]
src/zram-generator/debian/zram-generator.conf [deleted file]

index db72aaf67d8e488940d0555ff35f3572ca9de93a..9ac5a27d09fe92a7d24512d06ce25754f74d8bf9 100755 (executable)
@@ -203,11 +203,11 @@ cat <<eof
 Since the source package is already in Debian and this version does not introduce
 new binaries, then you can just go ahead and directly dput the source package.
 
-  cd build && dput ${DEBSRC}_${DEBVER}_source.changes && git checkout - & git merge -
+  cd build && dput ${DEBSRC}_${DEBVER}_source.changes && git checkout - && git merge -
 
 If you want to build and test it, run:
 
-  cd build && ./build.sh $CRATE && dput ${DEBSRC}_${DEBVER}_source.changes && git checkout - & git merge -
+  cd build && ./build.sh $CRATE && dput ${DEBSRC}_${DEBVER}_source.changes && git checkout - && git merge -
 
 For your reference, this source package builds $(echo "$upload_bin_packages" | wc -l) binary package(s):
 $upload_bin_packages
diff --git a/src/annotate-snippets/debian/changelog b/src/annotate-snippets/debian/changelog
new file mode 100644 (file)
index 0000000..2633025
--- /dev/null
@@ -0,0 +1,5 @@
+rust-annotate-snippets (0.9.1-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Package annotate-snippets 0.9.1 from crates.io using debcargo 2.5.0
+
+ -- Jelmer Vernooij <jelmer@debian.org>  Wed, 25 May 2022 16:56:54 +0100
diff --git a/src/annotate-snippets/debian/copyright b/src/annotate-snippets/debian/copyright
new file mode 100644 (file)
index 0000000..9783830
--- /dev/null
@@ -0,0 +1,37 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: annotate-snippets
+Upstream-Contact: Zibi Braniecki <gandalf@mozilla.com>
+Source: https://github.com/rust-lang/annotate-snippets-rs
+
+Files: *
+Copyright: 2018-2021 Mozilla
+License: Apache-2.0 or MIT
+
+Files: debian/*
+Copyright:
+ 2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2022 Jelmer Vernooij <jelmer@debian.org>
+License: Apache-2.0 or MIT
+
+License: Apache-2.0
+ Debian systems provide the Apache 2.0 license in
+ /usr/share/common-licenses/Apache-2.0
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
diff --git a/src/annotate-snippets/debian/copyright.debcargo.hint b/src/annotate-snippets/debian/copyright.debcargo.hint
new file mode 100644 (file)
index 0000000..8b7df28
--- /dev/null
@@ -0,0 +1,49 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: annotate-snippets
+Upstream-Contact: Zibi Braniecki <gandalf@mozilla.com>
+Source: https://github.com/rust-lang/annotate-snippets-rs
+
+Files: *
+Copyright: FIXME (overlay) UNKNOWN-YEARS Zibi Braniecki <gandalf@mozilla.com>
+License: Apache-2.0 or MIT
+Comment:
+ FIXME (overlay): Since upstream copyright years are not available in
+ Cargo.toml, they were extracted from the upstream Git repository. This may not
+ be correct information so you should review and fix this before uploading to
+ the archive.
+
+Files: ./LICENSE-MIT
+Copyright: 2017 Mozilla
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: debian/*
+Copyright:
+ 2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2022 Jelmer Vernooij <jelmer@debian.org>
+License: Apache-2.0 or MIT
+
+License: Apache-2.0
+ Debian systems provide the Apache 2.0 license in
+ /usr/share/common-licenses/Apache-2.0
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
diff --git a/src/annotate-snippets/debian/debcargo.toml b/src/annotate-snippets/debian/debcargo.toml
new file mode 100644 (file)
index 0000000..77e8151
--- /dev/null
@@ -0,0 +1,2 @@
+overlay = "."
+uploaders = ["Jelmer Vernooij <jelmer@debian.org>"]
index 241b9d0e7d4e2b9b5947ad782741fd16f9f57e5a..92eaf373fe5818703e8422b41e0c86a2730ce0ef 100644 (file)
@@ -1,3 +1,9 @@
+rust-anyhow (1.0.57-1) unstable; urgency=medium
+
+  * Package anyhow 1.0.57 from crates.io using debcargo 2.5.0
+
+ -- Wolfgang Silbermayr <wolfgang@silbermayr.at>  Mon, 23 May 2022 20:28:15 +0200
+
 rust-anyhow (1.0.44-2) unstable; urgency=medium
 
   * Team upload.
index 555516e14f0119737d822cdc2de5f9755f20347c..315e5b9efd101a272901bddaf27d01b5751ece90 100644 (file)
@@ -9,8 +9,8 @@ License: MIT or Apache-2.0
 
 Files: debian/*
 Copyright:
- 2019-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2019-2020 Wolfgang Silbermayr <wolfgang@silbermayr.at>
+ 2019-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2019-2022 Wolfgang Silbermayr <wolfgang@silbermayr.at>
 License: MIT or Apache-2.0
 
 License: Apache-2.0
index 5f72c001af8d684c389878f9a01d34c6d388e255..50cdc3a75ef934f6a2259086ad67848e5b1ed6ab 100644 (file)
@@ -14,8 +14,8 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2019-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2019-2021 Wolfgang Silbermayr <wolfgang@silbermayr.at>
+ 2019-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2019-2022 Wolfgang Silbermayr <wolfgang@silbermayr.at>
 License: MIT or Apache-2.0
 
 License: Apache-2.0
index c7fbfcf138da992bbd2898b86289258b2cbe88b8..c176524196f336c8db2059672a044a4dbfd827cc 100644 (file)
@@ -1,14 +1,13 @@
-Index: anyhow/Cargo.toml
-===================================================================
---- anyhow.orig/Cargo.toml
-+++ anyhow/Cargo.toml
-@@ -23,9 +23,6 @@ repository = "https://github.com/dtolnay
- [package.metadata.docs.rs]
- rustdoc-args = ["--cfg", "doc_cfg"]
- targets = ["x86_64-unknown-linux-gnu"]
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -29,10 +29,6 @@
+     "doc_cfg",
+ ]
 -[dependencies.backtrace]
 -version = "0.3.51"
 -optional = true
+-
  [dev-dependencies.futures]
  version = "0.3"
  default-features = false
index cb65a0754c839dfd2892fb008f9b81ecb808e987..b567053ca5dc079ff11a8dc8e1a49077d70d101d 100644 (file)
@@ -1,3 +1,11 @@
+rust-assert-cli (0.6.3-4) unstable; urgency=medium
+
+  * Team upload.
+  * Package assert_cli 0.6.3 from crates.io using debcargo 2.5.0
+  * Disable tests that fail with a permission denied error on the debian test infrastructure.
+
+ -- Peter Michael Green <plugwash@debian.org>  Tue, 24 May 2022 04:41:17 +0000
+
 rust-assert-cli (0.6.3-3) unstable; urgency=medium
 
   * Team upload.
diff --git a/src/assert-cli/debian/patches/disable-tests-permission-denied.diff b/src/assert-cli/debian/patches/disable-tests-permission-denied.diff
new file mode 100644 (file)
index 0000000..084bbdc
--- /dev/null
@@ -0,0 +1,16 @@
+--- rust-assert-cli-0.6.3.orig/tests/cargo.rs
++++ rust-assert-cli-0.6.3/tests/cargo.rs
+@@ -1,6 +1,6 @@
+ extern crate assert_cli;
+-#[test]
++/*#[test]
+ fn main_binary() {
+     assert_cli::Assert::main_binary()
+         .with_env(assert_cli::Environment::inherit().insert("stdout", "42"))
+@@ -16,4 +16,4 @@ fn cargo_binary() {
+         .stdout()
+         .is("42")
+         .unwrap();
+-}
++}*/
index 18e7289db8d00b9fff0b6dbb113d229c7d51fdff..9ea298e7036bbd9f853d2653537a83a83564f106 100644 (file)
@@ -1,3 +1,4 @@
 relax-dep.diff
 dont-check-stderr-in-cargo-test.diff
 fix-tests.diff
+disable-tests-permission-denied.diff
diff --git a/src/atomic-waker/debian/RFS b/src/atomic-waker/debian/RFS
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/src/atomic-waker/debian/changelog b/src/atomic-waker/debian/changelog
new file mode 100644 (file)
index 0000000..b3b6503
--- /dev/null
@@ -0,0 +1,5 @@
+rust-atomic-waker (1.0.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Package atomic-waker 1.0.0 from crates.io using debcargo 2.5.0
+
+ -- Matthias Geiger <matthias.geiger1024@tutanota.de>  Tue, 24 May 2022 19:54:06 -0600
diff --git a/src/atomic-waker/debian/copyright b/src/atomic-waker/debian/copyright
new file mode 100644 (file)
index 0000000..4134fc4
--- /dev/null
@@ -0,0 +1,38 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: atomic-waker
+Upstream-Contact: Stjepan Glavina <stjepang@gmail.com>
+Source: https://github.com/stjepang/atomic-waker
+
+Files: *
+Copyright: 2020-2022 Stjepan Glavina <stjepang@gmail.com>
+License: Apache-2.0 or MIT
+
+Files: debian/*
+Copyright:
+ 2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2022 Matthias Geiger <matthias.geiger1024@tutanota.de>
+License: Apache-2.0 or MIT
+
+License: Apache-2.0
+ Debian systems provide the Apache 2.0 license in
+ /usr/share/common-licenses/Apache-2.0
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+
diff --git a/src/atomic-waker/debian/copyright.debcargo.hint b/src/atomic-waker/debian/copyright.debcargo.hint
new file mode 100644 (file)
index 0000000..5cd9419
--- /dev/null
@@ -0,0 +1,42 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: atomic-waker
+Upstream-Contact: Stjepan Glavina <stjepang@gmail.com>
+Source: https://github.com/stjepang/atomic-waker
+
+Files: *
+Copyright: FIXME (overlay) UNKNOWN-YEARS Stjepan Glavina <stjepang@gmail.com>
+License: Apache-2.0 or MIT
+Comment:
+ FIXME (overlay): Since upstream copyright years are not available in
+ Cargo.toml, they were extracted from the upstream Git repository. This may not
+ be correct information so you should review and fix this before uploading to
+ the archive.
+
+Files: debian/*
+Copyright:
+ 2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2022 Matthias Geiger <matthias.geiger1024@tutanota.de>
+License: Apache-2.0 or MIT
+
+License: Apache-2.0
+ Debian systems provide the Apache 2.0 license in
+ /usr/share/common-licenses/Apache-2.0
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
diff --git a/src/atomic-waker/debian/debcargo.toml b/src/atomic-waker/debian/debcargo.toml
new file mode 100644 (file)
index 0000000..b42a093
--- /dev/null
@@ -0,0 +1,2 @@
+overlay = "."
+uploaders = ["Matthias Geiger <matthias.geiger1024@tutanota.de>"]
index 856fc7e7c7286e11895bccb73231df1428515a61..ff1c425349402b48ff12ad1b7cd73eb931a9d78c 100644 (file)
@@ -1,3 +1,9 @@
+rust-automod (1.0.3-1) unstable; urgency=medium
+
+  * Package automod 1.0.3 from crates.io using debcargo 2.5.0
+
+ -- Wolfgang Silbermayr <wolfgang@silbermayr.at>  Tue, 24 May 2022 05:10:48 +0200
+
 rust-automod (1.0.2-1) unstable; urgency=medium
 
   * Package automod 1.0.2 from crates.io using debcargo 2.4.4-alpha.0
index 389b74cbe20684f359df7bbabae78061b7e4e7a4..fff10e67fa1f96e7b52c38db20153773dee6f78a 100644 (file)
@@ -9,8 +9,8 @@ License: MIT or Apache-2.0
 
 Files: debian/*
 Copyright:
- 2020-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2020-2021 Wolfgang Silbermayr <wolfgang@silbermayr.at>
+ 2020-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2020-2022 Wolfgang Silbermayr <wolfgang@silbermayr.at>
 License: MIT or Apache-2.0
 
 License: Apache-2.0
index 53d85dfa1b93048c859b08d78cc8dcd338b87ad6..abb40d1f25a6cb8d65ac2ad243670fb2542004a7 100644 (file)
@@ -14,8 +14,8 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2020-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2020-2021 Wolfgang Silbermayr <wolfgang@silbermayr.at>
+ 2020-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2020-2022 Wolfgang Silbermayr <wolfgang@silbermayr.at>
 License: MIT or Apache-2.0
 
 License: Apache-2.0
diff --git a/src/bkt/debian/bkt.manpages b/src/bkt/debian/bkt.manpages
new file mode 100644 (file)
index 0000000..77cfd6b
--- /dev/null
@@ -0,0 +1 @@
+debian/bkt.1
index 243454b263696745ab619bc2a901d59a5261833d..77ad2877a8ac090a911b7e777d7818ae440c4bd9 100644 (file)
@@ -1,3 +1,9 @@
+rust-bkt (0.5.4-2) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Package bkt 0.5.4 from crates.io using debcargo 2.5.0
+
+ -- Ben Westover <kwestover.kw@gmail.com>  Sun, 22 May 2022 19:35:35 -0400
+
 rust-bkt (0.5.4-1) unstable; urgency=medium
 
   * Package bkt 0.5.4 from crates.io using debcargo 2.5.0
index 9a656ca4853e0ddb9547b6b03c4c5fa97312fafe..15033a9c9a92d3e9a7b9beaa3bc3cc5cbb3e359c 100644 (file)
@@ -2,6 +2,9 @@ overlay = "."
 uploaders = ["Ben Westover <kwestover.kw@gmail.com>"]
 collapse_features = true
 
+[source]
+build_depends = ["help2man"]
+
 [packages.bin]
 section = "misc"
 synopsis = "Subprocess caching utility written in Rust"
diff --git a/src/bkt/debian/rules b/src/bkt/debian/rules
new file mode 100755 (executable)
index 0000000..ad328e3
--- /dev/null
@@ -0,0 +1,7 @@
+#!/usr/bin/make -f
+%:
+       dh $@ --buildsystem cargo
+
+override_dh_installman:
+       help2man -s 1 -n "A subprocess caching utility" debian/bkt/usr/bin/bkt > debian/bkt.1
+       dh_installman -O--buildsystem=cargo
diff --git a/src/bkt/debian/rules.debcargo.hint b/src/bkt/debian/rules.debcargo.hint
new file mode 100755 (executable)
index 0000000..044c1c2
--- /dev/null
@@ -0,0 +1,3 @@
+#!/usr/bin/make -f
+%:
+       dh $@ --buildsystem cargo
diff --git a/src/chic/debian/changelog b/src/chic/debian/changelog
new file mode 100644 (file)
index 0000000..9de78b2
--- /dev/null
@@ -0,0 +1,5 @@
+rust-chic (1.2.2-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Package chic 1.2.2 from crates.io using debcargo 2.5.0
+
+ -- Jelmer Vernooij <jelmer@debian.org>  Wed, 25 May 2022 16:55:38 +0100
diff --git a/src/chic/debian/copyright b/src/chic/debian/copyright
new file mode 100644 (file)
index 0000000..3c6cf18
--- /dev/null
@@ -0,0 +1,42 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: chic
+Upstream-Contact: Yoshua Wuyts <yoshuawuyts@gmail.com>
+Source: https://github.com/yoshuawuyts/chic
+
+Files: *
+Copyright: 2019 Yoshua Wuyts <yoshuawuyts@gmail.com>
+License: MIT or Apache-2.0
+Comment:
+ FIXME (overlay): Since upstream copyright years are not available in
+ Cargo.toml, they were extracted from the upstream Git repository. This may not
+ be correct information so you should review and fix this before uploading to
+ the archive.
+
+Files: debian/*
+Copyright:
+ 2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2022 Jelmer Vernooij <jelmer@debian.org>
+License: MIT or Apache-2.0
+
+License: Apache-2.0
+ Debian systems provide the Apache 2.0 license in
+ /usr/share/common-licenses/Apache-2.0
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
diff --git a/src/chic/debian/copyright.debcargo.hint b/src/chic/debian/copyright.debcargo.hint
new file mode 100644 (file)
index 0000000..487a368
--- /dev/null
@@ -0,0 +1,56 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: chic
+Upstream-Contact: Yoshua Wuyts <yoshuawuyts@gmail.com>
+Source: https://github.com/yoshuawuyts/chic
+
+Files: *
+Copyright: FIXME (overlay) UNKNOWN-YEARS Yoshua Wuyts <yoshuawuyts@gmail.com>
+License: MIT or Apache-2.0
+Comment:
+ FIXME (overlay): Since upstream copyright years are not available in
+ Cargo.toml, they were extracted from the upstream Git repository. This may not
+ be correct information so you should review and fix this before uploading to
+ the archive.
+
+Files: ./LICENSE-APACHE
+Copyright: 2019 Yoshua Wuyts
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: ./LICENSE-MIT
+Copyright: 2019 Yoshua Wuyts
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: debian/*
+Copyright:
+ 2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2022 Jelmer Vernooij <jelmer@debian.org>
+License: MIT or Apache-2.0
+
+License: Apache-2.0
+ Debian systems provide the Apache 2.0 license in
+ /usr/share/common-licenses/Apache-2.0
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
diff --git a/src/chic/debian/debcargo.toml b/src/chic/debian/debcargo.toml
new file mode 100644 (file)
index 0000000..77e8151
--- /dev/null
@@ -0,0 +1,2 @@
+overlay = "."
+uploaders = ["Jelmer Vernooij <jelmer@debian.org>"]
index 79381692ee38c04cd1dfe3baef755c5461939a9b..91636cf8da24765142218e9ba5da2d17ba0341fe 100644 (file)
@@ -1,3 +1,10 @@
+rust-compiler-builtins (0.1.70-1) unstable; urgency=medium
+
+  * Team upload.
+  * Package compiler_builtins 0.1.70 from crates.io using debcargo 2.4.4 (Closes: 1011878)
+
+ -- Peter Michael Green <plugwash@debian.org>  Thu, 26 May 2022 22:12:00 +0000
+
 rust-compiler-builtins (0.1.52-1) unstable; urgency=medium
 
   * Team upload.
index f35c7a0c826267662bf88b07468c1f1ff40b62cc..654688b2c28d7b3771b2193027bc28d1748682d1 100644 (file)
@@ -5,7 +5,7 @@ Source: https://github.com/rust-lang-nursery/compiler-builtins
 
 Files: *
 Copyright:
- 2017-2020 The Rust Project Developers
+ 2017-2022 The Rust Project Developers
  2018-2019 Jorge Aparicio <japaricious@gmail.com>
 License: MIT or Apache-2.0
 Comment:
index acfe9b8dc2b39eaa05b0adc82a5b2d3ae1bcafb5..7129986f9de494d65cc8bd5f9381e3013b16ecfe 100644 (file)
@@ -413,8 +413,8 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2020-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2020-2021 kpcyrd <git@rxv.cc>
+ 2020-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2020-2022 kpcyrd <git@rxv.cc>
 License: MIT or Apache-2.0
 
 License: Apache-2.0
diff --git a/src/coreutils/debian/cargo-checksum.json.debcargo.hint b/src/coreutils/debian/cargo-checksum.json.debcargo.hint
new file mode 100644 (file)
index 0000000..67689c3
--- /dev/null
@@ -0,0 +1 @@
+{"package":"27008aca098d9da9f9c5ac5c0cfb5f18be560195a130abc155456e9df44add5e","files":{}}
index b52b507a544841cc79a4a4e5ca15575e29f38c67..629d5266765ab88683016f1d0fe213d1af042448 100644 (file)
@@ -1,4 +1,4 @@
-rust-coreutils (0.0.12-1~exp1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+rust-coreutils (0.0.14-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
 
   * New upstream release
   * Added librust-selinux-dev, librust-conv-dev, librust-pretty-assertions-dev
@@ -11,8 +11,9 @@ rust-coreutils (0.0.12-1~exp1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=
     librust-strum-dev, librust-utf-8-dev
     as new deps
   * Fix various dep issues (Closes: #995914)
+  * Package coreutils 0.0.14 from crates.io using debcargo 2.5.0
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 10 Mar 2022 12:59:52 +0100
+ -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 23 May 2022 12:09:27 +0200
 
 rust-coreutils (0.0.6-1~exp1) experimental; urgency=medium
 
diff --git a/src/coreutils/debian/compat.debcargo.hint b/src/coreutils/debian/compat.debcargo.hint
new file mode 100644 (file)
index 0000000..48082f7
--- /dev/null
@@ -0,0 +1 @@
+12
index d0b09b8877d5996d1e502c07f76c88ffd89e7024..dd5c7dde667d23ba4aaa58e0d58d939537855b7f 100644 (file)
@@ -2,81 +2,91 @@ Source: rust-coreutils
 Section: utils
 Priority: optional
 Build-Depends: debhelper (>= 12),
- dh-cargo (>= 24),
+ dh-cargo (>= 25),
  cargo:native,
  rustc:native,
  libstd-rust-dev,
- librust-byteorder-1.3+default-dev (>= 1.3.4-~~),
- librust-cc-1.0.61+default-dev,
+ librust-clap-3+cargo-dev (>= 3.1-~~),
+ librust-clap-3+default-dev (>= 3.1-~~),
+ librust-clap-3+wrap-help-dev (>= 3.1-~~),
+ librust-clap-complete-3+default-dev (>= 3.1-~~),
  librust-lazy-static-1+default-dev (>= 1.3-~~),
- librust-rustc-demangle-0.1.16+default-dev,
- librust-same-file-1.0.5+default-dev | librust-same-file-1.0.4+default-dev,
- librust-textwrap-0.11.0+default-dev,
- librust-textwrap-0.11.0+term-size-dev,
- librust-uu-base32-0.0.2+default-dev,
- librust-uu-base64-0.0.2+default-dev,
- librust-uu-basename-0.0.2+default-dev,
- librust-uu-cat-0.0.2+default-dev,
- librust-uu-cksum-0.0.2+default-dev,
- librust-uu-comm-0.0.2+default-dev,
- librust-uu-cp-0.0.2+default-dev,
- librust-uu-csplit-0.0.2+default-dev,
- librust-uu-cut-0.0.2+default-dev,
- librust-uu-date-0.0.2+default-dev,
- librust-uu-df-0.0.2+default-dev,
- librust-uu-dircolors-0.0.2+default-dev,
- librust-uu-dirname-0.0.2+default-dev,
- librust-uu-echo-0.0.2+default-dev,
- librust-uu-env-0.0.2+default-dev,
- librust-uu-expand-0.0.2+default-dev,
- librust-uu-expr-0.0.2+default-dev,
- librust-uu-factor-0.0.2+default-dev,
- librust-uu-false-0.0.2+default-dev,
- librust-uu-fmt-0.0.2+default-dev,
- librust-uu-fold-0.0.2+default-dev,
- librust-uu-hashsum-0.0.2+default-dev,
- librust-uu-head-0.0.2+default-dev,
- librust-uu-join-0.0.2+default-dev,
- librust-uu-link-0.0.2+default-dev,
- librust-uu-ln-0.0.2+default-dev,
- librust-uu-ls-0.0.2+default-dev,
- librust-uu-mkdir-0.0.2+default-dev,
- librust-uu-mktemp-0.0.2+default-dev,
- librust-uu-more-0.0.2+default-dev,
- librust-uu-mv-0.0.2+default-dev,
- librust-uu-nl-0.0.2+default-dev,
- librust-uu-od-0.0.2+default-dev,
- librust-uu-paste-0.0.2+default-dev,
- librust-uu-printenv-0.0.2+default-dev,
- librust-uu-printf-0.0.2+default-dev,
- librust-uu-ptx-0.0.2+default-dev,
- librust-uu-pwd-0.0.2+default-dev,
- librust-uu-readlink-0.0.2+default-dev,
- librust-uu-realpath-0.0.2+default-dev,
- librust-uu-relpath-0.0.2+default-dev,
- librust-uu-rm-0.0.2+default-dev,
- librust-uu-rmdir-0.0.2+default-dev,
- librust-uu-seq-0.0.2+default-dev,
- librust-uu-shred-0.0.2+default-dev,
- librust-uu-shuf-0.0.2+default-dev,
- librust-uu-sleep-0.0.2+default-dev,
- librust-uu-sort-0.0.2+default-dev,
- librust-uu-split-0.0.2+default-dev,
- librust-uu-sum-0.0.2+default-dev,
- librust-uu-tac-0.0.2+default-dev,
- librust-uu-tail-0.0.2+default-dev,
- librust-uu-tee-0.0.2+default-dev,
- librust-uu-test-0.0.2+default-dev,
- librust-uu-tr-0.0.2+default-dev,
- librust-uu-true-0.0.2+default-dev,
- librust-uu-truncate-0.0.2+default-dev,
- librust-uu-tsort-0.0.2+default-dev,
- librust-uu-unexpand-0.0.2+default-dev,
- librust-uu-uniq-0.0.2+default-dev,
- librust-uu-wc-0.0.2+default-dev,
- librust-uu-yes-0.0.2+default-dev,
- librust-uucore+default-dev (>= 0.0.5-~~),
- librust-winapi-util-0.1.2+default-dev
+ librust-phf-0.10+default-dev (>= 0.10.1-~~),
+ librust-phf-codegen-0.10+default-dev,
+ librust-textwrap-0.15+default-dev,
+ librust-textwrap-0.15+terminal-size-dev,
+ librust-uu-base32-0.0.14+default-dev,
+ librust-uu-base64-0.0.14+default-dev,
+ librust-uu-basename-0.0.14+default-dev,
+ librust-uu-basenc-0.0.14+default-dev,
+ librust-uu-cat-0.0.14+default-dev,
+ librust-uu-cksum-0.0.14+default-dev,
+ librust-uu-comm-0.0.14+default-dev,
+ librust-uu-cp-0.0.14+default-dev,
+ librust-uu-csplit-0.0.14+default-dev,
+ librust-uu-cut-0.0.14+default-dev,
+ librust-uu-date-0.0.14+default-dev,
+ librust-uu-dd-0.0.14+default-dev,
+ librust-uu-df-0.0.14+default-dev,
+ librust-uu-dir-0.0.14+default-dev,
+ librust-uu-dircolors-0.0.14+default-dev,
+ librust-uu-dirname-0.0.14+default-dev,
+ librust-uu-du-0.0.14+default-dev,
+ librust-uu-echo-0.0.14+default-dev,
+ librust-uu-env-0.0.14+default-dev,
+ librust-uu-expand-0.0.14+default-dev,
+ librust-uu-expr-0.0.14+default-dev,
+ librust-uu-factor-0.0.14+default-dev,
+ librust-uu-false-0.0.14+default-dev,
+ librust-uu-fmt-0.0.14+default-dev,
+ librust-uu-fold-0.0.14+default-dev,
+ librust-uu-hashsum-0.0.14+default-dev,
+ librust-uu-head-0.0.14+default-dev,
+ librust-uu-join-0.0.14+default-dev,
+ librust-uu-link-0.0.14+default-dev,
+ librust-uu-ln-0.0.14+default-dev,
+ librust-uu-ls-0.0.14+default-dev,
+ librust-uu-mkdir-0.0.14+default-dev,
+ librust-uu-mktemp-0.0.14+default-dev,
+ librust-uu-more-0.0.14+default-dev,
+ librust-uu-mv-0.0.14+default-dev,
+ librust-uu-nl-0.0.14+default-dev,
+ librust-uu-numfmt-0.0.14+default-dev,
+ librust-uu-od-0.0.14+default-dev,
+ librust-uu-paste-0.0.14+default-dev,
+ librust-uu-pr-0.0.14+default-dev,
+ librust-uu-printenv-0.0.14+default-dev,
+ librust-uu-printf-0.0.14+default-dev,
+ librust-uu-ptx-0.0.14+default-dev,
+ librust-uu-pwd-0.0.14+default-dev,
+ librust-uu-readlink-0.0.14+default-dev,
+ librust-uu-realpath-0.0.14+default-dev,
+ librust-uu-relpath-0.0.14+default-dev,
+ librust-uu-rm-0.0.14+default-dev,
+ librust-uu-rmdir-0.0.14+default-dev,
+ librust-uu-seq-0.0.14+default-dev,
+ librust-uu-shred-0.0.14+default-dev,
+ librust-uu-shuf-0.0.14+default-dev,
+ librust-uu-sleep-0.0.14+default-dev,
+ librust-uu-sort-0.0.14+default-dev,
+ librust-uu-split-0.0.14+default-dev,
+ librust-uu-sum-0.0.14+default-dev,
+ librust-uu-tac-0.0.14+default-dev,
+ librust-uu-tail-0.0.14+default-dev,
+ librust-uu-tee-0.0.14+default-dev,
+ librust-uu-test-0.0.14+default-dev,
+ librust-uu-touch-0.0.14+default-dev,
+ librust-uu-tr-0.0.14+default-dev,
+ librust-uu-true-0.0.14+default-dev,
+ librust-uu-truncate-0.0.14+default-dev,
+ librust-uu-tsort-0.0.14+default-dev,
+ librust-uu-unexpand-0.0.14+default-dev,
+ librust-uu-uniq-0.0.14+default-dev,
+ librust-uu-unlink-0.0.14+default-dev,
+ librust-uu-vdir-0.0.14+default-dev,
+ librust-uu-wc-0.0.14+default-dev,
+ librust-uu-yes-0.0.14+default-dev,
+ librust-uucore+default-dev (>= 0.0.11-~~)
 Maintainer: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
 Uploaders:
  Sylvestre Ledru <sylvestre@debian.org>
@@ -86,8 +96,6 @@ Vcs-Browser: https://salsa.debian.org/rust-team/debcargo-conf/tree/master/src/co
 Homepage: https://github.com/uutils/coreutils
 Rules-Requires-Root: no
 
-# FIXME (packages."(name)".section) debcargo auto-generated summaries are very long, consider overriding
-
 Package: coreutils
 Architecture: any
 Multi-Arch: allowed
@@ -107,3 +115,4 @@ Description: Coreutils ~ GNU coreutils (updated); implemented as universal (cros
  This package contains the following binaries built from the Rust crate
  "coreutils":
   - coreutils
+  - uudoc
index ef44049d0ad174f15e7daf86fca5cc281c8097b6..351314f4fe953e3a14e5dd871ecbb063e37e1534 100644 (file)
@@ -20,7 +20,7 @@ Comment:
  before uploading to the archive.
 
 Files: ./util/test-repo-whitespace.BAT
-Copyright: 2016-2020 ~ Roy Ivy III <rivy.dev@gmail.com>
+Copyright: 2016-2022 ~ Roy Ivy III <rivy.dev@gmail.com>
 License: UNKNOWN-LICENSE; FIXME (overlay)
 Comment:
  FIXME (overlay): These notices are extracted from files. Please review them
@@ -28,8 +28,8 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2020-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2020-2021 Sylvestre Ledru <sylvestre@debian.org>
+ 2021-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2021-2022 Sylvestre Ledru <sylvestre@debian.org>
 License: MIT
 
 License: MIT
diff --git a/src/coreutils/debian/source/format.debcargo.hint b/src/coreutils/debian/source/format.debcargo.hint
new file mode 100644 (file)
index 0000000..163aaf8
--- /dev/null
@@ -0,0 +1 @@
+3.0 (quilt)
index 728a7158ef191b9597f1f31af09476c5074c1178..c62c7a8827840a774b69db832fbac348dc0757ce 100644 (file)
@@ -1,3 +1,33 @@
+rust-crossbeam-channel (0.5.4-4) unstable; urgency=medium
+
+  * Team upload.
+  * Package crossbeam-channel 0.5.4 from crates.io using debcargo 2.5.0
+  * Fix version in rust-slog-async breaks.
+
+ -- Peter Michael Green <plugwash@debian.org>  Tue, 24 May 2022 15:27:35 +0000
+
+rust-crossbeam-channel (0.5.4-3) unstable; urgency=medium
+
+  * Team upload.
+  * Package crossbeam-channel 0.5.4 from crates.io using debcargo 2.5.0
+  * Constrain number of threads in benches/crossbeam.rs to avoid failures
+    on systems with ridiculous numbers of cores.
+  * Add more info to assert messages in recv_timeout test in never.rs, a failure
+    was observed on s390x and if it's not a fluke I want more information about
+    it.
+  * Add breaks on old version of rust-slog-async to help britney's autopkgtest
+    sceduler.
+
+ -- Peter Michael Green <plugwash@debian.org>  Tue, 24 May 2022 03:29:51 +0000
+
+rust-crossbeam-channel (0.5.4-2) unstable; urgency=medium
+
+  * Team upload.
+  * Package crossbeam-channel 0.5.4 from crates.io using debcargo 2.5.0
+  * Fix tests with no-default-features.
+
+ -- Peter Michael Green <plugwash@debian.org>  Sun, 22 May 2022 20:38:17 +0000
+
 rust-crossbeam-channel (0.5.4-1) unstable; urgency=medium
 
   * Package crossbeam-channel 0.5.4 from crates.io using debcargo 2.5.0
index 33df9eea9924849ca9759373513798c7b3bd52f0..5f46298fa8d13a5ca07ee4996aba8d0874940055 100644 (file)
@@ -7,3 +7,6 @@ uploaders = [
   "Daniel Kahn Gillmor <dkg@fifthhorseman.net>",
 ]
 collapse_features = true
+
+[packages.lib]
+extra_lines = ["Breaks: librust-slog-async-dev (<< 2.5.0-2)"]
diff --git a/src/crossbeam-channel/debian/patches/add-assert-info.patch b/src/crossbeam-channel/debian/patches/add-assert-info.patch
new file mode 100644 (file)
index 0000000..8b4fe17
--- /dev/null
@@ -0,0 +1,20 @@
+--- rust-crossbeam-channel-0.5.4.orig/tests/never.rs
++++ rust-crossbeam-channel-0.5.4/tests/never.rs
+@@ -85,11 +85,13 @@ fn recv_timeout() {
+     assert!(r.recv_timeout(ms(100)).is_err());
+     let now = Instant::now();
+-    assert!(now - start >= ms(100));
+-    assert!(now - start <= ms(150));
++    let elapsed = now - start;
++    assert!(elapsed >= ms(100),"elapsed time of {:?} is smaller than minimum expected value of 100ms",elapsed);
++    assert!(elapsed <= ms(150),"elapsed time of {:?} is larger than maximum expected value of 150ms",elapsed);
+     assert!(r.recv_timeout(ms(100)).is_err());
+     let now = Instant::now();
+-    assert!(now - start >= ms(200));
+-    assert!(now - start <= ms(250));
++    let elapsed = now - start;
++    assert!(elapsed >= ms(200),"elapsed time of {:?} is smaller than minimum expected value of 200ms",elapsed);
++    assert!(elapsed <= ms(250),"elapsed time of {:?} is larger than maximum expected value of 250ms",elapsed);
+ }
diff --git a/src/crossbeam-channel/debian/patches/constrain-bench-thread-count.patch b/src/crossbeam-channel/debian/patches/constrain-bench-thread-count.patch
new file mode 100644 (file)
index 0000000..140f146
--- /dev/null
@@ -0,0 +1,128 @@
+--- rust-crossbeam-channel-0.5.4.orig/benches/crossbeam.rs
++++ rust-crossbeam-channel-0.5.4/benches/crossbeam.rs
+@@ -37,7 +37,7 @@ mod unbounded {
+     #[bench]
+     fn par_inout(b: &mut Bencher) {
+-        let threads = num_cpus::get();
++        let threads = num_cpus::get().clamp(2,8);
+         let steps = TOTAL_STEPS / threads;
+         let (s, r) = unbounded::<i32>();
+@@ -100,7 +100,7 @@ mod unbounded {
+     #[bench]
+     fn spmc(b: &mut Bencher) {
+-        let threads = num_cpus::get() - 1;
++        let threads = (num_cpus::get() - 1).clamp(2,8);
+         let steps = TOTAL_STEPS / threads;
+         let (s, r) = unbounded::<i32>();
+@@ -136,7 +136,7 @@ mod unbounded {
+     #[bench]
+     fn mpsc(b: &mut Bencher) {
+-        let threads = num_cpus::get() - 1;
++        let threads = (num_cpus::get() - 1).clamp(2,8);
+         let steps = TOTAL_STEPS / threads;
+         let (s, r) = unbounded::<i32>();
+@@ -172,7 +172,7 @@ mod unbounded {
+     #[bench]
+     fn mpmc(b: &mut Bencher) {
+-        let threads = num_cpus::get();
++        let threads = num_cpus::get().clamp(4,16);
+         let steps = TOTAL_STEPS / threads;
+         let (s, r) = unbounded::<i32>();
+@@ -248,7 +248,7 @@ mod bounded_n {
+     #[bench]
+     fn spmc(b: &mut Bencher) {
+-        let threads = num_cpus::get() - 1;
++        let threads = (num_cpus::get() - 1).clamp(2,8);
+         let steps = TOTAL_STEPS / threads;
+         let (s, r) = bounded::<i32>(steps * threads);
+@@ -284,7 +284,7 @@ mod bounded_n {
+     #[bench]
+     fn mpsc(b: &mut Bencher) {
+-        let threads = num_cpus::get() - 1;
++        let threads = (num_cpus::get() - 1).clamp(2,8);
+         let steps = TOTAL_STEPS / threads;
+         let (s, r) = bounded::<i32>(steps * threads);
+@@ -320,7 +320,7 @@ mod bounded_n {
+     #[bench]
+     fn par_inout(b: &mut Bencher) {
+-        let threads = num_cpus::get();
++        let threads = num_cpus::get().clamp(2,8);
+         let steps = TOTAL_STEPS / threads;
+         let (s, r) = bounded::<i32>(threads);
+@@ -354,7 +354,7 @@ mod bounded_n {
+     #[bench]
+     fn mpmc(b: &mut Bencher) {
+-        let threads = num_cpus::get();
++        let threads = num_cpus::get().clamp(4,16);
+         assert_eq!(threads % 2, 0);
+         let steps = TOTAL_STEPS / threads;
+         let (s, r) = bounded::<i32>(steps * threads);
+@@ -445,7 +445,7 @@ mod bounded_1 {
+     #[bench]
+     fn spmc(b: &mut Bencher) {
+-        let threads = num_cpus::get() - 1;
++        let threads = (num_cpus::get() - 1).clamp(2,8);
+         let steps = TOTAL_STEPS / threads;
+         let (s, r) = bounded::<i32>(1);
+@@ -481,7 +481,7 @@ mod bounded_1 {
+     #[bench]
+     fn mpsc(b: &mut Bencher) {
+-        let threads = num_cpus::get() - 1;
++        let threads = (num_cpus::get() - 1).clamp(2,8);
+         let steps = TOTAL_STEPS / threads;
+         let (s, r) = bounded::<i32>(1);
+@@ -517,7 +517,7 @@ mod bounded_1 {
+     #[bench]
+     fn mpmc(b: &mut Bencher) {
+-        let threads = num_cpus::get();
++        let threads = num_cpus::get().clamp(4,16);
+         let steps = TOTAL_STEPS / threads;
+         let (s, r) = bounded::<i32>(1);
+@@ -598,7 +598,7 @@ mod bounded_0 {
+     #[bench]
+     fn spmc(b: &mut Bencher) {
+-        let threads = num_cpus::get() - 1;
++        let threads = (num_cpus::get() - 1).clamp(2,8);
+         let steps = TOTAL_STEPS / threads;
+         let (s, r) = bounded::<i32>(0);
+@@ -634,7 +634,7 @@ mod bounded_0 {
+     #[bench]
+     fn mpsc(b: &mut Bencher) {
+-        let threads = num_cpus::get() - 1;
++        let threads = (num_cpus::get() - 1).clamp(2,8);
+         let steps = TOTAL_STEPS / threads;
+         let (s, r) = bounded::<i32>(0);
+@@ -670,7 +670,7 @@ mod bounded_0 {
+     #[bench]
+     fn mpmc(b: &mut Bencher) {
+-        let threads = num_cpus::get();
++        let threads = num_cpus::get().clamp(4,16);
+         let steps = TOTAL_STEPS / threads;
+         let (s, r) = bounded::<i32>(0);
diff --git a/src/crossbeam-channel/debian/patches/fix-tests-no-default-features.patch b/src/crossbeam-channel/debian/patches/fix-tests-no-default-features.patch
new file mode 100644 (file)
index 0000000..4acf734
--- /dev/null
@@ -0,0 +1,326 @@
+--- rust-crossbeam-channel-0.5.4.orig/benches/crossbeam.rs
++++ rust-crossbeam-channel-0.5.4/benches/crossbeam.rs
+@@ -1,3 +1,4 @@
++#![cfg(feature = "std")]
+ #![feature(test)]
+ extern crate test;
+--- rust-crossbeam-channel-0.5.4.orig/examples/fibonacci.rs
++++ rust-crossbeam-channel-0.5.4/examples/fibonacci.rs
+@@ -1,3 +1,4 @@
++#![cfg(feature = "std")]
+ //! An asynchronous fibonacci sequence generator.
+ use std::thread;
+--- rust-crossbeam-channel-0.5.4.orig/examples/matching.rs
++++ rust-crossbeam-channel-0.5.4/examples/matching.rs
+@@ -1,3 +1,4 @@
++#![cfg(feature = "std")]
+ //! Using `select!` to send and receive on the same channel at the same time.
+ //!
+ //! This example is based on the following program in Go.
+--- rust-crossbeam-channel-0.5.4.orig/examples/stopwatch.rs
++++ rust-crossbeam-channel-0.5.4/examples/stopwatch.rs
+@@ -1,3 +1,4 @@
++#![cfg(feature = "std")]
+ //! Prints the elapsed time every 1 second and quits on Ctrl+C.
+ #[cfg(windows)] // signal_hook::iterator does not work on windows
+--- rust-crossbeam-channel-0.5.4.orig/tests/after.rs
++++ rust-crossbeam-channel-0.5.4/tests/after.rs
+@@ -1,3 +1,4 @@
++#![cfg(feature = "std")]
+ //! Tests for the after channel flavor.
+ #![cfg(not(miri))] // TODO: many assertions failed due to Miri is slow
+--- rust-crossbeam-channel-0.5.4.orig/tests/array.rs
++++ rust-crossbeam-channel-0.5.4/tests/array.rs
+@@ -1,3 +1,4 @@
++#![cfg(feature = "std")]
+ //! Tests for the array channel flavor.
+ use std::any::Any;
+--- rust-crossbeam-channel-0.5.4.orig/tests/golang.rs
++++ rust-crossbeam-channel-0.5.4/tests/golang.rs
+@@ -1,3 +1,4 @@
++#![cfg(feature = "std")]
+ //! Tests copied from Go and manually rewritten in Rust.
+ //!
+ //! Source:
+--- rust-crossbeam-channel-0.5.4.orig/tests/iter.rs
++++ rust-crossbeam-channel-0.5.4/tests/iter.rs
+@@ -1,3 +1,4 @@
++#![cfg(feature = "std")]
+ //! Tests for iteration over receivers.
+ use crossbeam_channel::unbounded;
+--- rust-crossbeam-channel-0.5.4.orig/tests/list.rs
++++ rust-crossbeam-channel-0.5.4/tests/list.rs
+@@ -1,3 +1,4 @@
++#![cfg(feature = "std")]
+ //! Tests for the list channel flavor.
+ use std::any::Any;
+--- rust-crossbeam-channel-0.5.4.orig/tests/mpsc.rs
++++ rust-crossbeam-channel-0.5.4/tests/mpsc.rs
+@@ -1,3 +1,4 @@
++#![cfg(feature = "std")]
+ //! Tests copied from `std::sync::mpsc`.
+ //!
+ //! This is a copy of tests for the `std::sync::mpsc` channels from the standard library, but
+@@ -33,16 +34,19 @@ use std::time::Duration;
+ use crossbeam_channel as cc;
++#[cfg(feature = "std")]
+ pub struct Sender<T> {
+     pub inner: cc::Sender<T>,
+ }
++#[cfg(feature = "std")]
+ impl<T> Sender<T> {
+     pub fn send(&self, t: T) -> Result<(), SendError<T>> {
+         self.inner.send(t).map_err(|cc::SendError(m)| SendError(m))
+     }
+ }
++#[cfg(feature = "std")]
+ impl<T> Clone for Sender<T> {
+     fn clone(&self) -> Sender<T> {
+         Sender {
+@@ -51,10 +55,12 @@ impl<T> Clone for Sender<T> {
+     }
+ }
++#[cfg(feature = "std")]
+ pub struct SyncSender<T> {
+     pub inner: cc::Sender<T>,
+ }
++#[cfg(feature = "std")]
+ impl<T> SyncSender<T> {
+     pub fn send(&self, t: T) -> Result<(), SendError<T>> {
+         self.inner.send(t).map_err(|cc::SendError(m)| SendError(m))
+@@ -68,6 +74,7 @@ impl<T> SyncSender<T> {
+     }
+ }
++#[cfg(feature = "std")]
+ impl<T> Clone for SyncSender<T> {
+     fn clone(&self) -> SyncSender<T> {
+         SyncSender {
+@@ -76,10 +83,12 @@ impl<T> Clone for SyncSender<T> {
+     }
+ }
++#[cfg(feature = "std")]
+ pub struct Receiver<T> {
+     pub inner: cc::Receiver<T>,
+ }
++#[cfg(feature = "std")]
+ impl<T> Receiver<T> {
+     pub fn try_recv(&self) -> Result<T, TryRecvError> {
+         self.inner.try_recv().map_err(|err| match err {
+@@ -108,6 +117,7 @@ impl<T> Receiver<T> {
+     }
+ }
++#[cfg(feature = "std")]
+ impl<'a, T> IntoIterator for &'a Receiver<T> {
+     type Item = T;
+     type IntoIter = Iter<'a, T>;
+@@ -117,6 +127,7 @@ impl<'a, T> IntoIterator for &'a Receive
+     }
+ }
++#[cfg(feature = "std")]
+ impl<T> IntoIterator for Receiver<T> {
+     type Item = T;
+     type IntoIter = IntoIter<T>;
+@@ -126,10 +137,12 @@ impl<T> IntoIterator for Receiver<T> {
+     }
+ }
++#[cfg(feature = "std")]
+ pub struct TryIter<'a, T: 'a> {
+     inner: &'a Receiver<T>,
+ }
++#[cfg(feature = "std")]
+ impl<'a, T> Iterator for TryIter<'a, T> {
+     type Item = T;
+@@ -138,10 +151,12 @@ impl<'a, T> Iterator for TryIter<'a, T>
+     }
+ }
++#[cfg(feature = "std")]
+ pub struct Iter<'a, T: 'a> {
+     inner: &'a Receiver<T>,
+ }
++#[cfg(feature = "std")]
+ impl<'a, T> Iterator for Iter<'a, T> {
+     type Item = T;
+@@ -150,10 +165,12 @@ impl<'a, T> Iterator for Iter<'a, T> {
+     }
+ }
++#[cfg(feature = "std")]
+ pub struct IntoIter<T> {
+     inner: Receiver<T>,
+ }
++#[cfg(feature = "std")]
+ impl<T> Iterator for IntoIter<T> {
+     type Item = T;
+@@ -162,6 +179,7 @@ impl<T> Iterator for IntoIter<T> {
+     }
+ }
++#[cfg(feature = "std")]
+ pub fn channel<T>() -> (Sender<T>, Receiver<T>) {
+     let (s, r) = cc::unbounded();
+     let s = Sender { inner: s };
+@@ -169,6 +187,7 @@ pub fn channel<T>() -> (Sender<T>, Recei
+     (s, r)
+ }
++#[cfg(feature = "std")]
+ pub fn sync_channel<T>(bound: usize) -> (SyncSender<T>, Receiver<T>) {
+     let (s, r) = cc::bounded(bound);
+     let s = SyncSender { inner: s };
+@@ -176,6 +195,7 @@ pub fn sync_channel<T>(bound: usize) ->
+     (s, r)
+ }
++#[cfg(feature = "std")]
+ macro_rules! select {
+     (
+         $($name:pat = $rx:ident.$meth:ident() => $code:expr),+
+@@ -206,6 +226,7 @@ mod channel_tests {
+         }
+     }
++    #[cfg(feature = "std")]
+     #[test]
+     fn smoke() {
+         let (tx, rx) = channel::<i32>();
+@@ -213,12 +234,14 @@ mod channel_tests {
+         assert_eq!(rx.recv().unwrap(), 1);
+     }
++    #[cfg(feature = "std")]
+     #[test]
+     fn drop_full() {
+         let (tx, _rx) = channel::<Box<isize>>();
+         tx.send(Box::new(1)).unwrap();
+     }
++    #[cfg(feature = "std")]
+     #[test]
+     fn drop_full_shared() {
+         let (tx, _rx) = channel::<Box<isize>>();
+@@ -227,6 +250,7 @@ mod channel_tests {
+         tx.send(Box::new(1)).unwrap();
+     }
++    #[cfg(feature = "std")]
+     #[test]
+     fn smoke_shared() {
+         let (tx, rx) = channel::<i32>();
+@@ -237,6 +261,7 @@ mod channel_tests {
+         assert_eq!(rx.recv().unwrap(), 1);
+     }
++    #[cfg(feature = "std")]
+     #[test]
+     fn smoke_threads() {
+         let (tx, rx) = channel::<i32>();
+@@ -247,6 +272,7 @@ mod channel_tests {
+         t.join().unwrap();
+     }
++    #[cfg(feature = "std")]
+     #[test]
+     fn smoke_port_gone() {
+         let (tx, rx) = channel::<i32>();
+@@ -254,6 +280,7 @@ mod channel_tests {
+         assert!(tx.send(1).is_err());
+     }
++    #[cfg(feature = "std")]
+     #[test]
+     fn smoke_shared_port_gone() {
+         let (tx, rx) = channel::<i32>();
+@@ -1707,6 +1734,7 @@ mod sync_channel_tests {
+ }
+ // Source: https://github.com/rust-lang/rust/blob/master/src/libstd/sync/mpsc/select.rs
++#[cfg(feature = "std")]
+ mod select_tests {
+     use super::*;
+--- rust-crossbeam-channel-0.5.4.orig/tests/never.rs
++++ rust-crossbeam-channel-0.5.4/tests/never.rs
+@@ -1,5 +1,5 @@
+ //! Tests for the never channel flavor.
+-
++#![cfg(feature = "std")]
+ use std::thread;
+ use std::time::{Duration, Instant};
+--- rust-crossbeam-channel-0.5.4.orig/tests/ready.rs
++++ rust-crossbeam-channel-0.5.4/tests/ready.rs
+@@ -1,3 +1,4 @@
++#![cfg(feature = "std")]
+ //! Tests for channel readiness using the `Select` struct.
+ #![allow(clippy::drop_copy)]
+--- rust-crossbeam-channel-0.5.4.orig/tests/same_channel.rs
++++ rust-crossbeam-channel-0.5.4/tests/same_channel.rs
+@@ -1,3 +1,4 @@
++#![cfg(feature = "std")]
+ use std::time::Duration;
+ use crossbeam_channel::{after, bounded, never, tick, unbounded};
+--- rust-crossbeam-channel-0.5.4.orig/tests/select.rs
++++ rust-crossbeam-channel-0.5.4/tests/select.rs
+@@ -1,3 +1,4 @@
++#![cfg(feature = "std")]
+ //! Tests for channel selection using the `Select` struct.
+ #![allow(clippy::drop_copy)]
+--- rust-crossbeam-channel-0.5.4.orig/tests/select_macro.rs
++++ rust-crossbeam-channel-0.5.4/tests/select_macro.rs
+@@ -1,3 +1,4 @@
++#![cfg(feature = "std")]
+ //! Tests for the `select!` macro.
+ #![forbid(unsafe_code)] // select! is safe.
+--- rust-crossbeam-channel-0.5.4.orig/tests/thread_locals.rs
++++ rust-crossbeam-channel-0.5.4/tests/thread_locals.rs
+@@ -1,5 +1,5 @@
+ //! Tests that make sure accessing thread-locals while exiting the thread doesn't cause panics.
+-
++#![cfg(feature = "std")]
+ #![cfg(not(miri))] // error: abnormal termination: the evaluated program aborted execution
+ use std::thread;
+--- rust-crossbeam-channel-0.5.4.orig/tests/tick.rs
++++ rust-crossbeam-channel-0.5.4/tests/tick.rs
+@@ -1,3 +1,4 @@
++#![cfg(feature = "std")]
+ //! Tests for the tick channel flavor.
+ #![cfg(not(miri))] // TODO: many assertions failed due to Miri is slow
+--- rust-crossbeam-channel-0.5.4.orig/tests/zero.rs
++++ rust-crossbeam-channel-0.5.4/tests/zero.rs
+@@ -1,3 +1,4 @@
++#![cfg(feature = "std")]
+ //! Tests for the zero channel flavor.
+ use std::any::Any;
diff --git a/src/crossbeam-channel/debian/patches/series b/src/crossbeam-channel/debian/patches/series
new file mode 100644 (file)
index 0000000..05c11eb
--- /dev/null
@@ -0,0 +1,3 @@
+fix-tests-no-default-features.patch
+constrain-bench-thread-count.patch
+add-assert-info.patch
index feb0d9891143a257f6c9b1d076f1e18ec8bfb101..6d67e199befd63eae882a2160991b1fefb8db98f 100644 (file)
@@ -1,3 +1,11 @@
+rust-crossbeam-epoch (0.9.8-2) unstable; urgency=medium
+
+  * Team upload.
+  * Package crossbeam-epoch 0.9.8 from crates.io using debcargo 2.5.0
+  * Fix tests when run with no-default-features.
+
+ -- Peter Michael Green <plugwash@debian.org>  Sun, 22 May 2022 19:25:39 +0000
+
 rust-crossbeam-epoch (0.9.8-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/src/crossbeam-epoch/debian/patches/fix-tests-no-default-features.patch b/src/crossbeam-epoch/debian/patches/fix-tests-no-default-features.patch
new file mode 100644 (file)
index 0000000..a400835
--- /dev/null
@@ -0,0 +1,303 @@
+Index: crossbeam-epoch/benches/defer.rs
+===================================================================
+--- crossbeam-epoch.orig/benches/defer.rs
++++ crossbeam-epoch/benches/defer.rs
+@@ -1,3 +1,4 @@
++#![cfg(feature = "std")]
+ #![feature(test)]
+ extern crate test;
+Index: crossbeam-epoch/benches/flush.rs
+===================================================================
+--- crossbeam-epoch.orig/benches/flush.rs
++++ crossbeam-epoch/benches/flush.rs
+@@ -1,3 +1,4 @@
++#![cfg(feature = "std")]
+ #![feature(test)]
+ extern crate test;
+Index: crossbeam-epoch/benches/pin.rs
+===================================================================
+--- crossbeam-epoch.orig/benches/pin.rs
++++ crossbeam-epoch/benches/pin.rs
+@@ -1,3 +1,4 @@
++#![cfg(feature = "std")]
+ #![feature(test)]
+ extern crate test;
+Index: crossbeam-epoch/examples/sanitize.rs
+===================================================================
+--- crossbeam-epoch.orig/examples/sanitize.rs
++++ crossbeam-epoch/examples/sanitize.rs
+@@ -1,3 +1,4 @@
++#![cfg(feature = "std")]
+ use std::sync::atomic::AtomicUsize;
+ use std::sync::atomic::Ordering::{AcqRel, Acquire, Relaxed};
+ use std::sync::Arc;
+Index: crossbeam-epoch/src/atomic.rs
+===================================================================
+--- crossbeam-epoch.orig/src/atomic.rs
++++ crossbeam-epoch/src/atomic.rs
+@@ -142,7 +142,7 @@ fn decompose_tag<T: ?Sized + Pointable>(
+ /// particular, Crossbeam supports dynamically sized slices as follows.
+ ///
+ /// ```
+-/// use std::mem::MaybeUninit;
++/// use core::mem::MaybeUninit;
+ /// use crossbeam_epoch::Owned;
+ ///
+ /// let o = Owned::<[MaybeUninit<i32>]>::init(10); // allocating [i32; 10]
+@@ -1590,7 +1590,7 @@ impl<T: ?Sized + Pointable> Default for
+ #[cfg(all(test, not(crossbeam_loom)))]
+ mod tests {
+     use super::{Owned, Shared};
+-    use std::mem::MaybeUninit;
++    use core::mem::MaybeUninit;
+     #[test]
+     fn valid_tag_i8() {
+Index: crossbeam-epoch/src/collector.rs
+===================================================================
+--- crossbeam-epoch.orig/src/collector.rs
++++ crossbeam-epoch/src/collector.rs
+@@ -111,9 +111,11 @@ impl fmt::Debug for LocalHandle {
+ #[cfg(all(test, not(crossbeam_loom)))]
+ mod tests {
+-    use std::mem;
+-    use std::sync::atomic::{AtomicUsize, Ordering};
++    use core::mem;
++    use core::sync::atomic::{AtomicUsize, Ordering};
++    use alloc::vec::Vec;
++    #[cfg(feature = "std")]
+     use crossbeam_utils::thread;
+     use crate::{Collector, Owned};
+@@ -176,6 +178,7 @@ mod tests {
+         }
+     }
++    #[cfg(feature = "std")]
+     #[test]
+     fn pin_holds_advance() {
+         #[cfg(miri)]
+@@ -420,6 +423,7 @@ mod tests {
+         assert_eq!(DESTROYS.load(Ordering::Relaxed), COUNT);
+     }
++    #[cfg(feature = "std")]
+     #[test]
+     fn stress() {
+         const THREADS: usize = 8;
+Index: crossbeam-epoch/src/deferred.rs
+===================================================================
+--- crossbeam-epoch.orig/src/deferred.rs
++++ crossbeam-epoch/src/deferred.rs
+@@ -83,7 +83,8 @@ mod tests {
+     #![allow(clippy::drop_copy)]
+     use super::Deferred;
+-    use std::cell::Cell;
++    use core::cell::Cell;
++    use alloc::boxed::Box;
+     #[test]
+     fn on_stack() {
+@@ -117,6 +118,7 @@ mod tests {
+     #[test]
+     fn string() {
++        use alloc::string::ToString;
+         let a = "hello".to_string();
+         let d = Deferred::new(move || assert_eq!(a, "hello"));
+         d.call();
+Index: crossbeam-epoch/src/internal.rs
+===================================================================
+--- crossbeam-epoch.orig/src/internal.rs
++++ crossbeam-epoch/src/internal.rs
+@@ -628,7 +628,7 @@ impl IsElement<Local> for Local {
+ #[cfg(all(test, not(crossbeam_loom)))]
+ mod tests {
+-    use std::sync::atomic::{AtomicUsize, Ordering};
++    use core::sync::atomic::{AtomicUsize, Ordering};
+     use super::*;
+Index: crossbeam-epoch/src/lib.rs
+===================================================================
+--- crossbeam-epoch.orig/src/lib.rs
++++ crossbeam-epoch/src/lib.rs
+@@ -143,6 +143,11 @@ mod primitive {
+ #[cfg(not(crossbeam_no_atomic_cas))]
+ cfg_if! {
+     if #[cfg(feature = "alloc")] {
++        #[cfg(not(feature = "std"))]
++        #[macro_use]
++        extern crate alloc;
++
++        #[cfg(feature = "std")]
+         extern crate alloc;
+         mod atomic;
+Index: crossbeam-epoch/src/sync/list.rs
+===================================================================
+--- crossbeam-epoch.orig/src/sync/list.rs
++++ crossbeam-epoch/src/sync/list.rs
+@@ -299,7 +299,9 @@ impl<'g, T: 'g, C: IsElement<T>> Iterato
+ mod tests {
+     use super::*;
+     use crate::{Collector, Owned};
++    #[cfg(feature = "std")]
+     use crossbeam_utils::thread;
++    #[cfg(feature = "std")]
+     use std::sync::Barrier;
+     impl IsElement<Entry> for Entry {
+@@ -397,6 +399,7 @@ mod tests {
+     const ITERS: usize = 512;
+     /// Contends the list on insert and delete operations to make sure they can run concurrently.
++    #[cfg(feature = "std")]
+     #[test]
+     fn insert_delete_multi() {
+         let collector = Collector::new();
+@@ -439,6 +442,7 @@ mod tests {
+     }
+     /// Contends the list on iteration to make sure that it can be iterated over concurrently.
++    #[cfg(feature = "std")]
+     #[test]
+     fn iter_multi() {
+         let collector = Collector::new();
+Index: crossbeam-epoch/src/sync/queue.rs
+===================================================================
+--- crossbeam-epoch.orig/src/sync/queue.rs
++++ crossbeam-epoch/src/sync/queue.rs
+@@ -218,7 +218,9 @@ impl<T> Drop for Queue<T> {
+ #[cfg(all(test, not(crossbeam_loom)))]
+ mod test {
+     use super::*;
++    #[cfg(feature = "std")]
+     use crate::pin;
++    #[cfg(feature = "std")]
+     use crossbeam_utils::thread;
+     struct Queue<T> {
+@@ -232,11 +234,13 @@ mod test {
+             }
+         }
++        #[cfg(feature = "std")]
+         pub(crate) fn push(&self, t: T) {
+             let guard = &pin();
+             self.queue.push(t, guard);
+         }
++        #[cfg(feature = "std")]
+         pub(crate) fn is_empty(&self) -> bool {
+             let guard = &pin();
+             let head = self.queue.head.load(Acquire, guard);
+@@ -244,11 +248,13 @@ mod test {
+             h.next.load(Acquire, guard).is_null()
+         }
++        #[cfg(feature = "std")]
+         pub(crate) fn try_pop(&self) -> Option<T> {
+             let guard = &pin();
+             self.queue.try_pop(guard)
+         }
++        #[cfg(feature = "std")]
+         pub(crate) fn pop(&self) -> T {
+             loop {
+                 match self.try_pop() {
+@@ -265,6 +271,7 @@ mod test {
+     const CONC_COUNT: i64 = 1000000;
+     #[test]
++    #[cfg(feature = "std")]
+     fn push_try_pop_1() {
+         let q: Queue<i64> = Queue::new();
+         assert!(q.is_empty());
+@@ -275,6 +282,7 @@ mod test {
+     }
+     #[test]
++    #[cfg(feature = "std")]
+     fn push_try_pop_2() {
+         let q: Queue<i64> = Queue::new();
+         assert!(q.is_empty());
+@@ -287,6 +295,7 @@ mod test {
+     }
+     #[test]
++    #[cfg(feature = "std")]
+     fn push_try_pop_many_seq() {
+         let q: Queue<i64> = Queue::new();
+         assert!(q.is_empty());
+@@ -301,6 +310,7 @@ mod test {
+     }
+     #[test]
++    #[cfg(feature = "std")]
+     fn push_pop_1() {
+         let q: Queue<i64> = Queue::new();
+         assert!(q.is_empty());
+@@ -311,6 +321,7 @@ mod test {
+     }
+     #[test]
++    #[cfg(feature = "std")]
+     fn push_pop_2() {
+         let q: Queue<i64> = Queue::new();
+         q.push(37);
+@@ -320,6 +331,7 @@ mod test {
+     }
+     #[test]
++    #[cfg(feature = "std")]
+     fn push_pop_many_seq() {
+         let q: Queue<i64> = Queue::new();
+         assert!(q.is_empty());
+@@ -334,6 +346,7 @@ mod test {
+     }
+     #[test]
++    #[cfg(feature = "std")]
+     fn push_try_pop_many_spsc() {
+         let q: Queue<i64> = Queue::new();
+         assert!(q.is_empty());
+@@ -358,6 +371,7 @@ mod test {
+     }
+     #[test]
++    #[cfg(feature = "std")]
+     fn push_try_pop_many_spmc() {
+         fn recv(_t: i32, q: &Queue<i64>) {
+             let mut cur = -1;
+@@ -391,6 +405,7 @@ mod test {
+     }
+     #[test]
++    #[cfg(feature = "std")]
+     fn push_try_pop_many_mpmc() {
+         enum LR {
+             Left(i64),
+@@ -437,6 +452,7 @@ mod test {
+     }
+     #[test]
++    #[cfg(feature = "std")]
+     fn push_pop_many_spsc() {
+         let q: Queue<i64> = Queue::new();
+@@ -458,6 +474,7 @@ mod test {
+     }
+     #[test]
++    #[cfg(feature = "std")]
+     fn is_empty_dont_pop() {
+         let q: Queue<i64> = Queue::new();
+         q.push(20);
index d6e472194ee61c8b702f634bfb9da1a9f5dee92e..04914d7cfbae5bf783e367f1c826264b5ed181c3 100644 (file)
@@ -1 +1,2 @@
 remove-unstable-features.patch
+fix-tests-no-default-features.patch
index e6f5518224a628ee7d65bcfe08636809d7e0da11..17e1802db9559c2fa60ceb5e7c06fa82c9a4b47d 100644 (file)
@@ -1,3 +1,11 @@
+rust-crossbeam-utils (0.8.8-1) unstable; urgency=medium
+
+  * New upstream version (addresses CVE-2022-23639)
+  * Add myself to uploaders
+  * Package crossbeam-utils 0.8.8 from crates.io using debcargo 2.5.0
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Tue, 24 May 2022 20:33:16 -0400
+
 rust-crossbeam-utils (0.8.5-2) unstable; urgency=medium
 
   * Team upload.
index c08ed30b16002676c2695c96c44ceea8fcd63101..3d7d74bf924a533d2b3da0109aebd337c1e544b3 100644 (file)
@@ -4,7 +4,7 @@ Upstream-Contact: The Crossbeam Project Developers
 Source: https://github.com/crossbeam-rs/crossbeam-utils
 
 Files: *
-Copyright: 2017-2019 The Crossbeam Project Developers
+Copyright: 2017-2022 The Crossbeam Project Developers
 License: MIT or Apache-2.0
 
 Files: debian/*
@@ -12,6 +12,7 @@ Copyright:
  2018-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
  2018-2019 Wolfgang Silbermayr <wolfgang@silbermayr.at>
  2019 kpcyrd <git@rxv.cc>
+ 2022 Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 License: MIT or Apache-2.0
 
 License: Apache-2.0
index 184f4d3afbb75cdddcdefc61013895e44811c9dc..c4718a509bc67bda50eb27b69cefbc01dbc3695b 100644 (file)
@@ -1,10 +1,10 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: crossbeam-utils
-Upstream-Contact: The Crossbeam Project Developers
+Upstream-Contact: FIXME (overlay) UNKNOWN-AUTHORS
 Source: https://github.com/crossbeam-rs/crossbeam
 
 Files: *
-Copyright: FIXME (overlay) UNKNOWN-YEARS The Crossbeam Project Developers
+Copyright: FIXME (overlay) UNKNOWN-AUTHORS FIXME (overlay) UNKNOWN-YEARS
 License: MIT or Apache-2.0
 Comment:
  FIXME (overlay): Since upstream copyright years are not available in
@@ -21,9 +21,10 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2018-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2018-2021 Wolfgang Silbermayr <wolfgang@silbermayr.at>
- 2018-2021 kpcyrd <git@rxv.cc>
+ 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>
 License: MIT or Apache-2.0
 
 License: Apache-2.0
index 6273734c4ea26593e6ecb6327861ea26c0a330ca..a8e04439d3a05a366fd0df07a5f2e37705cc58f1 100644 (file)
@@ -1,7 +1,8 @@
 overlay = "."
 uploaders = [
   "Wolfgang Silbermayr <wolfgang@silbermayr.at>",
-  "kpcyrd <git@rxv.cc>"
+  "kpcyrd <git@rxv.cc>",
+  "Daniel Kahn Gillmor <dkg@fifthhorseman.net>",
 ]
 
 [packages.lib]
index f622dcbf51a42a2e1e44da890c26f4ba56a3c8b9..1a6193d7ab20efc68bffb7335e6182cbc3be27a1 100644 (file)
@@ -1,14 +1,10 @@
-Index: crossbeam-utils/Cargo.toml
-===================================================================
---- crossbeam-utils.orig/Cargo.toml
+--- crossbeam-utils/Cargo.toml
 +++ crossbeam-utils/Cargo.toml
-@@ -35,6 +35,6 @@ version = ">= 0.7, < 0.9"
+@@ -48,7 +48,3 @@
  default = ["std"]
  nightly = []
  std = ["lazy_static"]
+-
 -[target."cfg(crossbeam_loom)".dependencies.loom]
 -version = "0.5"
 -optional = true
-+#[target."cfg(crossbeam_loom)".dependencies.loom]
-+#version = "0.5"
-+#optional = true
index ba32c481b11db1406683fb6f49648687d8b164b0..a88497778f43a390386f4f1aa70f79648be5e494 100644 (file)
@@ -1,11 +1,11 @@
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -29,7 +29,7 @@
- version = "1.4.0"
+@@ -39,7 +39,7 @@
  optional = true
  [dev-dependencies.rand]
 -version = "0.8"
 +version = ">= 0.7, < 0.9"
  
- [features]
- default = ["std"]
+ [dev-dependencies.rustversion]
+ version = "1"
diff --git a/src/crypto-common/debian/changelog b/src/crypto-common/debian/changelog
new file mode 100644 (file)
index 0000000..5a82ca4
--- /dev/null
@@ -0,0 +1,5 @@
+rust-crypto-common (0.1.3-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Package crypto-common 0.1.3 from crates.io using debcargo 2.5.0
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 23 May 2022 22:51:19 +0200
diff --git a/src/crypto-common/debian/copyright b/src/crypto-common/debian/copyright
new file mode 100644 (file)
index 0000000..84a3a13
--- /dev/null
@@ -0,0 +1,37 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: crypto-common
+Upstream-Contact: RustCrypto Developers
+Source: https://github.com/RustCrypto/traits
+
+Files: *
+Copyright: 2021-2022 RustCrypto Developers
+License: MIT or Apache-2.0
+
+Files: debian/*
+Copyright:
+ 2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2022 Sylvestre Ledru <sylvestre@debian.org>
+License: MIT or Apache-2.0
+
+License: Apache-2.0
+ Debian systems provide the Apache 2.0 license in
+ /usr/share/common-licenses/Apache-2.0
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
diff --git a/src/crypto-common/debian/copyright.debcargo.hint b/src/crypto-common/debian/copyright.debcargo.hint
new file mode 100644 (file)
index 0000000..5da1a7c
--- /dev/null
@@ -0,0 +1,49 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: crypto-common
+Upstream-Contact: RustCrypto Developers
+Source: https://github.com/RustCrypto/traits
+
+Files: *
+Copyright: FIXME (overlay) UNKNOWN-YEARS RustCrypto Developers
+License: MIT or Apache-2.0
+Comment:
+ FIXME (overlay): Since upstream copyright years are not available in
+ Cargo.toml, they were extracted from the upstream Git repository. This may not
+ be correct information so you should review and fix this before uploading to
+ the archive.
+
+Files: ./LICENSE-MIT
+Copyright: 2021 RustCrypto Developers
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: debian/*
+Copyright:
+ 2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2022 Sylvestre Ledru <sylvestre@debian.org>
+License: MIT or Apache-2.0
+
+License: Apache-2.0
+ Debian systems provide the Apache 2.0 license in
+ /usr/share/common-licenses/Apache-2.0
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
diff --git a/src/crypto-common/debian/debcargo.toml b/src/crypto-common/debian/debcargo.toml
new file mode 100644 (file)
index 0000000..2d2a415
--- /dev/null
@@ -0,0 +1,4 @@
+overlay = "."
+uploaders = ["Sylvestre Ledru <sylvestre@debian.org>"]
+collapse_features = true
+
index 7371f6e355d33a16d546906f7418b9e19fef3fd6..950580eb9df48dbfe5983d6768e4483ce185d81d 100644 (file)
@@ -1,3 +1,10 @@
+rust-digest (0.10.3-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package digest 0.10.3 from crates.io using debcargo 2.5.0
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 23 May 2022 22:49:55 +0200
+
 rust-digest (0.9.0-1) unstable; urgency=medium
 
   * Team upload.
index 0c212819724ad1be00941ae7bb75ee0d28dba337..af8e8fc48b076a94ccf3877cd4a5a51385e3c0a3 100644 (file)
@@ -21,8 +21,8 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2018-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2018-2020 kpcyrd <git@rxv.cc>
+ 2018-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2018-2022 kpcyrd <git@rxv.cc>
 License: MIT or Apache-2.0
 
 License: Apache-2.0
index 047ba6cb8ee41b2fbc6d0a124929a9af3bbaef4b..4f82b4223e1ae970c11549fd3b0956bc7ed8c8fd 100644 (file)
@@ -6,6 +6,7 @@ Source: https://github.com/pierd/magnet-uri
 Files: *
 Copyright: 2018-2022 Jakub Jaroszewski <jakub.jaroszewski@gmail.com>
 License: MIT
+Comment: The mention of "Kuba" in copyright.debcargo.hint is as nickname for Jakub (the upstream contact)
 
 Files: debian/*
 Copyright:
index e01465bb9f6a12069fc7b451d9d0ea6470a1c196..0cfec90fcdfba7812bbbfcd34f6539c98e453caf 100644 (file)
@@ -7,6 +7,9 @@ Files: *
 Copyright: 2020-2022 Manish Goregaokar <manishsmail@gmail.com>
 License: MIT or Apache-2.0
 
+Files: src/lib.rs
+Copyright: 2017 The Rust Project Developers
+License: MIT or Apache-2.0
 
 Files: debian/*
 Copyright:
index d9ffcdfcf5bc5ce3792d86d9aafae4cadbfe3aa8..db77c7938c16d8fd6deb40440932f32cf41fe283 100644 (file)
@@ -1,3 +1,13 @@
+rust-rayon-core (1.9.3-2) unstable; urgency=medium
+
+  * Team upload.
+  * Package rayon-core 1.9.3 from crates.io using debcargo 2.5.0
+  * Constrain thread pool size in stack_overflow_test.rs and improve error
+    reporting. Hopefully this fixes the autopkgtest failure on armhf or
+    at least helps debugging it.
+
+ -- Peter Michael Green <plugwash@debian.org>  Tue, 24 May 2022 04:22:23 +0000
+
 rust-rayon-core (1.9.3-1) unstable; urgency=medium
 
   * Package rayon-core 1.9.3 from crates.io using debcargo 2.5.0
diff --git a/src/rayon-core/debian/patches/constrain-thread-count.patch b/src/rayon-core/debian/patches/constrain-thread-count.patch
new file mode 100644 (file)
index 0000000..2d5b4a4
--- /dev/null
@@ -0,0 +1,23 @@
+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();
diff --git a/src/rayon-core/debian/patches/series b/src/rayon-core/debian/patches/series
new file mode 100644 (file)
index 0000000..1d74fb6
--- /dev/null
@@ -0,0 +1 @@
+constrain-thread-count.patch
index b6e88b337664bd4c01f8823efe1bc717c6f606a8..43ed8b48db21e27efe3e56b5a71884606439b63b 100644 (file)
@@ -1,3 +1,9 @@
+rust-rustversion (1.0.6-1) unstable; urgency=medium
+
+  * Package rustversion 1.0.6 from crates.io using debcargo 2.5.0
+
+ -- Wolfgang Silbermayr <wolfgang@silbermayr.at>  Mon, 23 May 2022 19:52:33 +0200
+
 rust-rustversion (1.0.2-1) unstable; urgency=medium
 
   * Package rustversion 1.0.2 from crates.io using debcargo 2.4.3
index f6e72046d228beb56f7c8b3618278561697a1d64..fb9c1e670d8dc2c500481bde3f5a89ccaa565610 100644 (file)
@@ -4,13 +4,13 @@ Upstream-Contact: David Tolnay <dtolnay@gmail.com>
 Source: https://github.com/dtolnay/rustversion
 
 Files: *
-Copyright: 2019 David Tolnay <dtolnay@gmail.com>
+Copyright: 2019-2021 David Tolnay <dtolnay@gmail.com>
 License: MIT or Apache-2.0
 
 Files: debian/*
 Copyright:
- 2019-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2019-2020 Wolfgang Silbermayr <wolfgang@silbermayr.at>
+ 2019-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2019-2022 Wolfgang Silbermayr <wolfgang@silbermayr.at>
 License: MIT or Apache-2.0
 
 License: Apache-2.0
index e009f283e8f40b35cf827ea8cca8fe3e24ce7118..5da649654571ba139cd7083cb0bb2588f7be2bd5 100644 (file)
@@ -14,8 +14,8 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2019-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2019-2020 Wolfgang Silbermayr <wolfgang@silbermayr.at>
+ 2019-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2019-2022 Wolfgang Silbermayr <wolfgang@silbermayr.at>
 License: MIT or Apache-2.0
 
 License: Apache-2.0
diff --git a/src/scale-info/debian/changelog b/src/scale-info/debian/changelog
new file mode 100644 (file)
index 0000000..0d6508e
--- /dev/null
@@ -0,0 +1,5 @@
+rust-scale-info (2.1.2-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Package scale-info 2.1.2 from crates.io using debcargo 2.5.0
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 23 May 2022 23:01:36 +0200
diff --git a/src/scale-info/debian/copyright b/src/scale-info/debian/copyright
new file mode 100644 (file)
index 0000000..4f507d0
--- /dev/null
@@ -0,0 +1,18 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: scale-info
+Upstream-Contact: Parity Technologies <admin@parity.io>
+Source: https://github.com/paritytech/scale-info
+
+Files: *
+Copyright: 2019-2022 Parity Technologies <admin@parity.io>
+License: Apache-2.0
+
+Files: debian/*
+Copyright:
+ 2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2022 Sylvestre Ledru <sylvestre@debian.org>
+License: Apache-2.0
+
+License: Apache-2.0
+ Debian systems provide the Apache 2.0 license in
+ /usr/share/common-licenses/Apache-2.0
diff --git a/src/scale-info/debian/copyright.debcargo.hint b/src/scale-info/debian/copyright.debcargo.hint
new file mode 100644 (file)
index 0000000..05aa013
--- /dev/null
@@ -0,0 +1,128 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: scale-info
+Upstream-Contact: Parity Technologies <admin@parity.io>
+Source: https://github.com/paritytech/scale-info
+
+Files: *
+Copyright: FIXME (overlay) UNKNOWN-YEARS Parity Technologies <admin@parity.io>
+License: Apache-2.0
+Comment:
+ FIXME (overlay): Since upstream copyright years are not available in
+ Cargo.toml, they were extracted from the upstream Git repository. This may not
+ be correct information so you should review and fix this before uploading to
+ the archive.
+
+Files: ./src/build.rs
+Copyright: 2019-2022 Parity Technologies (UK) Ltd.
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: ./src/form.rs
+Copyright: 2019-2022 Parity Technologies (UK) Ltd.
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: ./src/impls.rs
+Copyright: 2019-2022 Parity Technologies (UK) Ltd.
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: ./src/interner.rs
+Copyright: 2019-2022 Parity Technologies (UK) Ltd.
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: ./src/lib.rs
+Copyright: 2019-2022 Parity Technologies (UK) Ltd.
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: ./src/meta_type.rs
+Copyright: 2019-2022 Parity Technologies (UK) Ltd.
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: ./src/prelude.rs
+Copyright: 2019-2022 Parity Technologies (UK) Ltd.
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: ./src/registry.rs
+Copyright: 2019-2022 Parity Technologies (UK) Ltd.
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: ./src/tests.rs
+Copyright: 2019-2022 Parity Technologies (UK) Ltd.
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: ./src/ty/composite.rs
+Copyright: 2019-2022 Parity Technologies (UK) Ltd.
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: ./src/ty/fields.rs
+Copyright: 2019-2022 Parity Technologies (UK) Ltd.
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: ./src/ty/mod.rs
+Copyright: 2019-2022 Parity Technologies (UK) Ltd.
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: ./src/ty/path.rs
+Copyright: 2019-2022 Parity Technologies (UK) Ltd.
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: ./src/ty/variant.rs
+Copyright: 2019-2022 Parity Technologies (UK) Ltd.
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: ./src/utils.rs
+Copyright: 2019-2022 Parity Technologies (UK) Ltd.
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: debian/*
+Copyright:
+ 2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2022 Sylvestre Ledru <sylvestre@debian.org>
+License: Apache-2.0
+
+License: Apache-2.0
+ Debian systems provide the Apache 2.0 license in
+ /usr/share/common-licenses/Apache-2.0
diff --git a/src/scale-info/debian/debcargo.toml b/src/scale-info/debian/debcargo.toml
new file mode 100644 (file)
index 0000000..d4f56da
--- /dev/null
@@ -0,0 +1,2 @@
+overlay = "."
+uploaders = ["Sylvestre Ledru <sylvestre@debian.org>"]
index b34101a4a496c20b8b8966379c10b8c6d42bc6a8..773814d2ae98a9823633588bfdfe53003c35ec23 100644 (file)
@@ -1,3 +1,9 @@
+rust-sequoia-openpgp (1.9.0-1) unstable; urgency=medium
+
+  * Package sequoia-openpgp 1.9.0 from crates.io using debcargo 2.5.0
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Wed, 25 May 2022 11:56:22 -0400
+
 rust-sequoia-openpgp (1.8.0-1) unstable; urgency=medium
 
   * Package sequoia-openpgp 1.8.0 from crates.io using debcargo 2.5.0
index b5d3257f3649d59232fee5a5ddb5e0bd0771090a..769c3090396ce924b3a19f16f29abd636bbab17c 100644 (file)
@@ -13,11 +13,9 @@ install.
  Cargo.toml | 132 -----------------------------------------------------
  1 file changed, 132 deletions(-)
 
-diff --git a/Cargo.toml b/Cargo.toml
-index 4d136d6..542504b 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -36,10 +36,6 @@ required-features = ["compression-deflate"]
+@@ -36,28 +36,12 @@
  [[bench]]
  name = "run_benchmarks"
  harness = false
@@ -28,7 +26,6 @@ index 4d136d6..542504b 100644
  [dependencies.anyhow]
  version = "1.0.18"
  
-@@ -49,18 +45,6 @@ version = "0.3.3"
  [dependencies.base64]
  version = ">=0.12"
  
@@ -47,7 +44,7 @@ index 4d136d6..542504b 100644
  [dependencies.buffered-reader]
  version = "1.0.0"
  default-features = false
-@@ -69,53 +53,13 @@ default-features = false
+@@ -66,53 +50,13 @@
  version = "0.4"
  optional = true
  
@@ -101,7 +98,7 @@ index 4d136d6..542504b 100644
  [dependencies.idna]
  version = "0.2"
  
-@@ -128,10 +72,6 @@ version = "1.4.0"
+@@ -125,10 +69,6 @@
  [dependencies.libc]
  version = "0.2.66"
  
@@ -112,7 +109,7 @@ index 4d136d6..542504b 100644
  [dependencies.memsec]
  version = ">=0.5"
  default-features = false
-@@ -140,67 +80,20 @@ default-features = false
+@@ -137,67 +77,20 @@
  version = "7.0.2"
  optional = true
  
@@ -180,7 +177,7 @@ index 4d136d6..542504b 100644
  [dependencies.xxhash-rust]
  version = "0.8"
  features = ["xxh3"]
-@@ -230,33 +123,8 @@ allow-variable-time-crypto = []
+@@ -224,33 +117,8 @@
  compression = ["compression-deflate", "compression-bzip2"]
  compression-bzip2 = ["bzip2", "buffered-reader/compression-bzip2"]
  compression-deflate = ["flate2", "buffered-reader/compression-deflate"]
@@ -214,6 +211,3 @@ index 4d136d6..542504b 100644
  [badges.gitlab]
  repository = "sequoia-pgp/sequoia"
  
--- 
-2.34.1
-
index df2194f079fbf63de7d7edfb09c54f4d3e9ece60..9dae78d0bd95581fcc32b8c97020a56bc7de9e0a 100644 (file)
@@ -12,11 +12,9 @@ all of the recursive dependencies of criterion is a complicated mess.
  Cargo.toml | 6 ------
  1 file changed, 6 deletions(-)
 
-diff --git a/Cargo.toml b/Cargo.toml
-index 542504b..8ad8202 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -33,9 +33,6 @@ bench = false
+@@ -33,9 +33,6 @@
  name = "pad"
  required-features = ["compression-deflate"]
  
@@ -26,7 +24,7 @@ index 542504b..8ad8202 100644
  [dependencies.anyhow]
  version = "1.0.18"
  
-@@ -97,9 +94,6 @@ version = "1.0.2"
+@@ -94,9 +91,6 @@
  [dependencies.xxhash-rust]
  version = "0.8"
  features = ["xxh3"]
@@ -36,6 +34,3 @@ index 542504b..8ad8202 100644
  
  [dev-dependencies.quickcheck]
  version = "1"
--- 
-2.34.1
-
index c9defcbeb6996dd691702efc23f03ffe8ee0a74b..631b6d5e12b4e3d741f24a07ac26d2b95935aa5e 100644 (file)
@@ -7,12 +7,10 @@ Subject: [PATCH] drop experimental and variable-time crypto backends
  Cargo.toml | 2 --
  1 file changed, 2 deletions(-)
 
-diff --git a/Cargo.toml b/Cargo.toml
-index 8ad8202..33712c5 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -112,8 +112,6 @@ version = "5.0"
- version = ">=0.17"
+@@ -106,8 +106,6 @@
+ default-features = false
  
  [features]
 -allow-experimental-crypto = []
@@ -20,6 +18,3 @@ index 8ad8202..33712c5 100644
  compression = ["compression-deflate", "compression-bzip2"]
  compression-bzip2 = ["bzip2", "buffered-reader/compression-bzip2"]
  compression-deflate = ["flate2", "buffered-reader/compression-deflate"]
--- 
-2.34.1
-
index 106f987dae98ab550b7d07c0a241860e01e6dc06..32a83c5735b77f6d649a02fe156d474f4a79d9c0 100644 (file)
@@ -1,44 +1,44 @@
-Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.8.0 --all-targets --all-features
+Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.9.0 --all-targets --all-features
 Features: test-name=rust-sequoia-openpgp:@
-Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-quickcheck-macros-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
+Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
 Restrictions: allow-stderr, skip-not-installable
 
-Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.8.0 --all-targets --no-default-features --features bzip2,crypto-nettle
+Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.9.0 --all-targets --no-default-features --features bzip2,crypto-nettle
 Features: test-name=librust-sequoia-openpgp+bzip2-dev:bzip2
-Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-quickcheck-macros-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
+Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
 Restrictions: allow-stderr, skip-not-installable
 
-Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.8.0 --all-targets --no-default-features --features compression,crypto-nettle
+Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.9.0 --all-targets --no-default-features --features compression,crypto-nettle
 Features: test-name=librust-sequoia-openpgp+compression-dev:compression
-Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-quickcheck-macros-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
+Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
 Restrictions: allow-stderr, skip-not-installable
 
-Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.8.0 --all-targets --no-default-features --features compression-bzip2,crypto-nettle
+Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.9.0 --all-targets --no-default-features --features compression-bzip2,crypto-nettle
 Features: test-name=librust-sequoia-openpgp+compression-bzip2-dev:compression-bzip2
-Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-quickcheck-macros-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
+Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
 Restrictions: allow-stderr, skip-not-installable
 
-Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.8.0 --all-targets --no-default-features --features compression-deflate,crypto-nettle
+Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.9.0 --all-targets --no-default-features --features compression-deflate,crypto-nettle
 Features: test-name=librust-sequoia-openpgp+compression-deflate-dev:compression-deflate
-Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-quickcheck-macros-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
+Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
 Restrictions: allow-stderr, skip-not-installable
 
-Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.8.0 --all-targets 
+Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.9.0 --all-targets 
 Features: test-name=librust-sequoia-openpgp+default-dev:default
-Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-quickcheck-macros-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
+Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
 Restrictions: allow-stderr, skip-not-installable
 
-Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.8.0 --all-targets --no-default-features --features flate2,crypto-nettle
+Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.9.0 --all-targets --no-default-features --features flate2,crypto-nettle
 Features: test-name=librust-sequoia-openpgp+flate2-dev:flate2
-Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-quickcheck-macros-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
+Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
 Restrictions: allow-stderr, skip-not-installable
 
-Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.8.0 --all-targets --no-default-features --features crypto-nettle
+Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.9.0 --all-targets --no-default-features --features crypto-nettle
 Features: test-name=librust-sequoia-openpgp+nettle-dev:crypto-nettle
-Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-quickcheck-macros-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
+Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
 Restrictions: allow-stderr, skip-not-installable
 
-Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.8.0 --all-targets --no-default-features --features nettle,crypto-nettle
+Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.9.0 --all-targets --no-default-features --features nettle,crypto-nettle
 Features: test-name=librust-sequoia-openpgp+nettle-dev:nettle
-Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-quickcheck-macros-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
+Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
 Restrictions: allow-stderr, skip-not-installable
index 6de81b5ee415611a1b4912ba14e35e8f1da50c06..197218effab5422a05c4015cc6fb2072f0661fc1 100644 (file)
@@ -1,49 +1,49 @@
-Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.8.0 --all-targets --all-features
+Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.9.0 --all-targets --all-features
 Features: test-name=rust-sequoia-openpgp:@
-Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-quickcheck-macros-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
+Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
 Restrictions: allow-stderr, skip-not-installable
 
-Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.8.0 --all-targets --no-default-features
+Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.9.0 --all-targets --no-default-features
 Features: test-name=librust-sequoia-openpgp-dev:
-Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-quickcheck-macros-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
+Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
 Restrictions: allow-stderr, skip-not-installable
 
-Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.8.0 --all-targets --no-default-features --features bzip2
+Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.9.0 --all-targets --no-default-features --features bzip2
 Features: test-name=librust-sequoia-openpgp+bzip2-dev:bzip2
-Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-quickcheck-macros-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
+Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
 Restrictions: allow-stderr, skip-not-installable
 
-Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.8.0 --all-targets --no-default-features --features compression
+Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.9.0 --all-targets --no-default-features --features compression
 Features: test-name=librust-sequoia-openpgp+compression-dev:compression
-Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-quickcheck-macros-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
+Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
 Restrictions: allow-stderr, skip-not-installable
 
-Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.8.0 --all-targets --no-default-features --features compression-bzip2
+Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.9.0 --all-targets --no-default-features --features compression-bzip2
 Features: test-name=librust-sequoia-openpgp+compression-bzip2-dev:compression-bzip2
-Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-quickcheck-macros-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
+Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
 Restrictions: allow-stderr, skip-not-installable
 
-Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.8.0 --all-targets --no-default-features --features compression-deflate
+Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.9.0 --all-targets --no-default-features --features compression-deflate
 Features: test-name=librust-sequoia-openpgp+compression-deflate-dev:compression-deflate
-Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-quickcheck-macros-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
+Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
 Restrictions: allow-stderr, skip-not-installable
 
-Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.8.0 --all-targets 
+Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.9.0 --all-targets 
 Features: test-name=librust-sequoia-openpgp+default-dev:default
-Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-quickcheck-macros-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
+Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
 Restrictions: allow-stderr, skip-not-installable
 
-Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.8.0 --all-targets --no-default-features --features flate2
+Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.9.0 --all-targets --no-default-features --features flate2
 Features: test-name=librust-sequoia-openpgp+flate2-dev:flate2
-Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-quickcheck-macros-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
+Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
 Restrictions: allow-stderr, skip-not-installable
 
-Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.8.0 --all-targets --no-default-features --features crypto-nettle
+Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.9.0 --all-targets --no-default-features --features crypto-nettle
 Features: test-name=librust-sequoia-openpgp+nettle-dev:crypto-nettle
-Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-quickcheck-macros-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
+Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
 Restrictions: allow-stderr, skip-not-installable
 
-Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.8.0 --all-targets --no-default-features --features nettle
+Test-Command: /usr/share/cargo/bin/cargo-auto-test sequoia-openpgp 1.9.0 --all-targets --no-default-features --features nettle
 Features: test-name=librust-sequoia-openpgp+nettle-dev:nettle
-Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-quickcheck-macros-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
+Depends: dh-cargo (>= 18), librust-quickcheck-1-dev, librust-rand-0.8+default-dev, librust-rpassword-5+default-dev, @
 Restrictions: allow-stderr, skip-not-installable
diff --git a/src/serde-derive/debian/RFS b/src/serde-derive/debian/RFS
deleted file mode 100644 (file)
index e69de29..0000000
index ecc76fe8fa341cf284caaed4c3e7736aebed6550..ac93c2101d56ccd40c57374303db8d1c4fc4138e 100644 (file)
@@ -1,9 +1,9 @@
-rust-serde-derive (1.0.136-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+rust-serde-derive (1.0.136-1) unstable; urgency=medium
 
   * Team upload.
   * Package serde_derive 1.0.136 from crates.io using debcargo 2.5.0
 
- -- Carlos F. Sanz <carlos@sanz.dev>  Sun, 30 Jan 2022 11:32:59 -0800
+ -- Carlos F. Sanz <carlos@sanz.dev>  Wed, 25 May 2022 00:15:18 -0400
 
 rust-serde-derive (1.0.130-1) unstable; urgency=medium
 
diff --git a/src/serde-ignored/debian/RFS b/src/serde-ignored/debian/RFS
deleted file mode 100644 (file)
index e69de29..0000000
index 0d6c4ca3a8f9ebab83b9dc57ec6668ac3e86fc71..31a0a237776ecafece22bd7b2f758689ab5608b3 100644 (file)
@@ -1,9 +1,9 @@
-rust-serde-ignored (0.1.2-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+rust-serde-ignored (0.1.2-1) unstable; urgency=medium
 
   * Team upload.
   * Package serde_ignored 0.1.2 from crates.io using debcargo 2.5.0
 
- -- Carlos F. Sanz <carlos@sanz.dev>  Sun, 30 Jan 2022 11:09:20 -0800
+ -- Carlos F. Sanz <carlos@sanz.dev>  Wed, 25 May 2022 00:44:12 -0400
 
 rust-serde-ignored (0.1.0-1) unstable; urgency=medium
 
index c43cb989adc845e592eabe7eb379376336f1c8bd..dbceeee252dbcda7d9cf682df24ddd478225c4e8 100644 (file)
@@ -1,8 +1,11 @@
-rust-sha1 (0.6.0-2) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+rust-sha1 (0.10.1-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
 
+  * Package sha1 0.10.1 from crates.io using debcargo 2.5.0
+
+  [ Ximin Luo ]
   * Update copyright info.
 
- -- Ximin Luo <infinity0@debian.org>  Thu,  5 Jul 2018 01:58:21 -0700
+ -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 23 May 2022 22:48:10 +0200
 
 rust-sha1 (0.6.0-1) unstable; urgency=medium
 
index 3151d33599eb9f3dd1e2f8d93d8844af03627f7d..a070969db37bd3f58e51b55b9ad67ecd9ef133ee 100644 (file)
@@ -1,61 +1,52 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: sha1
-Upstream-Contact: Armin Ronacher <armin.ronacher@active-4.com>
-Source: https://github.com/mitsuhiko/rust-sha1
+Upstream-Contact: RustCrypto Developers
+Source: https://github.com/RustCrypto/hashes
 
 Files: *
-Copyright: FIXME (overlay) UNKNOWN Armin Ronacher <armin.ronacher@active-4.com>
-License: BSD-3-Clause
+Copyright: FIXME (overlay) UNKNOWN-YEARS RustCrypto Developers
+License: MIT or Apache-2.0
 Comment:
  FIXME (overlay): Since upstream copyright years are not available in
  Cargo.toml, they were extracted from the upstream Git repository. This may not
  be correct information so you should review and fix this before uploading to
  the archive.
 
-Files: ./LICENSE
-Copyright: 2013 Koka El Kiwi
-License: UNKNOWN; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./src/simd.rs
-Copyright: 2009-2013 Mozilla Foundation
-License: UNKNOWN; FIXME (overlay)
+Files: ./LICENSE-MIT
+Copyright:
+ 2006-2009 Graydon Hoare
+ 2009-2013 Mozilla Foundation
+ 2016 Artyom Pavlov
+License: UNKNOWN-LICENSE; FIXME (overlay)
 Comment:
  FIXME (overlay): These notices are extracted from files. Please review them
  before uploading to the archive.
 
 Files: debian/*
-Copyright: 2018 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
-           2018 FIXME (overlay) Your Name <Your Email>
-License: BSD-3-Clause
-
-License: BSD-3-Clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
+Copyright:
+ 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
+ Debian systems provide the Apache 2.0 license in
+ /usr/share/common-licenses/Apache-2.0
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
  .
- 1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
+ The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
  .
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- .
- 3. Neither the name of the copyright holder nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
index 62cc3f7b9515c545dbe7f46c49e504cc99502d6e..d4f56dad95adf0e7883fabceb51814133b25ebcf 100644 (file)
@@ -1 +1,2 @@
 overlay = "."
+uploaders = ["Sylvestre Ledru <sylvestre@debian.org>"]
index 6be5333627be43af7022038faf8fd789c0d9b62f..4711fc7839f93f389f1cae19b8104bde164c40f9 100644 (file)
@@ -1,3 +1,17 @@
+rust-typenum (1.15.0-2) unstable; urgency=medium
+
+  * Team upload.
+  * Package typenum 1.15.0 from crates.io using debcargo 2.5.0
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 23 May 2022 23:08:41 +0200
+
+rust-typenum (1.15.0-1) unstable; urgency=medium
+
+  * Team upload.
+  * Package typenum 1.15.0 from crates.io using debcargo 2.5.0
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 23 May 2022 22:55:42 +0200
+
 rust-typenum (1.12.0-1) unstable; urgency=medium
 
   * Team upload.
index 1fba0a8df3bec370e3b21776455d00eb7dbccaf8..63d63d8a86ea5480d18f6056ac1dc84fef817f81 100644 (file)
@@ -16,7 +16,14 @@ Comment:
  be correct information so you should review and fix this before uploading to
  the archive.
 
-Files: ./LICENSE
+Files: ./LICENSE-APACHE
+Copyright: 2014 Paho Lurie-Gregg
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
+Files: ./LICENSE-MIT
 Copyright: 2014 Paho Lurie-Gregg
 License: UNKNOWN-LICENSE; FIXME (overlay)
 Comment:
@@ -25,8 +32,8 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2018-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2018-2020 kpcyrd <git@rxv.cc>
+ 2018-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2018-2022 kpcyrd <git@rxv.cc>
 License: MIT or Apache-2.0
 
 License: Apache-2.0
index 8f1f3c1b42b4edb089566320c76420be18c3d458..78eeb0bcc4cae3f5a7ca028400e6c2a9116e4e50 100644 (file)
@@ -1,2 +1,3 @@
 overlay = "."
 uploaders = ["kpcyrd <git@rxv.cc>"]
+collapse_features = true
diff --git a/src/typenum/debian/patches/disable-scale-info.diff b/src/typenum/debian/patches/disable-scale-info.diff
new file mode 100644 (file)
index 0000000..365ade2
--- /dev/null
@@ -0,0 +1,24 @@
+Index: typenum/Cargo.toml
+===================================================================
+--- typenum.orig/Cargo.toml
++++ typenum/Cargo.toml
+@@ -24,14 +24,14 @@ repository = "https://github.com/paholg/
+ [lib]
+ name = "typenum"
+-[dependencies.scale-info]
+-version = "1.0"
+-optional = true
+-default-features = false
++#[dependencies.scale-info]
++#version = "1.0"
++#optional = true
++#default-features = false
+ [features]
+ force_unix_path_separator = []
+ i128 = []
+ no_std = []
+-scale_info = ["scale-info/derive"]
++#scale_info = ["scale-info/derive"]
+ strict = []
diff --git a/src/typenum/debian/patches/series b/src/typenum/debian/patches/series
new file mode 100644 (file)
index 0000000..7f17c62
--- /dev/null
@@ -0,0 +1 @@
+disable-scale-info.diff
index 8afde424a64c3533cf5fc6d007b4da53c4c1d370..8c794a882d3f673e0780574d18a948da411e926d 100644 (file)
@@ -1,8 +1,8 @@
-rust-zram-generator (0.3.2-2) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+rust-zram-generator (1.1.2-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
 
-  * debian/postinst: fix postinst.
+  * Package zram-generator 1.1.2 from crates.io using debcargo 2.5.0
 
- -- Clay Stan <claystan97@gmail.com>  Mon, 10 Jan 2022 10:08:34 +0800
+ -- Ben Westover <kwestover.kw@gmail.com>  Wed, 25 May 2022 16:22:22 -0400
 
 rust-zram-generator (0.3.2-1) unstable; urgency=medium
 
diff --git a/src/zram-generator/debian/control b/src/zram-generator/debian/control
deleted file mode 100644 (file)
index e5517f4..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-Source: rust-zram-generator
-Section: rust
-Priority: optional
-Build-Depends: debhelper (>= 12),
- dh-cargo (>= 24),
- cargo:native,
- rustc:native,
- libstd-rust-dev,
- librust-anyhow-1+default-dev (>= 1.0.12-~~),
- librust-clap-2-dev (>= 2.33-~~),
- librust-liboverdrop-0.0.2+default-dev,
- librust-log-0.4+default-dev,
- librust-log-0.4+std-dev,
- librust-rust-ini-0.16+default-dev | librust-rust-ini-0.15+default-dev | librust-rust-ini-0.14+default-dev | librust-rust-ini-0.13+default-dev,
- ronn,
- systemd,
- pkg-config,
-Maintainer: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
-Uploaders:
- Clay Stan <claystan97@gmail.com>,
- Heysion <heysion@deepin.com>
-Standards-Version: 4.6.0.1
-Vcs-Git: https://salsa.debian.org/rust-team/debcargo-conf.git [src/zram-generator]
-Vcs-Browser: https://salsa.debian.org/rust-team/debcargo-conf/tree/master/src/zram-generator
-Homepage: https://github.com/systemd/zram-generator
-Rules-Requires-Root: no
-
-Package: systemd-zram-generator
-Architecture: any
-Multi-Arch: allowed
-Section: rust
-Depends:
- ${misc:Depends},
- ${shlibs:Depends},
- ${cargo:Depends}
-Recommends:
- ${cargo:Recommends}
-Suggests:
- ${cargo:Suggests}
-Provides:
- ${cargo:Provides}
-Built-Using: ${cargo:Built-Using}
-XB-X-Cargo-Built-Using: ${cargo:X-Cargo-Built-Using}
-Description: Systemd unit generator for zram swap devices
- This package contains the following binaries built from the Rust crate
- "zram-generator":
-  - zram-generator
index ede7e3ea96ad943b12969115259382b38e10f62b..ca6952ca40ba85fb7efe2c611bfe9cbc8a9b418e 100644 (file)
@@ -3,21 +3,20 @@ Upstream-Name: zram-generator
 Upstream-Contact:
  Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
  Igor Raits <i.gnatenko.brain@gmail.com>
- наб <nabijaczleweli@gmail.com>
- https://github.com/systemd/zram-generator/issues
-Source: https://github.com/systemd/zram-generator
+ наб <nabijaczleweli@nabijaczleweli.xyz>
 
 Files: *
-Copyright: 2020-2021,Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
          2020-2021,Igor Raits <i.gnatenko.brain@gmail.com>
          2020-2021,наб <nabijaczleweli@gmail.com>
          2020-2021, zram-generator project contributors <https://github.com/systemd/zram-generator/graphs/contributors>
+Copyright:
2018-2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
2018-2022 Igor Raits <i.gnatenko.brain@gmail.com>
2018-2022 наб <nabijaczleweli@nabijaczleweli.xyz>
 License: MIT
 
 Files: debian/*
 Copyright:
- 2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2021-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
  2021 Clay Stan <claystan97@gmail.com>
+ 2022 Ben Westover <kwestover.kw@gmail.com>
 License: MIT
 
 License: MIT
index fb8accbaeef1747b2e52af7643f2c3c661fe192b..a64e49406c11a740a802e970248ffc9d8605648e 100644 (file)
@@ -3,13 +3,13 @@ Upstream-Name: zram-generator
 Upstream-Contact:
  Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
  Igor Raits <i.gnatenko.brain@gmail.com>
- наб <nabijaczleweli@gmail.com>
+ наб <nabijaczleweli@nabijaczleweli.xyz>
 
 Files: *
 Copyright:
  FIXME (overlay) UNKNOWN-YEARS Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
  FIXME (overlay) UNKNOWN-YEARS Igor Raits <i.gnatenko.brain@gmail.com>
- FIXME (overlay) UNKNOWN-YEARS наб <nabijaczleweli@gmail.com>
+ FIXME (overlay) UNKNOWN-YEARS наб <nabijaczleweli@nabijaczleweli.xyz>
 License: MIT
 Comment:
  FIXME (overlay): Since upstream copyright years are not available in
@@ -19,8 +19,8 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2021 Clay Stan <claystan97@gmail.com>
+ 2021-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2021-2022 Ben Westover <kwestover.kw@gmail.com>
 License: MIT
 
 License: MIT
index f09eca3d0ba245ed10b548d13f8d75780098ab46..dd4aaa1e3a0a20f5165922cb4485248fb56dde45 100644 (file)
@@ -1,2 +1,16 @@
 overlay = "."
-uploaders = ["Clay Stan <claystan97@gmail.com>"]
+bin_name = "systemd-zram-generator"
+uploaders = ["Ben Westover <kwestover.kw@gmail.com>"]
+
+[source]
+build_depends = ["systemd", "ronn", "pkg-config", "dh-exec"]
+
+[packages.bin]
+section = "admin"
+summary = "Systemd unit generator for zram devices"
+description = """
+This generator provides a simple and fast mechanism to configure swap
+on /dev/zram* devices. The main use case is create swap devices, but
+devices with a file system can be created too, see below.
+"""
+depends = ["systemd"]
diff --git a/src/zram-generator/debian/manpages b/src/zram-generator/debian/manpages
deleted file mode 100644 (file)
index 9440fd1..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-man/zram-generator.conf.5
-man/zram-generator.8
diff --git a/src/zram-generator/debian/patches/series b/src/zram-generator/debian/patches/series
new file mode 100644 (file)
index 0000000..dbc7220
--- /dev/null
@@ -0,0 +1 @@
+systemd-dir.patch
diff --git a/src/zram-generator/debian/patches/systemd-dir.patch b/src/zram-generator/debian/patches/systemd-dir.patch
new file mode 100644 (file)
index 0000000..09129d4
--- /dev/null
@@ -0,0 +1,26 @@
+Description: Replace environment variable check with the actual value
+ Instead of detecting and passing SYSTEMD_UTIL_DIR in d/rules, simply
+ remove the code that checks for that variable and replace it with the
+ value /lib/systemd, which should never change.
+Author: Ben Westover <kwestover.kw@gmail.com>
+Forwarded: not-needed
+Last-Update: 2022-05-25
+
+--- a/src/setup.rs
++++ b/src/setup.rs
+@@ -10,14 +10,7 @@
+ use std::path::Path;
+ use std::process::Command;
+-pub const SYSTEMD_MAKEFS_COMMAND: &str = concat!(
+-    env!(
+-        "SYSTEMD_UTIL_DIR",
+-        "Define $SYSTEMD_UTIL_DIR to the result of \
+-         $(pkg-config --variable=systemdutildir systemd) (e.g. /usr/lib/systemd/)"
+-    ),
+-    "/systemd-makefs"
+-);
++pub const SYSTEMD_MAKEFS_COMMAND: &str = "/lib/systemd/systemd-makefs";
+ pub fn run_device_setup(device: Option<Device>, device_name: &str) -> Result<()> {
+     let device = device.ok_or_else(|| anyhow!("Device {} not found", device_name))?;
diff --git a/src/zram-generator/debian/postinst b/src/zram-generator/debian/postinst
deleted file mode 100755 (executable)
index 02835a2..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-set -e
-
-case "${1}" in
-    configure)
-        # load kernel module after install
-        if [ ! -d /sys/module/zram ]; then
-            if [ -d /run/systemd/system ]; then
-                systemctl restart systemd-modules-load.service
-            elif command -v modprobe 2>/dev/null; then
-                modprobe zram
-            else
-                echo "Failed to load the required zram kernel module."
-                echo "Please load manually for zram support."
-            fi
-        fi
-        ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-        ;;
-
-    *)
-        echo "postinst called with unknown argument \`${1}'" >&2
-        ;;
-esac
-
-#DEBHELPER#
-
-exit 0
index 0c9685c6a2e16c40db4b540bbc18bbe405a4f47c..5609ae38e4d2f748176bb71db8bfd60ee03a5dd7 100755 (executable)
@@ -1,40 +1,12 @@
 #!/usr/bin/make -f
-include /usr/share/dpkg/architecture.mk
-include /usr/share/dpkg/buildflags.mk
-include /usr/share/rustc/architecture.mk
-export CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
-export DEB_HOST_RUST_TYPE DEB_HOST_GNU_TYPE
-
-DESTDIR := $(CURDIR)/debian/systemd-zram-generator
-PKG_CONFIG := pkg-config
-SYSTEMD_UTIL_DIR := $(shell $(PKG_CONFIG) --variable=systemdutildir systemd)
-SYSTEMD_SYSTEM_UNIT_DIR := $(shell $(PKG_CONFIG) --variable=systemdsystemunitdir systemd)
-SYSTEMD_SYSTEM_GENERATOR_DIR := $(shell $(PKG_CONFIG) --variable=systemdsystemgeneratordir systemd)
-export SYSTEMD_UTIL_DIR
-
 %:
        dh $@ --buildsystem cargo
 
-execute_after_dh_auto_install:
-       test -f $(DESTDIR)/usr/bin/zram-generator && rm -f $(DESTDIR)/usr/bin/zram-generator
-       test -d $(DESTDIR)/usr/bin && rmdir $(DESTDIR)/usr/bin
-
 override_dh_install:
-       make systemd_service man
-       mkdir -p $(DESTDIR)/etc/systemd/
-       mkdir -p $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR)/
-       mkdir -p $(DESTDIR)$(SYSTEMD_SYSTEM_GENERATOR_DIR)/
-       mkdir -p $(DESTDIR)/etc/modules-load.d/
-       install -Dpm755 target/$(DEB_HOST_RUST_TYPE)/release/zram-generator -t $(DESTDIR)$(SYSTEMD_SYSTEM_GENERATOR_DIR)/
-       install -Dpm644 units/systemd-zram-setup@.service $(DESTDIR)$(SYSTEMD_SYSTEM_UNIT_DIR)/
-       install -Dpm644 debian/zram-generator.conf  $(DESTDIR)/etc/systemd/
-       install -Dpm644 debian/20-zram-generator.conf  $(DESTDIR)/etc/modules-load.d/
-
-override_dh_dwz:
-       # Don't do anything. fails because of the
-       # https://github.com/rust-lang/rust/issues/66118
+       make man systemd-service
+       dh_install -O--buildsystem=cargo
 
-override_dh_clean:
-       rm -f man/zram-generator.8 man/zram-generator.8.html man/zram-generator.conf.5 man/zram-generator.conf.5.html
-       rm -f units/systemd-zram-setup@.service
-       dh_clean
+execute_after_dh_auto_install:
+       mkdir -p debian/systemd-zram-generator/lib/systemd/system-generators
+       mv debian/systemd-zram-generator/usr/bin/zram-generator debian/systemd-zram-generator/lib/systemd/system-generators
+       rm -rf debian/systemd-zram-generator/usr/bin
diff --git a/src/zram-generator/debian/rules.debcargo.hint b/src/zram-generator/debian/rules.debcargo.hint
new file mode 100755 (executable)
index 0000000..044c1c2
--- /dev/null
@@ -0,0 +1,3 @@
+#!/usr/bin/make -f
+%:
+       dh $@ --buildsystem cargo
diff --git a/src/zram-generator/debian/systemd-zram-generator.install b/src/zram-generator/debian/systemd-zram-generator.install
new file mode 100755 (executable)
index 0000000..f8744b5
--- /dev/null
@@ -0,0 +1,5 @@
+#!/usr/bin/dh-exec
+
+debian/20-zram-generator.conf /etc/modules-load.d
+units/systemd-zram-setup@.service /lib/systemd/system
+zram-generator.conf.example => /etc/systemd/zram-generator.conf
diff --git a/src/zram-generator/debian/systemd-zram-generator.lintian-overrides b/src/zram-generator/debian/systemd-zram-generator.lintian-overrides
deleted file mode 100644 (file)
index 922e42f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-systemd-service-in-odd-location
diff --git a/src/zram-generator/debian/systemd-zram-generator.manpages b/src/zram-generator/debian/systemd-zram-generator.manpages
new file mode 100644 (file)
index 0000000..4ffbc3a
--- /dev/null
@@ -0,0 +1,2 @@
+man/zram-generator.8
+man/zram-generator.conf.5
diff --git a/src/zram-generator/debian/zram-generator.conf b/src/zram-generator/debian/zram-generator.conf
deleted file mode 100644 (file)
index 9aab8f1..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-# This file is part of the zram-generator project
-# https://github.com/systemd/zram-generator
-
-[zram0]
-# This section describes the settings for /dev/zram0.
-#
-# The maximum amount of memory (in MiB). If the machine has more RAM
-# than this, zram device will not be created.
-#
-# "host-memory-limit = none" may be used to disable this limit. This
-# is also the default.
-host-memory-limit = none
-
-# The fraction of memory to use as ZRAM. For example, if the machine
-# has 1 GiB, and zram-fraction=0.25, then the zram device will have
-# 256 MiB. Values in the range 0.10–0.50 are recommended.
-#
-# The default is 0.5.
-zram-fraction = 0.5
-
-# The maximum size of the zram device (in MiB).
-#
-# If host-memory times zram-fraction is greater than this,
-# the size will be capped to this amount;
-# for example, on a machine with 2 GiB of RAM and with zram-fraction=0.5,
-# the device would still be 512 MiB in size due to the limit below.
-#
-# The default is 4096.
-# max-zram-size = 4096
-
-# The compression algorithm to use for the zram device,
-# or leave unspecified to keep the kernel default.
-compression-algorithm = lzo-rle
-
-#[zram1]
-# This section describes the settings for /dev/zram1.
-#
-# host-memory-limit is not specifed, so this device will always be created.
-
-# Size the device to a tenth of RAM.
-#zram-fraction = 0.1
-
-# The file system to put on the device. If not specified, ext2 will be used.
-#fs-type = ext2
-
-# Where to mount the file system. If a mount point is not specified,
-# the device will be initialized, but will not be used for anything.
-# mount-point = /run/compressed-mount-point