diff --git a/src/sysinfo/debian/changelog b/src/sysinfo/debian/changelog index 38c54d6..83191bc 100644 --- a/src/sysinfo/debian/changelog +++ b/src/sysinfo/debian/changelog @@ -1,3 +1,13 @@ +rust-sysinfo (0.22.5-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Package sysinfo 0.22.5 from crates.io using debcargo 2.5.0 + * Add patch to ignore tests which wont't work in Debian's isolated build + environment + * Collapse features + * Add patch to relax dependency versions + + -- Wolfgang Silbermayr Fri, 04 Feb 2022 12:53:35 +0100 + rust-sysinfo (0.13.2-3) unstable; urgency=medium * Team upload. diff --git a/src/sysinfo/debian/copyright.debcargo.hint b/src/sysinfo/debian/copyright.debcargo.hint index 1cfcb65..9026457 100644 --- a/src/sysinfo/debian/copyright.debcargo.hint +++ b/src/sysinfo/debian/copyright.debcargo.hint @@ -26,353 +26,10 @@ FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. -Files: ./src/c_interface.rs -Copyright: 2017 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/common.rs -Copyright: 2015 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/debug.rs -Copyright: 2020 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/linux/component.rs -Copyright: 2018 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/linux/disk.rs -Copyright: 2017 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/linux/mod.rs -Copyright: 2015 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/linux/network.rs -Copyright: 2019 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/linux/process.rs -Copyright: 2015 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/linux/processor.rs -Copyright: 2015 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/linux/system.rs -Copyright: 2015 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/linux/users.rs -Copyright: 2020 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/mac/component.rs -Copyright: 2018 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/mac/disk.rs -Copyright: 2017 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/mac/ffi.rs -Copyright: 2015 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/mac/mod.rs -Copyright: 2015 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/mac/network.rs -Copyright: 2017 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/mac/process.rs -Copyright: 2015 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/mac/processor.rs -Copyright: 2015 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/mac/system.rs -Copyright: 2015 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/mac/users.rs -Copyright: 2020 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/sysinfo.h -Copyright: 2017 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/sysinfo.rs -Copyright: 2015 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/system.rs -Copyright: 2015 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/traits.rs -Copyright: 2017 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/unknown/component.rs -Copyright: 2018 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/unknown/disk.rs -Copyright: 2017 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/unknown/mod.rs -Copyright: 2015 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/unknown/network.rs -Copyright: 2017 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/unknown/process.rs -Copyright: 2015 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/unknown/processor.rs -Copyright: 2015 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/unknown/system.rs -Copyright: 2015 Guillaume Gomez -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: 2017 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/windows/component.rs -Copyright: 2018 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/windows/disk.rs -Copyright: 2018 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/windows/ffi.rs -Copyright: 2020 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/windows/macros.rs -Copyright: 2017 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/windows/mod.rs -Copyright: 2015 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/windows/network.rs -Copyright: 2017 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/windows/process.rs -Copyright: 2018 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/windows/processor.rs -Copyright: 2017 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/windows/system.rs -Copyright: 2018 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/windows/tools.rs -Copyright: 2018 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/windows/users.rs -Copyright: 2020 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./tests/disk_list.rs -Copyright: 2017 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./tests/network.rs -Copyright: 2020 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./tests/process.rs -Copyright: 2018 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./tests/processor.rs -Copyright: 2020 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./tests/send_sync.rs -Copyright: 2020 Guillaume Gomez -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./tests/uptime.rs -Copyright: 2018 Guillaume Gomez -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-2020 Debian Rust Maintainers - 2018-2020 Wolfgang Silbermayr + 2018-2022 Debian Rust Maintainers + 2018-2022 Wolfgang Silbermayr License: MIT License: MIT diff --git a/src/sysinfo/debian/debcargo.toml b/src/sysinfo/debian/debcargo.toml index 3a7fdf0..94b5485 100644 --- a/src/sysinfo/debian/debcargo.toml +++ b/src/sysinfo/debian/debcargo.toml @@ -1,4 +1,16 @@ overlay = "." uploaders = ["Wolfgang Silbermayr "] -[packages.lib] +whitelist = ["examples/simple.c"] +collapse_features = true + +[packages."lib+@"] test_is_broken = true + +[package."lib+apple-app-store"] +test_is_broken = true + +[package."lib+apple-sandbox"] +test_is_broken = true + +[package."lib+unknown-ci"] +test_is_broken = true diff --git a/src/sysinfo/debian/patches/ignore-tests-failing-in-build-environment.diff b/src/sysinfo/debian/patches/ignore-tests-failing-in-build-environment.diff new file mode 100644 index 0000000..e631e8e --- /dev/null +++ b/src/sysinfo/debian/patches/ignore-tests-failing-in-build-environment.diff @@ -0,0 +1,20 @@ +--- a/src/lib.rs ++++ b/src/lib.rs +@@ -256,6 +256,7 @@ + } + + #[test] ++ #[ignore = "not supported in debian build environments"] + fn check_system_info() { + // We don't want to test on unsupported systems. + if System::IS_SUPPORTED { +--- a/tests/process.rs ++++ b/tests/process.rs +@@ -158,6 +158,7 @@ + } + + #[test] ++#[ignore = "not supported in debian build environments"] + fn test_process_disk_usage() { + use std::fs; + use std::fs::File; diff --git a/src/sysinfo/debian/patches/relax-deps.diff b/src/sysinfo/debian/patches/relax-deps.diff new file mode 100644 index 0000000..92e0eb7 --- /dev/null +++ b/src/sysinfo/debian/patches/relax-deps.diff @@ -0,0 +1,25 @@ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -32,7 +32,7 @@ + version = "1.0" + + [dependencies.rayon] +-version = "^1.5.1" ++version = "1.4" + optional = true + + [features] +@@ -44,11 +44,11 @@ + multithread = ["rayon"] + unknown-ci = [] + [target."cfg(all(target_os = \"linux\", not(target_os = \"android\")))".dev-dependencies.tempfile] +-version = "3.2" ++version = "3.1" + [target."cfg(any(target_os = \"macos\", target_os = \"ios\"))".dependencies.core-foundation-sys] + version = "0.8" + [target."cfg(not(any(target_os = \"unknown\", target_arch = \"wasm32\")))".dependencies.libc] +-version = "^0.2.112" ++version = "^0.2.80" + [target."cfg(windows)".dependencies.ntapi] + version = "0.3" + diff --git a/src/sysinfo/debian/patches/series b/src/sysinfo/debian/patches/series new file mode 100644 index 0000000..be5f75e --- /dev/null +++ b/src/sysinfo/debian/patches/series @@ -0,0 +1,2 @@ +relax-deps.diff +ignore-tests-failing-in-build-environment.diff