diff --git a/src/atoi/debian/RFS b/src/atoi/debian/RFS new file mode 100644 index 0000000..e69de29 diff --git a/src/atoi/debian/changelog b/src/atoi/debian/changelog index 6b3bd7f..0b00098 100644 --- a/src/atoi/debian/changelog +++ b/src/atoi/debian/changelog @@ -1,3 +1,11 @@ +rust-atoi (2.0.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Team upload. + * Package atoi 2.0.0 from crates.io using debcargo 2.6.0 + * Collapse features + + -- Blair Noctis Fri, 10 Feb 2023 22:10:13 +0000 + rust-atoi (0.2.3-1) unstable; urgency=medium * Package atoi 0.2.3 from crates.io using debcargo 2.2.6 diff --git a/src/atoi/debian/copyright.debcargo.hint b/src/atoi/debian/copyright.debcargo.hint index 2f3e8f9..34dafac 100644 --- a/src/atoi/debian/copyright.debcargo.hint +++ b/src/atoi/debian/copyright.debcargo.hint @@ -1,10 +1,10 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: atoi -Upstream-Contact: Markus Klein +Upstream-Contact: Markus Klein Source: https://github.com/pacman82/atoi-rs Files: * -Copyright: FIXME (overlay) UNKNOWN-YEARS Markus Klein +Copyright: FIXME (overlay) UNKNOWN-YEARS Markus Klein License: MIT Comment: FIXME (overlay): Since upstream copyright years are not available in @@ -12,7 +12,7 @@ be correct information so you should review and fix this before uploading to the archive. -Files: ./LICENSE +Files: LICENSE Copyright: 2017 License: UNKNOWN-LICENSE; FIXME (overlay) Comment: @@ -21,8 +21,8 @@ Files: debian/* Copyright: - 2018 Debian Rust Maintainers - 2018 FIXME (overlay) Your Name + 2018-2023 Debian Rust Maintainers + 2018-2023 kpcyrd License: MIT License: MIT diff --git a/src/atoi/debian/debcargo.toml b/src/atoi/debian/debcargo.toml index 62cc3f7..5b45677 100644 --- a/src/atoi/debian/debcargo.toml +++ b/src/atoi/debian/debcargo.toml @@ -1 +1,4 @@ overlay = "." +uploaders = ["kpcyrd "] + +collapse_features = true diff --git a/src/cargo-metadata/debian/changelog b/src/cargo-metadata/debian/changelog index f2f05ba..7779f86 100644 --- a/src/cargo-metadata/debian/changelog +++ b/src/cargo-metadata/debian/changelog @@ -1,3 +1,11 @@ +rust-cargo-metadata (0.15.3-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Team upload. + * Package cargo_metadata 0.15.3 from crates.io using debcargo 2.6.0 + * Relax deps on camino, derive_builder + + -- Blair Noctis Thu, 02 Feb 2023 19:12:22 +0000 + rust-cargo-metadata (0.14.2-1) unstable; urgency=medium * Team upload. diff --git a/src/cargo-metadata/debian/copyright.debcargo.hint b/src/cargo-metadata/debian/copyright.debcargo.hint index d5b2e32..5689b77 100644 --- a/src/cargo-metadata/debian/copyright.debcargo.hint +++ b/src/cargo-metadata/debian/copyright.debcargo.hint @@ -14,9 +14,9 @@ Files: debian/* Copyright: - 2018-2022 Debian Rust Maintainers - 2018-2022 Matt Kraai - 2018-2022 Robin Krahl + 2018-2023 Debian Rust Maintainers + 2018-2023 Matt Kraai + 2018-2023 Robin Krahl License: MIT License: MIT diff --git a/src/cargo-metadata/debian/patches/relax-deps.patch b/src/cargo-metadata/debian/patches/relax-deps.patch new file mode 100644 index 0000000..029823e --- /dev/null +++ b/src/cargo-metadata/debian/patches/relax-deps.patch @@ -0,0 +1,19 @@ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -25,14 +25,14 @@ + other_field = "foo" + + [dependencies.camino] +-version = "1.0.7" ++version = "< 1.2" + features = ["serde1"] + + [dependencies.cargo-platform] + version = "0.1.2" + + [dependencies.derive_builder] +-version = "0.11.1" ++version = "< 0.13" + optional = true + + [dependencies.semver] diff --git a/src/cargo-metadata/debian/patches/series b/src/cargo-metadata/debian/patches/series new file mode 100644 index 0000000..bdddf05 --- /dev/null +++ b/src/cargo-metadata/debian/patches/series @@ -0,0 +1 @@ +relax-deps.patch diff --git a/src/configparser/debian/RFS b/src/configparser/debian/RFS deleted file mode 100644 index e69de29..0000000 diff --git a/src/configparser/debian/changelog b/src/configparser/debian/changelog index 26ae0ec..8ae656e 100644 --- a/src/configparser/debian/changelog +++ b/src/configparser/debian/changelog @@ -1,11 +1,19 @@ -rust-configparser (3.0.2-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium +rust-configparser (3.0.2-2) unstable; urgency=medium + + * Package configparser 3.0.2 from crates.io using debcargo 2.6.0 + * Use CARGO_TARGET_TMPDIR instead of /tmp as it is safer. + * Avoiding changing current directory in tests, it leads to race conditions. + + -- Peter Michael Green Sat, 11 Feb 2023 08:18:13 +0000 + +rust-configparser (3.0.2-1) unstable; urgency=medium * Team upload. * Package configparser 3.0.2 from crates.io using debcargo 2.6.0 * Patch to write test files in /tmp to avoid permission error (Closes: #1030971) * Collapse features - -- Blair Noctis Fri, 10 Feb 2023 13:53:52 +0000 + -- Blair Noctis Sat, 11 Feb 2023 07:14:28 +0000 rust-configparser (2.0.0-2) unstable; urgency=medium diff --git a/src/configparser/debian/copyright b/src/configparser/debian/copyright index 2b2fe9e..2ab0985 100644 --- a/src/configparser/debian/copyright +++ b/src/configparser/debian/copyright @@ -9,7 +9,7 @@ Files: debian/* Copyright: - 2021 Debian Rust Maintainers + 2021-2023 Debian Rust Maintainers 2021 Daniel Kahn Gillmor License: MIT or LGPL-3.0-or-later diff --git a/src/configparser/debian/patches/series b/src/configparser/debian/patches/series index d98fd4b..a1f28d2 100644 --- a/src/configparser/debian/patches/series +++ b/src/configparser/debian/patches/series @@ -1 +1 @@ -write-test-files-in-tmp.patch +write-test-files-in-cargo-target-tmpdir.patch diff --git a/src/configparser/debian/patches/write-test-files-in-cargo-target-tmpdir.patch b/src/configparser/debian/patches/write-test-files-in-cargo-target-tmpdir.patch new file mode 100644 index 0000000..b9d6163 --- /dev/null +++ b/src/configparser/debian/patches/write-test-files-in-cargo-target-tmpdir.patch @@ -0,0 +1,86 @@ +Description: Write test file in CARGO_TARGET_TMPDIR +Last-Update: 2023-02-11 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: configparser/tests/test.rs +=================================================================== +--- configparser.orig/tests/test.rs ++++ configparser/tests/test.rs +@@ -4,6 +4,7 @@ use std::error::Error; + #[test] + #[allow(clippy::approx_constant)] + fn non_cs() -> Result<(), Box> { ++ use std::path::PathBuf; + let mut config = Ini::new(); + let map = config.load("tests/test.ini")?; + config.set_comment_symbols(&[';', '#', '!']); +@@ -39,8 +40,9 @@ fn non_cs() -> Result<(), Box + "defaultvalues" + ); + config.setstr("DEFAULT", "defaultvalues", None); +- config.write("output.ini")?; +- let map2 = config.clone().load("output.ini")?; ++ let path = PathBuf::from(env!("CARGO_TARGET_TMPDIR")); ++ config.write(path.join("output.ini"))?; ++ let map2 = config.clone().load(path.join("output.ini"))?; + assert_eq!(map2, *config.get_map_ref()); + let map3 = config.clone().read(config.writes())?; + assert_eq!(map2, map3); +@@ -106,6 +108,7 @@ fn non_cs() -> Result<(), Box + #[test] + #[allow(clippy::approx_constant)] + fn cs() -> Result<(), Box> { ++ use std::path::PathBuf; + let mut config = Ini::new_cs(); + let map = config.load("tests/test.ini")?; + config.set_comment_symbols(&[';', '#', '!']); +@@ -141,8 +144,9 @@ fn cs() -> Result<(), Box> { + "defaultvalues" + ); + config.setstr("default", "defaultvalues", None); +- config.write("output2.ini")?; +- let map2 = config.clone().load("output2.ini")?; ++ let path = PathBuf::from(env!("CARGO_TARGET_TMPDIR")); ++ config.write(path.join("output2.ini"))?; ++ let map2 = config.clone().load(path.join("output2.ini"))?; + assert_eq!(map2, *config.get_map_ref()); + let map3 = config.clone().read(config.writes())?; + assert_eq!(map2, map3); +@@ -238,6 +242,7 @@ Float=3.1415 + #[test] + #[cfg(feature = "async-std")] + fn async_load_write() -> Result<(), Box> { ++ use std::path::PathBuf; + const OUT_FILE_CONTENTS: &str = "defaultvalues=defaultvalues + [topsecret] + KFC = the secret herb is orega- +@@ -258,24 +263,25 @@ fn async_load_write() -> Result<(), Box< + + let mut config = Ini::new(); + config.read(OUT_FILE_CONTENTS.to_owned())?; +- config.write("output_sync.ini")?; ++ let path = PathBuf::from(env!("CARGO_TARGET_TMPDIR")); ++ config.write(path.join("output_sync.ini"))?; + + async_std::task::block_on::<_, Result<_, String>>(async { + let mut config_async = Ini::new(); + config_async.read(OUT_FILE_CONTENTS.to_owned())?; + config_async +- .write_async("output_async.ini") ++ .write_async(path.join("output_async.ini")) + .await + .map_err(|e| e.to_string())?; + Ok(()) + })?; + + let mut sync_content = Ini::new(); +- sync_content.load("output_sync.ini")?; ++ sync_content.load(path.join("output_sync.ini"))?; + + let async_content = async_std::task::block_on::<_, Result<_, String>>(async { + let mut async_content = Ini::new(); +- async_content.load_async("output_async.ini").await?; ++ async_content.load_async(path.join("output_async.ini")).await?; + Ok(async_content) + })?; + diff --git a/src/configparser/debian/patches/write-test-files-in-tmp.patch b/src/configparser/debian/patches/write-test-files-in-tmp.patch deleted file mode 100644 index 9ee9034..0000000 --- a/src/configparser/debian/patches/write-test-files-in-tmp.patch +++ /dev/null @@ -1,30 +0,0 @@ -Description: Write test file in /tmp -Last-Update: 2023-02-10 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/tests/test.rs -+++ b/tests/test.rs -@@ -39,6 +39,7 @@ - "defaultvalues" - ); - config.setstr("DEFAULT", "defaultvalues", None); -+ std::env::set_current_dir("/tmp")?; - config.write("output.ini")?; - let map2 = config.clone().load("output.ini")?; - assert_eq!(map2, *config.get_map_ref()); -@@ -141,6 +142,7 @@ - "defaultvalues" - ); - config.setstr("default", "defaultvalues", None); -+ std::env::set_current_dir("/tmp")?; - config.write("output2.ini")?; - let map2 = config.clone().load("output2.ini")?; - assert_eq!(map2, *config.get_map_ref()); -@@ -258,6 +260,7 @@ - - let mut config = Ini::new(); - config.read(OUT_FILE_CONTENTS.to_owned())?; -+ std::env::set_current_dir("/tmp")?; - config.write("output_sync.ini")?; - - async_std::task::block_on::<_, Result<_, String>>(async { diff --git a/src/fs-err/debian/RFS b/src/fs-err/debian/RFS new file mode 100644 index 0000000..e69de29 diff --git a/src/fs-err/debian/changelog b/src/fs-err/debian/changelog new file mode 100644 index 0000000..8678ef5 --- /dev/null +++ b/src/fs-err/debian/changelog @@ -0,0 +1,6 @@ +rust-fs-err (2.9.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Package fs-err 2.9.0 from crates.io using debcargo 2.6.0 + * Patch to disable feature tokio, code uses unstable feature + + -- Blair Noctis Fri, 10 Feb 2023 18:37:44 +0000 diff --git a/src/fs-err/debian/copyright b/src/fs-err/debian/copyright new file mode 100644 index 0000000..9f890c2 --- /dev/null +++ b/src/fs-err/debian/copyright @@ -0,0 +1,37 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: fs-err +Upstream-Contact: Andrew Hickman +Source: https://github.com/andrewhickman/fs-err + +Files: * +Copyright: 2020-2022 Andrew Hickman +License: MIT or Apache-2.0 + +Files: debian/* +Copyright: + 2023 Debian Rust Maintainers + 2023 Blair Noctis +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/fs-err/debian/copyright.debcargo.hint b/src/fs-err/debian/copyright.debcargo.hint new file mode 100644 index 0000000..b20b4a4 --- /dev/null +++ b/src/fs-err/debian/copyright.debcargo.hint @@ -0,0 +1,42 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: fs-err +Upstream-Contact: Andrew Hickman +Source: https://github.com/andrewhickman/fs-err + +Files: * +Copyright: FIXME (overlay) UNKNOWN-YEARS Andrew Hickman +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: + 2023 Debian Rust Maintainers + 2023 Blair Noctis +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/fs-err/debian/debcargo.toml b/src/fs-err/debian/debcargo.toml new file mode 100644 index 0000000..c000e18 --- /dev/null +++ b/src/fs-err/debian/debcargo.toml @@ -0,0 +1,2 @@ +overlay = "." +uploaders = ["Blair Noctis "] diff --git a/src/fs-err/debian/patches/disable-tokio-unstable.patch b/src/fs-err/debian/patches/disable-tokio-unstable.patch new file mode 100644 index 0000000..19f163b --- /dev/null +++ b/src/fs-err/debian/patches/disable-tokio-unstable.patch @@ -0,0 +1,19 @@ +Description: tokio related code uses unstable feature `std::task::ready!` +Last-Update: 2023-02-10 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -46,12 +46,6 @@ + "docsrs", + ] + +-[dependencies.tokio] +-version = "1.21" +-features = ["fs"] +-optional = true +-default_features = false +- + [dev-dependencies.serde_json] + version = "1.0.64" + diff --git a/src/fs-err/debian/patches/series b/src/fs-err/debian/patches/series new file mode 100644 index 0000000..63e4a8c --- /dev/null +++ b/src/fs-err/debian/patches/series @@ -0,0 +1 @@ +disable-tokio-unstable.patch diff --git a/src/greetd-ipc/debian/changelog b/src/greetd-ipc/debian/changelog index 5290308..2eb25ff 100644 --- a/src/greetd-ipc/debian/changelog +++ b/src/greetd-ipc/debian/changelog @@ -1,8 +1,8 @@ -rust-greetd-ipc (0.9.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium +rust-greetd-ipc (0.9.0-1) unstable; urgency=medium * Package greetd_ipc 0.9.0 from crates.io using debcargo 2.6.0 - -- Marc Dequènes (Duck) Thu, 09 Feb 2023 00:41:54 +0900 + -- Marc Dequènes (Duck) Thu, 09 Feb 2023 00:47:27 +0900 rust-greetd-ipc (0.8.0-1) unstable; urgency=medium diff --git a/src/indoc/debian/RFS b/src/indoc/debian/RFS new file mode 100644 index 0000000..e69de29 diff --git a/src/indoc/debian/changelog b/src/indoc/debian/changelog index 502fbda..dd6f9e5 100644 --- a/src/indoc/debian/changelog +++ b/src/indoc/debian/changelog @@ -1,3 +1,10 @@ +rust-indoc (2.0.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Team upload. + * Package indoc 2.0.0 from crates.io using debcargo 2.6.0 + + -- Blair Noctis Fri, 10 Feb 2023 14:20:57 +0000 + rust-indoc (1.0.4-1) unstable; urgency=medium * Package indoc 1.0.4 from crates.io using debcargo 2.5.0 diff --git a/src/indoc/debian/copyright.debcargo.hint b/src/indoc/debian/copyright.debcargo.hint index 0175f89..f85bdc7 100644 --- a/src/indoc/debian/copyright.debcargo.hint +++ b/src/indoc/debian/copyright.debcargo.hint @@ -14,8 +14,8 @@ Files: debian/* Copyright: - 2022 Debian Rust Maintainers - 2022 Jelmer Vernooij + 2022-2023 Debian Rust Maintainers + 2022-2023 Jelmer Vernooij License: MIT or Apache-2.0 License: Apache-2.0 diff --git a/src/io-lifetimes/debian/RFS b/src/io-lifetimes/debian/RFS new file mode 100644 index 0000000..e69de29 diff --git a/src/io-lifetimes/debian/changelog b/src/io-lifetimes/debian/changelog index d469ec0..5e62560 100644 --- a/src/io-lifetimes/debian/changelog +++ b/src/io-lifetimes/debian/changelog @@ -1,3 +1,12 @@ +rust-io-lifetimes (1.0.5-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Team upload. + * Package io-lifetimes 1.0.5 from crates.io using debcargo 2.6.0 + * Drop no-async-std.diff, now in Debian + * Mark tests of features mio, socket2 broken + + -- Blair Noctis Fri, 10 Feb 2023 18:30:32 +0000 + rust-io-lifetimes (0.7.2-3) unstable; urgency=medium * Drop fs-err support since it's not in Debian. diff --git a/src/io-lifetimes/debian/copyright.debcargo.hint b/src/io-lifetimes/debian/copyright.debcargo.hint index 2b39e35..e83d3ad 100644 --- a/src/io-lifetimes/debian/copyright.debcargo.hint +++ b/src/io-lifetimes/debian/copyright.debcargo.hint @@ -14,8 +14,8 @@ Files: debian/* Copyright: - 2022 Debian Rust Maintainers - 2022 John Goerzen + 2022-2023 Debian Rust Maintainers + 2022-2023 John Goerzen License: Apache-2.0 WITH LLVM-exception or Apache-2.0 or MIT License: Apache-2.0 diff --git a/src/io-lifetimes/debian/debcargo.toml b/src/io-lifetimes/debian/debcargo.toml index 148535f..1ef7809 100644 --- a/src/io-lifetimes/debian/debcargo.toml +++ b/src/io-lifetimes/debian/debcargo.toml @@ -2,3 +2,11 @@ uploaders = ["John Goerzen "] collapse_features = true +[packages."lib+mio"] +# error says "the trait `From` is not implemented for `OwnedFd`" +# but it is implemented, in `src/impls_mio.rs` +test_is_broken = true + +[packages."lib+socket2"] +# same +test_is_broken = true diff --git a/src/io-lifetimes/debian/patches/drop-fs-err.diff b/src/io-lifetimes/debian/patches/drop-fs-err.diff index e73f86d..48dcc36 100644 --- a/src/io-lifetimes/debian/patches/drop-fs-err.diff +++ b/src/io-lifetimes/debian/patches/drop-fs-err.diff @@ -5,7 +5,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/Cargo.toml +++ b/Cargo.toml -@@ -27,10 +27,6 @@ +@@ -35,10 +35,6 @@ license = "Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT" repository = "https://github.com/sunfishcode/io-lifetimes" @@ -13,6 +13,6 @@ -version = "2.6.0" -optional = true - - [dependencies.mio] - version = "0.8.0" - features = [ + [features] + close = [ + "libc", diff --git a/src/io-lifetimes/debian/patches/no-async-std.diff b/src/io-lifetimes/debian/patches/no-async-std.diff deleted file mode 100644 index 44423cb..0000000 --- a/src/io-lifetimes/debian/patches/no-async-std.diff +++ /dev/null @@ -1,19 +0,0 @@ -Description: Drop async-std dep since it's not in Debian -Author: John Goerzen -Last-Update: 2022-10-27 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -27,11 +27,6 @@ - license = "Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT" - repository = "https://github.com/sunfishcode/io-lifetimes" - --[dependencies.async-std] --version = "1.9.0" --features = ["unstable"] --optional = true -- - [dependencies.fs-err] - version = "2.6.0" - optional = true diff --git a/src/io-lifetimes/debian/patches/no-windows-sys.diff b/src/io-lifetimes/debian/patches/no-windows-sys.diff index 29a636f..e6a3840 100644 --- a/src/io-lifetimes/debian/patches/no-windows-sys.diff +++ b/src/io-lifetimes/debian/patches/no-windows-sys.diff @@ -3,11 +3,9 @@ Last-Update: 2022-10-03 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: io-lifetimes/Cargo.toml -=================================================================== ---- io-lifetimes.orig/Cargo.toml -+++ io-lifetimes/Cargo.toml -@@ -61,7 +61,6 @@ optional = true +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -42,7 +42,6 @@ [features] close = [ "libc", @@ -15,12 +13,12 @@ ] default = ["close"] -@@ -73,14 +72,3 @@ optional = true +@@ -81,14 +80,3 @@ version = "0.2.96" optional = true -[target."cfg(windows)".dependencies.windows-sys] --version = "0.36.0" +-version = "0.45.0" -features = [ - "Win32_Foundation", - "Win32_Storage_FileSystem", diff --git a/src/io-lifetimes/debian/patches/series b/src/io-lifetimes/debian/patches/series index f9def54..6a0f58b 100644 --- a/src/io-lifetimes/debian/patches/series +++ b/src/io-lifetimes/debian/patches/series @@ -1,3 +1,2 @@ no-windows-sys.diff -no-async-std.diff drop-fs-err.diff diff --git a/src/lewton/debian/changelog b/src/lewton/debian/changelog index 2a5c5d2..1fd820e 100644 --- a/src/lewton/debian/changelog +++ b/src/lewton/debian/changelog @@ -1,3 +1,15 @@ +rust-lewton (0.10.2-1) unstable; urgency=medium + + * Team upload. + * Package lewton 0.10.2 from crates.io using debcargo 2.6.0 + * Patch to remove dep on alto, archived upstream, only used in example + * Patch to remove feature async_ogg thus dep on tokio-io, futures because + tokio-io was deprecated upstream + * Relax deps on ogg + * Collapse features + + -- Blair Noctis Sat, 11 Feb 2023 08:32:58 +0000 + rust-lewton (0.9.4-3) unstable; urgency=medium * Team upload. diff --git a/src/lewton/debian/copyright.debcargo.hint b/src/lewton/debian/copyright.debcargo.hint index 90d78a1..b80cd00 100644 --- a/src/lewton/debian/copyright.debcargo.hint +++ b/src/lewton/debian/copyright.debcargo.hint @@ -12,7 +12,7 @@ be correct information so you should review and fix this before uploading to the archive. -Files: ./LICENSE +Files: LICENSE Copyright: 2016 est31 and contributors 2016 est31 and contributors @@ -21,77 +21,70 @@ FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. -Files: ./lewton.h -Copyright: 2019 est31 -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/audio.rs +Files: src/audio.rs Copyright: 2016 est31 License: UNKNOWN-LICENSE; FIXME (overlay) Comment: FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. -Files: ./src/bitpacking.rs +Files: src/bitpacking.rs Copyright: 2016 est31 License: UNKNOWN-LICENSE; FIXME (overlay) Comment: FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. -Files: ./src/header.rs +Files: src/header.rs Copyright: 2016 est31 License: UNKNOWN-LICENSE; FIXME (overlay) Comment: FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. -Files: ./src/header_cached.rs +Files: src/header_cached.rs Copyright: 2016 est31 License: UNKNOWN-LICENSE; FIXME (overlay) Comment: FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. -Files: ./src/huffman_tree.rs +Files: src/huffman_tree.rs Copyright: 2016 est31 License: UNKNOWN-LICENSE; FIXME (overlay) Comment: FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. -Files: ./src/imdct.rs +Files: src/imdct.rs Copyright: 2016 est31 License: UNKNOWN-LICENSE; FIXME (overlay) Comment: FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. -Files: ./src/imdct_test.rs +Files: src/imdct_test.rs Copyright: 2016 est31 License: UNKNOWN-LICENSE; FIXME (overlay) Comment: FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. -Files: ./src/inside_ogg.rs +Files: src/inside_ogg.rs Copyright: 2016 est31 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 +Files: src/lib.rs Copyright: 2016 est31 License: UNKNOWN-LICENSE; FIXME (overlay) Comment: FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. -Files: ./src/samples.rs +Files: src/samples.rs Copyright: 2019 est31 License: UNKNOWN-LICENSE; FIXME (overlay) Comment: @@ -100,8 +93,8 @@ Files: debian/* Copyright: - 2019-2020 Debian Rust Maintainers - 2019-2020 Ximin Luo + 2019-2023 Debian Rust Maintainers + 2019-2023 Ximin Luo License: MIT or Apache-2.0 License: Apache-2.0 diff --git a/src/lewton/debian/debcargo.toml b/src/lewton/debian/debcargo.toml index fdbb775..1258aca 100644 --- a/src/lewton/debian/debcargo.toml +++ b/src/lewton/debian/debcargo.toml @@ -1,2 +1,4 @@ overlay = "." uploaders = ["Ximin Luo "] + +collapse_features = true diff --git a/src/lewton/debian/patches/bump-dep.diff b/src/lewton/debian/patches/bump-dep.diff deleted file mode 100644 index ec1ab20..0000000 --- a/src/lewton/debian/patches/bump-dep.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: lewton/Cargo.toml -=================================================================== ---- lewton.orig/Cargo.toml -+++ lewton/Cargo.toml -@@ -31,7 +31,7 @@ crate-type = ["lib", "cdylib"] - version = "1.0" - - [dependencies.smallvec] --version = "0.6" -+version = "1" - - [dependencies.ogg] - version = "0.7" diff --git a/src/lewton/debian/patches/relax-deps.patch b/src/lewton/debian/patches/relax-deps.patch new file mode 100644 index 0000000..1d0f5b5 --- /dev/null +++ b/src/lewton/debian/patches/relax-deps.patch @@ -0,0 +1,20 @@ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -43,7 +43,7 @@ + optional = true + + [dependencies.ogg] +-version = "0.8" ++version = "0.9" + optional = true + + [dependencies.tinyvec] +@@ -57,7 +57,7 @@ + version = "3" + + [dev-dependencies.ogg] +-version = "0.8" ++version = "0.9" + + [features] + async_ogg = ["ogg", "ogg/async", "futures", "tokio-io"] diff --git a/src/lewton/debian/patches/remove-dep-alto.patch b/src/lewton/debian/patches/remove-dep-alto.patch new file mode 100644 index 0000000..2834e06 --- /dev/null +++ b/src/lewton/debian/patches/remove-dep-alto.patch @@ -0,0 +1,24 @@ +Description: Remove dep on alto, which is archived upstream + (and only used in an example anyway) +Last-Update: 2023-02-10 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -32,9 +32,6 @@ + name = "perf" + required-features = ["ogg"] + +-[[example]] +-name = "player" +-required-features = ["ogg"] + [dependencies.byteorder] + version = "1.0" + +@@ -53,8 +50,6 @@ + [dependencies.tokio-io] + version = "0.1" + optional = true +-[dev-dependencies.alto] +-version = "3" + + [dev-dependencies.ogg] + version = "0.9" diff --git a/src/lewton/debian/patches/remove-feature-async-ogg.patch b/src/lewton/debian/patches/remove-feature-async-ogg.patch new file mode 100644 index 0000000..6638a6f --- /dev/null +++ b/src/lewton/debian/patches/remove-feature-async-ogg.patch @@ -0,0 +1,30 @@ +Description: Remove feature async-io, depends on deprecated tokio-io + This also removes dep on futures +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -35,10 +35,6 @@ + [dependencies.byteorder] + version = "1.0" + +-[dependencies.futures] +-version = "0.1" +-optional = true +- + [dependencies.ogg] + version = "0.9" + optional = true +@@ -47,13 +43,9 @@ + version = "1.0" + features = ["alloc"] + +-[dependencies.tokio-io] +-version = "0.1" +-optional = true +- + [dev-dependencies.ogg] + version = "0.9" + + [features] +-async_ogg = ["ogg", "ogg/async", "futures", "tokio-io"] ++#async_ogg = ["ogg", "ogg/async", "futures", "tokio-io"] + default = ["ogg"] diff --git a/src/lewton/debian/patches/series b/src/lewton/debian/patches/series index bbad2f2..4a7ed93 100644 --- a/src/lewton/debian/patches/series +++ b/src/lewton/debian/patches/series @@ -1 +1,3 @@ -bump-dep.diff +relax-deps.patch +remove-dep-alto.patch +remove-feature-async-ogg.patch diff --git a/src/libsodium-sys/debian/changelog b/src/libsodium-sys/debian/changelog index 0c7d2a0..377ab5d 100644 --- a/src/libsodium-sys/debian/changelog +++ b/src/libsodium-sys/debian/changelog @@ -1,3 +1,12 @@ +rust-libsodium-sys (0.2.7-1) unstable; urgency=medium + + * Team upload. + * Package libsodium-sys 0.2.7 from crates.io using debcargo 2.6.0 + * Patch to always use Debian packaged libsodium (Closes: #1031038) + * Add exclusion for `libsodium/` + + -- Blair Noctis Sat, 11 Feb 2023 06:56:36 +0000 + rust-libsodium-sys (0.2.5-2) unstable; urgency=medium * Team upload. diff --git a/src/libsodium-sys/debian/copyright b/src/libsodium-sys/debian/copyright index 8afbbab..0b6b2e5 100644 --- a/src/libsodium-sys/debian/copyright +++ b/src/libsodium-sys/debian/copyright @@ -5,13 +5,13 @@ Files: * Copyright: - 2015-2019 dnaq - 2015-2019 The sodiumoxide Developers + 2015-2022 dnaq + 2015-2022 The sodiumoxide Developers License: MIT or Apache-2.0 Files: debian/* Copyright: - 2019 Debian Rust Maintainers + 2019-2023 Debian Rust Maintainers 2019 kpcyrd License: MIT or Apache-2.0 diff --git a/src/libsodium-sys/debian/copyright.debcargo.hint b/src/libsodium-sys/debian/copyright.debcargo.hint index 347b3c0..591347d 100644 --- a/src/libsodium-sys/debian/copyright.debcargo.hint +++ b/src/libsodium-sys/debian/copyright.debcargo.hint @@ -12,7 +12,7 @@ be correct information so you should review and fix this before uploading to the archive. -Files: ./LICENSE-MIT +Files: LICENSE-MIT Copyright: 2015 The sodiumoxide Developers License: UNKNOWN-LICENSE; FIXME (overlay) Comment: @@ -21,8 +21,8 @@ Files: debian/* Copyright: - 2019-2020 Debian Rust Maintainers - 2019-2020 kpcyrd + 2019-2023 Debian Rust Maintainers + 2019-2023 kpcyrd License: MIT or Apache-2.0 License: Apache-2.0 diff --git a/src/libsodium-sys/debian/debcargo.toml b/src/libsodium-sys/debian/debcargo.toml index 3c1965f..e5a5b66 100644 --- a/src/libsodium-sys/debian/debcargo.toml +++ b/src/libsodium-sys/debian/debcargo.toml @@ -1,6 +1,6 @@ overlay = "." uploaders = ["kpcyrd "] -excludes = ["mingw/*", "msvc/*", "libsodium-*.tar.gz", "src/gen.sh"] +excludes = ["libsodium/*", "mingw/*", "msvc/*", "libsodium-*.tar.gz", "src/gen.sh"] [packages.lib] depends = ["libsodium-dev"] diff --git a/src/libsodium-sys/debian/patches/series b/src/libsodium-sys/debian/patches/series new file mode 100644 index 0000000..c97c219 --- /dev/null +++ b/src/libsodium-sys/debian/patches/series @@ -0,0 +1 @@ +use-packaged-libsodium.patch diff --git a/src/libsodium-sys/debian/patches/use-packaged-libsodium.patch b/src/libsodium-sys/debian/patches/use-packaged-libsodium.patch new file mode 100644 index 0000000..31c26e0 --- /dev/null +++ b/src/libsodium-sys/debian/patches/use-packaged-libsodium.patch @@ -0,0 +1,79 @@ +--- a/build.rs ++++ b/build.rs +@@ -28,11 +28,11 @@ + } + + let lib_dir_isset = env::var("SODIUM_LIB_DIR").is_ok(); +- let use_pkg_isset = if cfg!(feature = "use-pkg-config") { ++ let use_pkg_isset = /*if cfg!(feature = "use-pkg-config") {*/ + true +- } else { ++ /*} else { + env::var("SODIUM_USE_PKG_CONFIG").is_ok() +- }; ++ }*/; + let shared_isset = env::var("SODIUM_SHARED").is_ok(); + + if lib_dir_isset && use_pkg_isset { +@@ -47,7 +47,7 @@ + } + + find_libsodium_pkg(); +- } else { ++ } /*else { + if shared_isset { + println!( + "cargo:warning=SODIUM_SHARED has no effect for building libsodium from source" +@@ -55,7 +55,7 @@ + } + + build_libsodium(); +- } ++ }*/ + } + + /* Must be called when SODIUM_LIB_DIR is set to any value +@@ -134,7 +134,7 @@ + } + } + +-#[cfg(windows)] ++/*#[cfg(windows)] + fn make_libsodium(_: &str, _: &Path, _: &Path) -> PathBuf { + // We don't build anything on windows, we simply linked to precompiled + // libs. +@@ -291,14 +291,14 @@ + } + + install_dir.join("lib") +-} ++}*/ + + #[cfg(any(windows, target_env = "msvc"))] + fn get_crate_dir() -> PathBuf { + env::var("CARGO_MANIFEST_DIR").unwrap().into() + } + +-#[cfg(target_env = "msvc")] ++/*#[cfg(target_env = "msvc")] + fn is_release_profile() -> bool { + env::var("PROFILE").unwrap() == "release" + } +@@ -329,9 +329,9 @@ + #[cfg(all(windows, not(target_env = "msvc"), target_pointer_width = "64"))] + fn get_lib_dir() -> PathBuf { + get_crate_dir().join("mingw/win64/") +-} ++}*/ + +-fn build_libsodium() { ++/*fn build_libsodium() { + use std::{ffi::OsStr, fs}; + + // Determine build target triple +@@ -396,4 +396,4 @@ + + println!("cargo:include={}", include_dir.to_str().unwrap()); + println!("cargo:lib={}", lib_dir.to_str().unwrap()); +-} ++}*/ diff --git a/src/lsd/debian/RFS b/src/lsd/debian/RFS deleted file mode 100644 index e69de29..0000000 diff --git a/src/lsd/debian/changelog b/src/lsd/debian/changelog index 808681c..5163c78 100644 --- a/src/lsd/debian/changelog +++ b/src/lsd/debian/changelog @@ -1,9 +1,9 @@ -rust-lsd (0.23.1-3) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium +rust-lsd (0.23.1-3) unstable; urgency=medium * Package lsd 0.23.1 from crates.io using debcargo 2.6.0 * Add shell completion files for bash, fish and zsh (Closes: #1028645) - -- Alexander Kjäll Sat, 21 Jan 2023 15:57:24 +0100 + -- Alexander Kjäll Fri, 27 Jan 2023 09:57:30 +0100 rust-lsd (0.23.1-2) unstable; urgency=medium diff --git a/src/mio/debian/RFS b/src/mio/debian/RFS new file mode 100644 index 0000000..e69de29 diff --git a/src/mio/debian/changelog b/src/mio/debian/changelog index 9d68d9e..aad7673 100644 --- a/src/mio/debian/changelog +++ b/src/mio/debian/changelog @@ -1,3 +1,10 @@ +rust-mio (0.8.5-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Team upload. + * Package mio 0.8.5 from crates.io using debcargo 2.6.0 + + -- Blair Noctis Fri, 10 Feb 2023 17:59:46 +0000 + rust-mio (0.8.4-1) unstable; urgency=medium * Team upload. diff --git a/src/mio/debian/copyright.debcargo.hint b/src/mio/debian/copyright.debcargo.hint index 94b73d4..537eae9 100644 --- a/src/mio/debian/copyright.debcargo.hint +++ b/src/mio/debian/copyright.debcargo.hint @@ -18,7 +18,7 @@ be correct information so you should review and fix this before uploading to the archive. -Files: ./LICENSE +Files: LICENSE Copyright: 2014 Carl Lerche and other MIO contributors License: UNKNOWN-LICENSE; FIXME (overlay) Comment: @@ -27,8 +27,8 @@ Files: debian/* Copyright: - 2018-2022 Debian Rust Maintainers - 2018-2022 kpcyrd + 2018-2023 Debian Rust Maintainers + 2018-2023 kpcyrd License: MIT License: MIT diff --git a/src/mio/debian/patches/relax-deps.diff b/src/mio/debian/patches/relax-deps.diff index aeb8b04..344cf63 100644 --- a/src/mio/debian/patches/relax-deps.diff +++ b/src/mio/debian/patches/relax-deps.diff @@ -1,6 +1,6 @@ --- a/Cargo.toml +++ b/Cargo.toml -@@ -89,7 +89,7 @@ required-features = [ +@@ -90,7 +90,7 @@ version = "0.4.8" [dev-dependencies.env_logger] diff --git a/src/mio/debian/patches/remove-non-linux-deps.diff b/src/mio/debian/patches/remove-non-linux-deps.diff index 2471789..3655ab1 100644 --- a/src/mio/debian/patches/remove-non-linux-deps.diff +++ b/src/mio/debian/patches/remove-non-linux-deps.diff @@ -1,6 +1,6 @@ --- a/Cargo.toml +++ b/Cargo.toml -@@ -100,26 +100,8 @@ default = [] +@@ -101,26 +101,8 @@ net = [] os-ext = [ "os-poll", @@ -19,11 +19,11 @@ version = "0.2.121" - -[target."cfg(windows)".dependencies.windows-sys] --version = "0.36" +-version = "0.42" -features = [ -- "Win32_Storage_FileSystem", - "Win32_Foundation", - "Win32_Networking_WinSock", +- "Win32_Storage_FileSystem", - "Win32_System_IO", - "Win32_System_WindowsProgramming", -] diff --git a/src/ogg/debian/changelog b/src/ogg/debian/changelog index 0cf3f63..1407002 100644 --- a/src/ogg/debian/changelog +++ b/src/ogg/debian/changelog @@ -1,3 +1,12 @@ +rust-ogg (0.9.0-1) unstable; urgency=medium + + * Team upload. + * Package ogg 0.9.0 from crates.io using debcargo 2.6.0 (Closes: #1031015) + * Relax dep on tokio-util to packaged higher 0.7 + * Collapse features + + -- Blair Noctis Fri, 10 Feb 2023 23:46:12 +0000 + rust-ogg (0.7.0-1) unstable; urgency=medium * Package ogg 0.7.0 from crates.io using debcargo 2.4.0 diff --git a/src/ogg/debian/copyright b/src/ogg/debian/copyright index 80d821e..6ed154a 100644 --- a/src/ogg/debian/copyright +++ b/src/ogg/debian/copyright @@ -5,13 +5,13 @@ Files: * Copyright: - 2016-2018 est31 and contributors + 2016-2022 est31 and contributors 2002-2015 Xiph.org Foundation License: BSD-3-Clause Files: debian/* Copyright: - 2019 Debian Rust Maintainers + 2019-2023 Debian Rust Maintainers 2019 Ximin Luo License: BSD-3-Clause diff --git a/src/ogg/debian/copyright.debcargo.hint b/src/ogg/debian/copyright.debcargo.hint index 99fc49f..38ac1fa 100644 --- a/src/ogg/debian/copyright.debcargo.hint +++ b/src/ogg/debian/copyright.debcargo.hint @@ -12,7 +12,7 @@ be correct information so you should review and fix this before uploading to the archive. -Files: ./LICENSE +Files: LICENSE Copyright: 2016-2017 est31 and contributors 2002-2015 Xiph.org Foundation @@ -21,70 +21,63 @@ FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. -Files: ./examples/crc32-table-generate.rs +Files: examples/dump-all.rs +Copyright: 2018 est31 +License: UNKNOWN-LICENSE; FIXME (overlay) +Comment: + FIXME (overlay): These notices are extracted from files. Please review them + before uploading to the archive. + +Files: examples/format-info.rs Copyright: 2016 est31 License: UNKNOWN-LICENSE; FIXME (overlay) Comment: FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. -Files: ./examples/dump-all.rs +Files: examples/repack.rs Copyright: 2018 est31 License: UNKNOWN-LICENSE; FIXME (overlay) Comment: FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. -Files: ./examples/format-info.rs +Files: src/crc.rs +Copyright: 2016-2017 est31 +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: 2016 est31 License: UNKNOWN-LICENSE; FIXME (overlay) Comment: FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. -Files: ./examples/repack.rs -Copyright: 2018 est31 -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/crc.rs +Files: src/reading.rs Copyright: 2016-2017 est31 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: 2016 est31 -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./src/reading.rs +Files: src/test.rs Copyright: 2016-2017 est31 License: UNKNOWN-LICENSE; FIXME (overlay) Comment: FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. -Files: ./src/test.rs +Files: src/writing.rs Copyright: 2016-2017 est31 License: UNKNOWN-LICENSE; FIXME (overlay) Comment: FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. -Files: ./src/writing.rs -Copyright: 2016-2017 est31 -License: UNKNOWN-LICENSE; FIXME (overlay) -Comment: - FIXME (overlay): These notices are extracted from files. Please review them - before uploading to the archive. - -Files: ./tests/async_read.rs +Files: tests/async_read.rs Copyright: 2016 est31 License: UNKNOWN-LICENSE; FIXME (overlay) Comment: @@ -93,8 +86,8 @@ Files: debian/* Copyright: - 2019 Debian Rust Maintainers - 2019 Ximin Luo + 2019-2023 Debian Rust Maintainers + 2019-2023 Ximin Luo License: BSD-3-Clause License: BSD-3-Clause diff --git a/src/ogg/debian/debcargo.toml b/src/ogg/debian/debcargo.toml index fdbb775..1258aca 100644 --- a/src/ogg/debian/debcargo.toml +++ b/src/ogg/debian/debcargo.toml @@ -1,2 +1,4 @@ overlay = "." uploaders = ["Ximin Luo "] + +collapse_features = true diff --git a/src/ogg/debian/patches/relax-deps.patch b/src/ogg/debian/patches/relax-deps.patch new file mode 100644 index 0000000..0f0a657 --- /dev/null +++ b/src/ogg/debian/patches/relax-deps.patch @@ -0,0 +1,11 @@ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -62,7 +62,7 @@ + optional = true + + [dependencies.tokio-util] +-version = "0.6" ++version = "0.7" + features = [ + "codec", + "compat", diff --git a/src/ogg/debian/patches/series b/src/ogg/debian/patches/series new file mode 100644 index 0000000..bdddf05 --- /dev/null +++ b/src/ogg/debian/patches/series @@ -0,0 +1 @@ +relax-deps.patch diff --git a/src/os-pipe/debian/RFS b/src/os-pipe/debian/RFS new file mode 100644 index 0000000..e69de29 diff --git a/src/os-pipe/debian/changelog b/src/os-pipe/debian/changelog index d4a83b7..085d94f 100644 --- a/src/os-pipe/debian/changelog +++ b/src/os-pipe/debian/changelog @@ -1,3 +1,14 @@ +rust-os-pipe (1.1.3-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Team upload. + * Package os_pipe 1.1.3 from crates.io using debcargo 2.6.0 + * Patch out a test requiring compiled test binary + * Patch out Windows deps + * Drop remove-unstable-io-safety.patch, tests fine + * Refresh patches + + -- Blair Noctis Fri, 10 Feb 2023 17:43:11 +0000 + rust-os-pipe (1.1.1-1) unstable; urgency=medium * Team upload. diff --git a/src/os-pipe/debian/copyright.debcargo.hint b/src/os-pipe/debian/copyright.debcargo.hint index 047c328..b094fa7 100644 --- a/src/os-pipe/debian/copyright.debcargo.hint +++ b/src/os-pipe/debian/copyright.debcargo.hint @@ -14,9 +14,9 @@ Files: debian/* Copyright: - 2018-2022 Debian Rust Maintainers - 2018-2022 Paride Legovini - 2018-2022 Wolfgang Silbermayr + 2018-2023 Debian Rust Maintainers + 2018-2023 Paride Legovini + 2018-2023 Wolfgang Silbermayr License: MIT License: MIT diff --git a/src/os-pipe/debian/patches/delete-broken-tests.patch b/src/os-pipe/debian/patches/delete-broken-tests.patch index e132b85..2e6f708 100644 --- a/src/os-pipe/debian/patches/delete-broken-tests.patch +++ b/src/os-pipe/debian/patches/delete-broken-tests.patch @@ -1,92 +1,11 @@ -diff --git a/src/lib.rs b/src/lib.rs -index 8929fae..ac80a53 100644 --- a/src/lib.rs +++ b/src/lib.rs -@@ -381,87 +381,6 @@ mod tests { +@@ -381,7 +381,7 @@ assert_eq!(out, data); } - #[test] -- fn test_pipes_are_not_inheritable() { -- // Create pipes for a child process. -- let (input_reader, mut input_writer) = crate::pipe().unwrap(); -- let (mut output_reader, output_writer) = crate::pipe().unwrap(); -- -- // Create a bunch of duplicated copies, which we'll close later. This -- // tests that duplication preserves non-inheritability. -- let ir_dup = input_reader.try_clone().unwrap(); -- let iw_dup = input_writer.try_clone().unwrap(); -- let or_dup = output_reader.try_clone().unwrap(); -- let ow_dup = output_writer.try_clone().unwrap(); -- -- // Spawn the child. Note that this temporary Command object takes -- // ownership of our copies of the child's stdin and stdout, and then -- // closes them immediately when it drops. That stops us from blocking -- // our own read below. We use our own simple implementation of cat for -- // compatibility with Windows. -- let mut child = Command::new(path_to_exe("cat")) -- .stdin(input_reader) -- .stdout(output_writer) -- .spawn() -- .unwrap(); -- -- // Drop all the dups now that the child is spawned. -- drop(ir_dup); -- drop(iw_dup); -- drop(or_dup); -- drop(ow_dup); -- -- // Write to the child's stdin. This is a small write, so it shouldn't -- // block. -- input_writer.write_all(b"hello").unwrap(); -- drop(input_writer); -- -- // Read from the child's stdout. If this child has accidentally -- // inherited the write end of its own stdin, then it will never exit, -- // and this read will block forever. That's what this test is all -- // about. -- let mut output = Vec::new(); -- output_reader.read_to_end(&mut output).unwrap(); -- child.wait().unwrap(); -- -- // Confirm that we got the right bytes. -- assert_eq!(b"hello", &*output); -- } -- -- #[test] -- fn test_parent_handles() { -- // This test invokes the `swap` test program, which uses parent_stdout() and -- // parent_stderr() to swap the outputs for another child that it spawns. -- -- // Create pipes for a child process. -- let (reader, mut writer) = crate::pipe().unwrap(); -- -- // Write input. This shouldn't block because it's small. Then close the write end, or else -- // the child will hang. -- writer.write_all(b"quack").unwrap(); -- drop(writer); -- -- // Use `swap` to run `cat_both`. `cat_both will read "quack" from stdin -- // and write it to stdout and stderr with different tags. But because we -- // run it inside `swap`, the tags in the output should be backwards. -- let output = Command::new(path_to_exe("swap")) -- .arg(path_to_exe("cat_both")) -- .stdin(reader) -- .output() -- .unwrap(); -- -- // Check for a clean exit. -- assert!( -- output.status.success(), -- "child process returned {:#?}", -- output -- ); -- -- // Confirm that we got the right bytes. -- assert_eq!(b"stderr: quack", &*output.stdout); -- assert_eq!(b"stdout: quack", &*output.stderr); -- } -- - #[test] - fn test_parent_handles_dont_close() { - // Open and close each parent pipe multiple times. If this closes the ++ //#[test] + fn test_pipes_are_not_inheritable() { + // Create pipes for a child process. + let (input_reader, mut input_writer) = crate::pipe().unwrap(); diff --git a/src/os-pipe/debian/patches/disable-test-requiring-bin.patch b/src/os-pipe/debian/patches/disable-test-requiring-bin.patch new file mode 100644 index 0000000..b86031e --- /dev/null +++ b/src/os-pipe/debian/patches/disable-test-requiring-bin.patch @@ -0,0 +1,15 @@ +Description: Disable a test requiring compiled test binaries +Last-Update: 2023-02-10 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/lib.rs ++++ b/src/lib.rs +@@ -428,7 +428,7 @@ + assert_eq!(b"hello", &*output); + } + +- #[test] ++ //#[test] + fn test_parent_handles() { + // This test invokes the `swap` test program, which uses parent_stdout() and + // parent_stderr() to swap the outputs for another child that it spawns. diff --git a/src/os-pipe/debian/patches/remove-unstable-io-safety.patch b/src/os-pipe/debian/patches/remove-unstable-io-safety.patch deleted file mode 100644 index d5debb2..0000000 --- a/src/os-pipe/debian/patches/remove-unstable-io-safety.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/Cargo.toml b/Cargo.toml -index ccab0d9..6056323 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -26,9 +26,6 @@ keywords = [ - license = "MIT" - repository = "https://github.com/oconnor663/os_pipe.rs" - --[package.metadata.docs.rs] --features = ["io_safety"] -- - [features] - io_safety = [] - -diff --git a/src/unix.rs b/src/unix.rs -index f01f3ee..c66f2c2 100644 ---- a/src/unix.rs -+++ b/src/unix.rs -@@ -90,45 +90,3 @@ impl FromRawFd for PipeWriter { - PipeWriter(File::from_raw_fd(fd)) - } - } -- --#[cfg(feature = "io_safety")] --impl From for OwnedFd { -- fn from(pr: PipeReader) -> Self { -- pr.0.into() -- } --} -- --#[cfg(feature = "io_safety")] --impl AsFd for PipeReader { -- fn as_fd(&self) -> BorrowedFd<'_> { -- self.0.as_fd() -- } --} -- --#[cfg(feature = "io_safety")] --impl From for PipeReader { -- fn from(fd: OwnedFd) -> Self { -- PipeReader(fd.into()) -- } --} -- --#[cfg(feature = "io_safety")] --impl From for OwnedFd { -- fn from(pw: PipeWriter) -> Self { -- pw.0.into() -- } --} -- --#[cfg(feature = "io_safety")] --impl AsFd for PipeWriter { -- fn as_fd(&self) -> BorrowedFd<'_> { -- self.0.as_fd() -- } --} -- --#[cfg(feature = "io_safety")] --impl From for PipeWriter { -- fn from(fd: OwnedFd) -> Self { -- PipeWriter(fd.into()) -- } --} diff --git a/src/os-pipe/debian/patches/remove-windows-deps.patch b/src/os-pipe/debian/patches/remove-windows-deps.patch new file mode 100644 index 0000000..1620cd8 --- /dev/null +++ b/src/os-pipe/debian/patches/remove-windows-deps.patch @@ -0,0 +1,15 @@ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -34,12 +34,3 @@ + + [target."cfg(not(windows))".dependencies.libc] + version = "0.2.62" +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.45.0" +-features = [ +- "Win32_Foundation", +- "Win32_System_Pipes", +- "Win32_Security", +- "Win32_System_Threading", +-] diff --git a/src/os-pipe/debian/patches/series b/src/os-pipe/debian/patches/series index 7b15436..121f124 100644 --- a/src/os-pipe/debian/patches/series +++ b/src/os-pipe/debian/patches/series @@ -1,3 +1,4 @@ +remove-windows-deps.patch delete-broken-tests.patch python-is-python3.patch -remove-unstable-io-safety.patch +disable-test-requiring-bin.patch diff --git a/src/pathsearch/debian/changelog b/src/pathsearch/debian/changelog index 699b436..8abec70 100644 --- a/src/pathsearch/debian/changelog +++ b/src/pathsearch/debian/changelog @@ -3,4 +3,4 @@ * Team upload. * Package pathsearch 0.2.0 from crates.io using debcargo 2.6.0 - -- Igor Petruk Mon, 09 Jan 2023 21:47:01 +0100 + -- Igor Petruk Tue, 10 Jan 2023 15:08:26 +0100 diff --git a/src/proc-macro-error/debian/RFS b/src/proc-macro-error/debian/RFS new file mode 100644 index 0000000..e69de29 diff --git a/src/proc-macro-error/debian/changelog b/src/proc-macro-error/debian/changelog index 3dd5eb9..0e11c65 100644 --- a/src/proc-macro-error/debian/changelog +++ b/src/proc-macro-error/debian/changelog @@ -1,3 +1,13 @@ +rust-proc-macro-error (1.0.4-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Team upload. + * Package proc-macro-error 1.0.4 from crates.io using debcargo 2.6.0 + * Patch to disable tests requiring unavailable test crate + * Relax fixed deps + * Collapse features + + -- Blair Noctis Fri, 10 Feb 2023 17:08:03 +0000 + rust-proc-macro-error (1.0.3-1) unstable; urgency=medium * Team upload. diff --git a/src/proc-macro-error/debian/copyright.debcargo.hint b/src/proc-macro-error/debian/copyright.debcargo.hint index c9303a5..3db2ff9 100644 --- a/src/proc-macro-error/debian/copyright.debcargo.hint +++ b/src/proc-macro-error/debian/copyright.debcargo.hint @@ -12,14 +12,14 @@ be correct information so you should review and fix this before uploading to the archive. -Files: ./LICENSE-APACHE +Files: LICENSE-APACHE Copyright: 2019-2020 CreepySkeleton 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 +Files: LICENSE-MIT Copyright: 2019-2020 CreepySkeleton License: UNKNOWN-LICENSE; FIXME (overlay) Comment: @@ -28,8 +28,8 @@ Files: debian/* Copyright: - 2019-2020 Debian Rust Maintainers - 2019-2020 kpcyrd + 2019-2023 Debian Rust Maintainers + 2019-2023 kpcyrd License: MIT or Apache-2.0 License: Apache-2.0 diff --git a/src/proc-macro-error/debian/debcargo.toml b/src/proc-macro-error/debian/debcargo.toml index 8f1f3c1..5b45677 100644 --- a/src/proc-macro-error/debian/debcargo.toml +++ b/src/proc-macro-error/debian/debcargo.toml @@ -1,2 +1,4 @@ overlay = "." uploaders = ["kpcyrd "] + +collapse_features = true diff --git a/src/proc-macro-error/debian/patches/disable-test-crate-tests.patch b/src/proc-macro-error/debian/patches/disable-test-crate-tests.patch new file mode 100644 index 0000000..c32f5c0 --- /dev/null +++ b/src/proc-macro-error/debian/patches/disable-test-crate-tests.patch @@ -0,0 +1,29 @@ +Description: Disable tests requiring unavailable test crate +Last-Update: 2023-02-10 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/tests/ok.rs ++++ b/tests/ok.rs +@@ -1,4 +1,4 @@ +-extern crate test_crate; ++/*extern crate test_crate; + + use test_crate::*; + +@@ -7,4 +7,4 @@ + #[test] + fn check_it_works() { + it_works(); +-} ++}*/ +--- a/tests/macro-errors.rs ++++ b/tests/macro-errors.rs +@@ -1,7 +1,7 @@ + extern crate trybuild; + + #[cfg_attr(skip_ui_tests, ignore)] +-#[test] ++//#[test] + fn ui() { + let t = trybuild::TestCases::new(); + t.compile_fail("tests/ui/*.rs"); diff --git a/src/proc-macro-error/debian/patches/relax-deps.patch b/src/proc-macro-error/debian/patches/relax-deps.patch new file mode 100644 index 0000000..1bff1b6 --- /dev/null +++ b/src/proc-macro-error/debian/patches/relax-deps.patch @@ -0,0 +1,15 @@ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -38,10 +38,10 @@ + optional = true + default-features = false + [dev-dependencies.serde_derive] +-version = "=1.0.107" ++version = "1.0.147" + + [dev-dependencies.toml] +-version = "=0.5.2" ++version = "0.5.2" + + [dev-dependencies.trybuild] + version = "1.0.19" diff --git a/src/proc-macro-error/debian/patches/series b/src/proc-macro-error/debian/patches/series new file mode 100644 index 0000000..e7f2da1 --- /dev/null +++ b/src/proc-macro-error/debian/patches/series @@ -0,0 +1,2 @@ +relax-deps.patch +disable-test-crate-tests.patch diff --git a/src/proc-macro-error-attr/debian/RFS b/src/proc-macro-error-attr/debian/RFS new file mode 100644 index 0000000..e69de29 diff --git a/src/proc-macro-error-attr/debian/changelog b/src/proc-macro-error-attr/debian/changelog index b62c396..3775b41 100644 --- a/src/proc-macro-error-attr/debian/changelog +++ b/src/proc-macro-error-attr/debian/changelog @@ -1,3 +1,10 @@ +rust-proc-macro-error-attr (1.0.4-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Team upload. + * Package proc-macro-error-attr 1.0.4 from crates.io using debcargo 2.6.0 + + -- Blair Noctis Wed, 01 Feb 2023 19:31:54 +0000 + rust-proc-macro-error-attr (1.0.3-1) unstable; urgency=medium * Package proc-macro-error-attr 1.0.3 from crates.io using debcargo 2.4.2 diff --git a/src/proc-macro-error-attr/debian/copyright.debcargo.hint b/src/proc-macro-error-attr/debian/copyright.debcargo.hint index 08c5ad7..c0f25e3 100644 --- a/src/proc-macro-error-attr/debian/copyright.debcargo.hint +++ b/src/proc-macro-error-attr/debian/copyright.debcargo.hint @@ -12,14 +12,14 @@ be correct information so you should review and fix this before uploading to the archive. -Files: ./LICENSE-APACHE +Files: LICENSE-APACHE Copyright: 2019-2020 CreepySkeleton 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 +Files: LICENSE-MIT Copyright: 2019-2020 CreepySkeleton License: UNKNOWN-LICENSE; FIXME (overlay) Comment: @@ -28,8 +28,8 @@ Files: debian/* Copyright: - 2020 Debian Rust Maintainers - 2020 Daniel Kahn Gillmor + 2020-2023 Debian Rust Maintainers + 2020-2023 Daniel Kahn Gillmor License: MIT or Apache-2.0 License: Apache-2.0 diff --git a/src/quinn-proto/debian/changelog b/src/quinn-proto/debian/changelog index af7e861..9148387 100644 --- a/src/quinn-proto/debian/changelog +++ b/src/quinn-proto/debian/changelog @@ -1,9 +1,9 @@ -rust-quinn-proto (0.9.2-2) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium +rust-quinn-proto (0.9.2-2) unstable; urgency=medium * Package quinn-proto 0.9.2 from crates.io using debcargo 2.6.0 * Include patch to fix autopkgtest on i386 (Closes: #1030838) - -- Matthias Geiger Wed, 08 Feb 2023 13:50:33 +0100 + -- Matthias Geiger Wed, 08 Feb 2023 13:53:26 +0100 rust-quinn-proto (0.9.2-1) unstable; urgency=medium diff --git a/src/r2d2/debian/changelog b/src/r2d2/debian/changelog index 1935f4a..ba4f9a1 100644 --- a/src/r2d2/debian/changelog +++ b/src/r2d2/debian/changelog @@ -1,3 +1,18 @@ +rust-r2d2 (0.8.10-5) unstable; urgency=medium + + * Team upload. + * Package r2d2 0.8.10 from crates.io using debcargo 2.6.0 + * Add mipsel to the list of architectures on which to skip idle_timeout. + + -- Peter Michael Green Sat, 11 Feb 2023 06:00:09 +0000 + +rust-r2d2 (0.8.10-4) unstable; urgency=medium + + * Package r2d2 0.8.10 from crates.io using debcargo 2.6.0 + * Fix test properly on affected arches + + -- Matthias Geiger Sat, 11 Feb 2023 00:44:13 +0100 + rust-r2d2 (0.8.10-3) unstable; urgency=medium * Package r2d2 0.8.10 from crates.io using debcargo 2.6.0 diff --git a/src/r2d2/debian/patches/skip-idle-timeout.diff b/src/r2d2/debian/patches/skip-idle-timeout.diff index f4819fb..e5513c5 100644 --- a/src/r2d2/debian/patches/skip-idle-timeout.diff +++ b/src/r2d2/debian/patches/skip-idle-timeout.diff @@ -4,7 +4,7 @@ } #[test] -+#[cfg(not(target_arch = "x86", "arm", "powerpc64"))] ++#[cfg(not(any(target_arch = "x32", target_arch = "arm", target_arch = "powerpc64", target_arch = "mips")))] fn test_idle_timeout() { static DROPPED: AtomicUsize = AtomicUsize::new(0); diff --git a/src/ripasso-cursive/debian/changelog b/src/ripasso-cursive/debian/changelog index 179670b..30a76d7 100644 --- a/src/ripasso-cursive/debian/changelog +++ b/src/ripasso-cursive/debian/changelog @@ -1,3 +1,11 @@ +rust-ripasso-cursive (0.6.1-2) unstable; urgency=medium + + * Package ripasso-cursive 0.6.1 from crates.io using debcargo 2.6.0 + * Add translation files from upstream + * Fix the new user wizard + + -- Alexander Kjäll Sat, 11 Feb 2023 09:01:46 +0000 + rust-ripasso-cursive (0.6.1-1) unstable; urgency=medium * Package ripasso-cursive 0.6.1 from crates.io using debcargo 2.6.0 diff --git a/src/ripasso-cursive/debian/patches/fix-translation-generation.patch b/src/ripasso-cursive/debian/patches/fix-translation-generation.patch new file mode 100644 index 0000000..30e51a5 --- /dev/null +++ b/src/ripasso-cursive/debian/patches/fix-translation-generation.patch @@ -0,0 +1,12 @@ +diff --git a/build.rs b/build.rs +index eb3e307..dbde16e 100644 +--- a/build.rs ++++ b/build.rs +@@ -116,7 +116,6 @@ fn generate_translation_files() { + dir.pop(); + dir.pop(); + dir.pop(); +- dir.push("cursive"); + dir.push("res"); + + let translation_path_glob = dir.join("**/*.po"); diff --git a/src/ripasso-cursive/debian/patches/series b/src/ripasso-cursive/debian/patches/series index bdddf05..9746a7f 100644 --- a/src/ripasso-cursive/debian/patches/series +++ b/src/ripasso-cursive/debian/patches/series @@ -1 +1,4 @@ relax-deps.patch +unbreak-new-user-wizard.patch +fix-translation-generation.patch +translation-locations.patch diff --git a/src/ripasso-cursive/debian/patches/translation-locations.patch b/src/ripasso-cursive/debian/patches/translation-locations.patch new file mode 100644 index 0000000..50d9efc --- /dev/null +++ b/src/ripasso-cursive/debian/patches/translation-locations.patch @@ -0,0 +1,34 @@ +diff --git a/src/main.rs b/src/main.rs +index a2693b7..787eb36 100644 +--- a/src/main.rs ++++ b/src/main.rs +@@ -1073,7 +1073,7 @@ fn do_delete_last_word(ui: &mut Cursive, store: PasswordStoreType) { + fn get_translation_catalog() -> gettext::Catalog { + let locale = locale_config::Locale::current(); + +- let mut translation_locations = vec!["/usr/share/ripasso"]; ++ let mut translation_locations = vec![]; + if let Some(path) = option_env!("TRANSLATION_INPUT_PATH") { + translation_locations.insert(0, path); + } +@@ -1097,6 +1097,20 @@ fn get_translation_catalog() -> gettext::Catalog { + } + } + ++ for preferred in locale.tags_for("messages") { ++ let langid_res: std::result::Result = ++ format!("{preferred}").parse(); ++ ++ if let Ok(langid) = langid_res { ++ let file = std::fs::File::open(format!("/usr/share/locale/{}/LC_MESSAGES/ripasso-cursive.mo", langid.language)); ++ if let Ok(file) = file { ++ if let Ok(catalog) = gettext::Catalog::parse(file) { ++ return catalog; ++ } ++ } ++ } ++ } ++ + gettext::Catalog::empty() + } + diff --git a/src/ripasso-cursive/debian/patches/unbreak-new-user-wizard.patch b/src/ripasso-cursive/debian/patches/unbreak-new-user-wizard.patch new file mode 100644 index 0000000..e62562b --- /dev/null +++ b/src/ripasso-cursive/debian/patches/unbreak-new-user-wizard.patch @@ -0,0 +1,90 @@ +diff --git a/src/main.rs b/src/main.rs +index 9354d59..a2693b7 100644 +--- a/src/main.rs ++++ b/src/main.rs +@@ -1169,6 +1169,19 @@ fn get_stores(config: &config::Config, home: &Option) -> Result) -> Result Vec { ++fn validate_stores_config(settings: &config::Config, home: &Option) -> Vec { + let mut incomplete_stores: Vec = vec![]; + + let stores_res = settings.get("stores"); +@@ -1202,6 +1215,8 @@ fn validate_stores_config(settings: &config::Config) -> Vec { + } + } + } ++ } else if incomplete_stores.len() == 0 && home.is_some() { ++ incomplete_stores.push(home.clone().unwrap().join(".password_store")); + } + + incomplete_stores +@@ -1758,7 +1773,7 @@ fn main() { + let password_store_signing_key = std::env::var("PASSWORD_STORE_SIGNING_KEY").ok(); + let xdg_config_home = match std::env::var("XDG_CONFIG_HOME") { + Err(_) => None, +- Ok(home_path) => Some(PathBuf::from(home_path)), ++ Ok(config_home_path) => Some(PathBuf::from(config_home_path)), + }; + + pass::read_config( +@@ -1774,7 +1789,7 @@ fn main() { + } + let (config, config_file_location) = config_res.unwrap(); + +- for path in validate_stores_config(&config) { ++ for path in validate_stores_config(&config, &home) { + wizard::show_init_menu(&Some(path), &home); + } + +@@ -1783,7 +1798,8 @@ fn main() { + eprintln!("Error {}", err); + process::exit(1); + } +- let stores: StoreListType = Arc::new(Mutex::new( ++ ++let stores: StoreListType = Arc::new(Mutex::new( + stores + .unwrap() + .into_iter() +@@ -1791,6 +1807,19 @@ fn main() { + .collect(), + )); + ++ if !config_file_location.exists() && stores.lock().unwrap().len() == 1 { ++ let mut config_file_dir = config_file_location.clone(); ++ config_file_dir.pop(); ++ if let Err(err) = std::fs::create_dir_all(config_file_dir) { ++ eprintln!("Error {err}"); ++ process::exit(1); ++ } ++ if let Err(err) = pass::save_config(stores.clone(), &config_file_location) { ++ eprintln!("Error {err}"); ++ process::exit(1); ++ } ++ } ++ + let store: PasswordStoreType = Arc::new(Mutex::new(stores.lock().unwrap()[0].clone())); + #[allow(clippy::significant_drop_in_scrutinee)] + for ss in stores.lock().unwrap().iter() { diff --git a/src/ripasso-cursive/debian/rules b/src/ripasso-cursive/debian/rules new file mode 100644 index 0000000..c313c06 --- /dev/null +++ b/src/ripasso-cursive/debian/rules @@ -0,0 +1,22 @@ +#!/usr/bin/make -f + +include /usr/share/dpkg/pkg-info.mk + +%: + dh $@ --buildsystem cargo + +override_dh_install: + mkdir -p debian/ripasso-cursive/usr/share/locale/de/LC_MESSAGES/ + mkdir -p debian/ripasso-cursive/usr/share/locale/fr/LC_MESSAGES/ + mkdir -p debian/ripasso-cursive/usr/share/locale/it/LC_MESSAGES/ + mkdir -p debian/ripasso-cursive/usr/share/locale/nb/LC_MESSAGES/ + mkdir -p debian/ripasso-cursive/usr/share/locale/nn/LC_MESSAGES/ + mkdir -p debian/ripasso-cursive/usr/share/locale/sv/LC_MESSAGES/ + cp -f target/translations/cursive/de.mo debian/ripasso-cursive/usr/share/locale/de/LC_MESSAGES/ripasso-cursive.mo + cp -f target/translations/cursive/fr.mo debian/ripasso-cursive/usr/share/locale/fr/LC_MESSAGES/ripasso-cursive.mo + cp -f target/translations/cursive/it.mo debian/ripasso-cursive/usr/share/locale/it/LC_MESSAGES/ripasso-cursive.mo + cp -f target/translations/cursive/nb.mo debian/ripasso-cursive/usr/share/locale/nb/LC_MESSAGES/ripasso-cursive.mo + cp -f target/translations/cursive/nn.mo debian/ripasso-cursive/usr/share/locale/nn/LC_MESSAGES/ripasso-cursive.mo + cp -f target/translations/cursive/sv.mo debian/ripasso-cursive/usr/share/locale/sv/LC_MESSAGES/ripasso-cursive.mo + dh_install + diff --git a/src/ripasso-cursive/debian/rules.debcargo.hint b/src/ripasso-cursive/debian/rules.debcargo.hint new file mode 100755 index 0000000..044c1c2 --- /dev/null +++ b/src/ripasso-cursive/debian/rules.debcargo.hint @@ -0,0 +1,3 @@ +#!/usr/bin/make -f +%: + dh $@ --buildsystem cargo diff --git a/src/rmp-serde/debian/RFS b/src/rmp-serde/debian/RFS deleted file mode 100644 index e69de29..0000000 diff --git a/src/rmp-serde/debian/changelog b/src/rmp-serde/debian/changelog index 15a7a8d..1d97665 100644 --- a/src/rmp-serde/debian/changelog +++ b/src/rmp-serde/debian/changelog @@ -1,8 +1,8 @@ -rust-rmp-serde (1.1.1-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium +rust-rmp-serde (1.1.1-1) unstable; urgency=medium * Package rmp-serde 1.1.1 from crates.io using debcargo 2.5.0 - -- Blair Noctis Tue, 08 Nov 2022 14:36:45 +0000 + -- Blair Noctis Fri, 10 Feb 2023 20:32:43 -0500 rust-rmp-serde (1.1.0-1) unstable; urgency=medium diff --git a/src/rmp-serde/debian/copyright b/src/rmp-serde/debian/copyright index 8ae36ec..2e68d3a 100644 --- a/src/rmp-serde/debian/copyright +++ b/src/rmp-serde/debian/copyright @@ -9,8 +9,8 @@ Files: debian/* Copyright: - 2022 Debian Rust Maintainers - 2022 Blair Noctis + 2022-2023 Debian Rust Maintainers + 2022-2023 Blair Noctis License: MIT License: MIT diff --git a/src/rmp-serde/debian/copyright.debcargo.hint b/src/rmp-serde/debian/copyright.debcargo.hint index b1a0a71..39bfb96 100644 --- a/src/rmp-serde/debian/copyright.debcargo.hint +++ b/src/rmp-serde/debian/copyright.debcargo.hint @@ -12,7 +12,7 @@ be correct information so you should review and fix this before uploading to the archive. -Files: ./LICENSE +Files: LICENSE Copyright: 2017 Evgeny Safronov License: UNKNOWN-LICENSE; FIXME (overlay) Comment: @@ -21,8 +21,8 @@ Files: debian/* Copyright: - 2022 Debian Rust Maintainers - 2022 Blair Noctis + 2022-2023 Debian Rust Maintainers + 2022-2023 Blair Noctis License: MIT License: MIT diff --git a/src/roff-0.1/debian/RFS b/src/roff-0.1/debian/RFS deleted file mode 100644 index 4cb6047..0000000 --- a/src/roff-0.1/debian/RFS +++ /dev/null @@ -1 +0,0 @@ -fixed dependency problems diff --git a/src/roff-0.1/debian/changelog b/src/roff-0.1/debian/changelog index 47c0b8c..a180b58 100644 --- a/src/roff-0.1/debian/changelog +++ b/src/roff-0.1/debian/changelog @@ -1,9 +1,13 @@ -rust-roff-0.1 (0.1.0-3) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium +rust-roff-0.1 (0.1.0-3) unstable; urgency=medium + * Team upload. + * Package roff 0.1.0 from crates.io using debcargo 2.6.0 + + [ Alexander Kjäll ] * Package roff 0.1.0 from crates.io using debcargo 2.5.0 * Updated dependency versions to match what is in debian - -- Alexander Kjäll Fri, 11 Nov 2022 23:29:05 +0100 + -- James McCoy Fri, 10 Feb 2023 20:12:43 -0500 rust-roff-0.1 (0.1.0-2) unstable; urgency=medium diff --git a/src/roff-0.1/debian/copyright b/src/roff-0.1/debian/copyright index 1ac94d2..bb72781 100644 --- a/src/roff-0.1/debian/copyright +++ b/src/roff-0.1/debian/copyright @@ -12,8 +12,8 @@ Files: debian/* Copyright: - 2020-2022 Debian Rust Maintainers - 2020-2022 Alexander Kjäll + 2020-2023 Debian Rust Maintainers + 2020-2023 Alexander Kjäll License: MIT or Apache-2.0 License: Apache-2.0 diff --git a/src/roff-0.1/debian/copyright.debcargo.hint b/src/roff-0.1/debian/copyright.debcargo.hint index 31e7896..326101d 100644 --- a/src/roff-0.1/debian/copyright.debcargo.hint +++ b/src/roff-0.1/debian/copyright.debcargo.hint @@ -12,7 +12,7 @@ be correct information so you should review and fix this before uploading to the archive. -Files: ./LICENSE-MIT +Files: LICENSE-MIT Copyright: 2015 The assert_cli Developers License: UNKNOWN-LICENSE; FIXME (overlay) Comment: @@ -21,8 +21,8 @@ Files: debian/* Copyright: - 2022 Debian Rust Maintainers - 2022 Alexander Kjäll + 2022-2023 Debian Rust Maintainers + 2022-2023 Alexander Kjäll License: MIT or Apache-2.0 License: Apache-2.0 diff --git a/src/sequoia-keyring-linter/debian/changelog b/src/sequoia-keyring-linter/debian/changelog index 50aaa6b..cf7939d 100644 --- a/src/sequoia-keyring-linter/debian/changelog +++ b/src/sequoia-keyring-linter/debian/changelog @@ -1,3 +1,11 @@ +rust-sequoia-keyring-linter (1.0.0-2) unstable; urgency=medium + + * Team upload. + * Package sequoia-keyring-linter 1.0.0 from crates.io using debcargo 2.6.0 + * Apply upstream patch for rpassword 6.0 (Closes: #1030915). + + -- Peter Michael Green Sat, 11 Feb 2023 06:43:16 +0000 + rust-sequoia-keyring-linter (1.0.0-1) unstable; urgency=medium * Package sequoia-keyring-linter 1.0.0 from crates.io using debcargo 2.5.0 diff --git a/src/sequoia-keyring-linter/debian/copyright b/src/sequoia-keyring-linter/debian/copyright index 478763f..d8f961c 100644 --- a/src/sequoia-keyring-linter/debian/copyright +++ b/src/sequoia-keyring-linter/debian/copyright @@ -4,12 +4,12 @@ Source: https://gitlab.com/sequoia-pgp/keyring-linter Files: * -Copyright: 2020-2022 Neal Walfield +Copyright: 2020-2023 Neal Walfield License: GPL-2.0-or-later Files: debian/* Copyright: - 2020-2022 Debian Rust Maintainers + 2020-2023 Debian Rust Maintainers 2020-2022 Daniel Kahn Gillmor License: GPL-2.0-or-later diff --git a/src/sequoia-keyring-linter/debian/copyright.debcargo.hint b/src/sequoia-keyring-linter/debian/copyright.debcargo.hint index 68d0fc5..8992c59 100644 --- a/src/sequoia-keyring-linter/debian/copyright.debcargo.hint +++ b/src/sequoia-keyring-linter/debian/copyright.debcargo.hint @@ -12,7 +12,7 @@ be correct information so you should review and fix this before uploading to the archive. -Files: ./LICENSE.txt +Files: LICENSE.txt Copyright: 1989, 1991 Free Software Foundation, Inc., License: UNKNOWN-LICENSE; FIXME (overlay) Comment: @@ -21,8 +21,8 @@ Files: debian/* Copyright: - 2020-2022 Debian Rust Maintainers - 2020-2022 Daniel Kahn Gillmor + 2020-2023 Debian Rust Maintainers + 2020-2023 Daniel Kahn Gillmor License: GPL-2.0-or-later License: GPL-2.0-or-later diff --git a/src/sequoia-keyring-linter/debian/patches/rpassword-6.patch b/src/sequoia-keyring-linter/debian/patches/rpassword-6.patch new file mode 100644 index 0000000..6553075 --- /dev/null +++ b/src/sequoia-keyring-linter/debian/patches/rpassword-6.patch @@ -0,0 +1,46 @@ +This patch is based on the upstream commit described below, adapter for use +in the Debian package by Peter Michael Green. + +commit 68531230aa061034d6144adf19ebc681bb8d5253 +Author: Neal H. Walfield +Date: Fri Feb 10 11:28:50 2023 +0100 + + Update to rpassword 6.0. + + - Debian has moved to rpassword 6.0, which has a different API from + rpassword 5.0. Follow Debian. + + - Fixes #18. + +Index: sequoia-keyring-linter/src/keyring-linter.rs +=================================================================== +--- sequoia-keyring-linter.orig/src/keyring-linter.rs ++++ sequoia-keyring-linter/src/keyring-linter.rs +@@ -54,11 +54,11 @@ fn decrypt_key(key: Key { + first = false; +Index: sequoia-keyring-linter/Cargo.toml +=================================================================== +--- sequoia-keyring-linter.orig/Cargo.toml ++++ sequoia-keyring-linter/Cargo.toml +@@ -45,7 +45,7 @@ version = "1" + version = "0.2" + + [dependencies.rpassword] +-version = "5.0" ++version = "6.0" + + [dependencies.sequoia-openpgp] + version = "1.0" diff --git a/src/sequoia-keyring-linter/debian/patches/series b/src/sequoia-keyring-linter/debian/patches/series new file mode 100644 index 0000000..4bd43a2 --- /dev/null +++ b/src/sequoia-keyring-linter/debian/patches/series @@ -0,0 +1 @@ +rpassword-6.patch diff --git a/src/sequoia-sop/debian/changelog b/src/sequoia-sop/debian/changelog index c47585c..42dc458 100644 --- a/src/sequoia-sop/debian/changelog +++ b/src/sequoia-sop/debian/changelog @@ -1,8 +1,8 @@ -rust-sequoia-sop (0.27.3-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium +rust-sequoia-sop (0.27.3-1) unstable; urgency=medium * Package sequoia-sop 0.27.3 from crates.io using debcargo 2.6.0 - -- Daniel Kahn Gillmor Tue, 07 Feb 2023 19:50:26 -0500 + -- Daniel Kahn Gillmor Tue, 07 Feb 2023 19:56:32 -0500 rust-sequoia-sop (0.27.2-1) unstable; urgency=medium diff --git a/src/serde-json/debian/RFS b/src/serde-json/debian/RFS new file mode 100644 index 0000000..e69de29 diff --git a/src/serde-json/debian/changelog b/src/serde-json/debian/changelog index 07924d2..1dc090b 100644 --- a/src/serde-json/debian/changelog +++ b/src/serde-json/debian/changelog @@ -1,3 +1,10 @@ +rust-serde-json (1.0.93-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Team upload. + * Package serde_json 1.0.93 from crates.io using debcargo 2.6.0 + + -- Blair Noctis Fri, 10 Feb 2023 14:23:26 +0000 + rust-serde-json (1.0.87-1) unstable; urgency=medium * Team upload. diff --git a/src/serde-json/debian/copyright.debcargo.hint b/src/serde-json/debian/copyright.debcargo.hint index e32f26e..d33cca9 100644 --- a/src/serde-json/debian/copyright.debcargo.hint +++ b/src/serde-json/debian/copyright.debcargo.hint @@ -18,9 +18,9 @@ Files: debian/* Copyright: - 2018-2022 Debian Rust Maintainers - 2018-2022 kpcyrd - 2018-2022 Wolfgang Silbermayr + 2018-2023 Debian Rust Maintainers + 2018-2023 kpcyrd + 2018-2023 Wolfgang Silbermayr License: MIT or Apache-2.0 License: Apache-2.0 diff --git a/src/serde-repr/debian/RFS b/src/serde-repr/debian/RFS new file mode 100644 index 0000000..e69de29 diff --git a/src/serde-repr/debian/changelog b/src/serde-repr/debian/changelog index 0662476..5b9504e 100644 --- a/src/serde-repr/debian/changelog +++ b/src/serde-repr/debian/changelog @@ -1,3 +1,10 @@ +rust-serde-repr (0.1.10-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Team upload. + * Package serde_repr 0.1.10 from crates.io using debcargo 2.6.0 + + -- Blair Noctis Fri, 10 Feb 2023 17:09:13 +0000 + rust-serde-repr (0.1.7-1) unstable; urgency=medium * Team upload. diff --git a/src/serde-repr/debian/copyright.debcargo.hint b/src/serde-repr/debian/copyright.debcargo.hint index 2dc64fb..d77457e 100644 --- a/src/serde-repr/debian/copyright.debcargo.hint +++ b/src/serde-repr/debian/copyright.debcargo.hint @@ -14,8 +14,8 @@ Files: debian/* Copyright: - 2020-2022 Debian Rust Maintainers - 2020-2022 Andrej Shadura + 2020-2023 Debian Rust Maintainers + 2020-2023 Andrej Shadura License: MIT or Apache-2.0 License: Apache-2.0 diff --git a/src/serde-yaml/debian/RFS b/src/serde-yaml/debian/RFS new file mode 100644 index 0000000..813a377 --- /dev/null +++ b/src/serde-yaml/debian/RFS @@ -0,0 +1,4 @@ +New: +- unsafe-libyaml +Note: +Preparation update, should be in sync with at least alacritty-* and bat diff --git a/src/serde-yaml/debian/changelog b/src/serde-yaml/debian/changelog index 53817de..6a030c9 100644 --- a/src/serde-yaml/debian/changelog +++ b/src/serde-yaml/debian/changelog @@ -1,3 +1,10 @@ +rust-serde-yaml (0.9.17-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Team upload. + * Package serde_yaml 0.9.17 from crates.io using debcargo 2.6.0 + + -- Blair Noctis Fri, 10 Feb 2023 15:54:06 +0000 + rust-serde-yaml (0.8.26-1) unstable; urgency=medium * Team upload. diff --git a/src/serde-yaml/debian/copyright.debcargo.hint b/src/serde-yaml/debian/copyright.debcargo.hint index 9231cce..6085fc7 100644 --- a/src/serde-yaml/debian/copyright.debcargo.hint +++ b/src/serde-yaml/debian/copyright.debcargo.hint @@ -14,8 +14,8 @@ Files: debian/* Copyright: - 2019-2022 Debian Rust Maintainers - 2019-2022 Wolfgang Silbermayr + 2019-2023 Debian Rust Maintainers + 2019-2023 Wolfgang Silbermayr License: MIT or Apache-2.0 License: Apache-2.0 diff --git a/src/socket2/debian/RFS b/src/socket2/debian/RFS new file mode 100644 index 0000000..e69de29 diff --git a/src/socket2/debian/changelog b/src/socket2/debian/changelog index cda6ce7..1a0b9c3 100644 --- a/src/socket2/debian/changelog +++ b/src/socket2/debian/changelog @@ -1,3 +1,10 @@ +rust-socket2 (0.4.7-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Team upload. + * Package socket2 0.4.7 from crates.io using debcargo 2.6.0 + + -- Blair Noctis Fri, 10 Feb 2023 17:32:22 +0000 + rust-socket2 (0.4.4-1) unstable; urgency=medium * Team upload. diff --git a/src/socket2/debian/copyright.debcargo.hint b/src/socket2/debian/copyright.debcargo.hint index f93bda8..c58b216 100644 --- a/src/socket2/debian/copyright.debcargo.hint +++ b/src/socket2/debian/copyright.debcargo.hint @@ -16,35 +16,35 @@ be correct information so you should review and fix this before uploading to the archive. -Files: ./LICENSE-MIT +Files: LICENSE-MIT Copyright: 2014 Alex Crichton 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 +Files: src/lib.rs Copyright: 2015 The Rust Project Developers. License: UNKNOWN-LICENSE; FIXME (overlay) Comment: FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. -Files: ./src/socket.rs +Files: src/socket.rs Copyright: 2015 The Rust Project Developers. License: UNKNOWN-LICENSE; FIXME (overlay) Comment: FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. -Files: ./src/sys/unix.rs +Files: src/sys/unix.rs Copyright: 2015 The Rust Project Developers. License: UNKNOWN-LICENSE; FIXME (overlay) Comment: FIXME (overlay): These notices are extracted from files. Please review them before uploading to the archive. -Files: ./src/sys/windows.rs +Files: src/sys/windows.rs Copyright: 2015 The Rust Project Developers. License: UNKNOWN-LICENSE; FIXME (overlay) Comment: @@ -53,9 +53,9 @@ Files: debian/* Copyright: - 2018-2022 Debian Rust Maintainers - 2018-2022 Ximin Luo - 2018-2022 kpcyrd + 2018-2023 Debian Rust Maintainers + 2018-2023 Ximin Luo + 2018-2023 kpcyrd License: MIT or Apache-2.0 License: Apache-2.0 diff --git a/src/test-dir/debian/changelog b/src/test-dir/debian/changelog index 043cbe0..768584e 100644 --- a/src/test-dir/debian/changelog +++ b/src/test-dir/debian/changelog @@ -1,3 +1,21 @@ +rust-test-dir (0.2.0-4) unstable; urgency=medium + + * Team upload. + * Package test_dir 0.2.0 from crates.io using debcargo 2.6.0 + * Use CARGO_TARGET_DIR instead of /tmp, it's safer. + + unfortunately we can't use CARGO_TARGET_TMPDIR because it's not available + to unit tests. + + -- Peter Michael Green Sat, 11 Feb 2023 08:05:41 +0000 + +rust-test-dir (0.2.0-3) unstable; urgency=medium + + * Team upload. + * Patch to create test dirs in /tmp to avoid permission error + (Closes: #1030948) + + -- Blair Noctis Sat, 11 Feb 2023 07:03:14 +0000 + rust-test-dir (0.2.0-2) unstable; urgency=medium * Team upload. diff --git a/src/test-dir/debian/copyright.debcargo.hint b/src/test-dir/debian/copyright.debcargo.hint index 87f521a..352bc1b 100644 --- a/src/test-dir/debian/copyright.debcargo.hint +++ b/src/test-dir/debian/copyright.debcargo.hint @@ -12,7 +12,7 @@ be correct information so you should review and fix this before uploading to the archive. -Files: ./LICENSE +Files: LICENSE Copyright: 2019 Rafał Pachołek License: UNKNOWN-LICENSE; FIXME (overlay) Comment: @@ -21,8 +21,8 @@ Files: debian/* Copyright: - 2022 Debian Rust Maintainers - 2022 Ben Westover + 2022-2023 Debian Rust Maintainers + 2022-2023 Ben Westover License: MIT License: MIT diff --git a/src/test-dir/debian/patches/series b/src/test-dir/debian/patches/series new file mode 100644 index 0000000..5dbb159 --- /dev/null +++ b/src/test-dir/debian/patches/series @@ -0,0 +1 @@ +write-test-files-in-cargo-target-dir.patch diff --git a/src/test-dir/debian/patches/write-test-files-in-cargo-target-dir.patch b/src/test-dir/debian/patches/write-test-files-in-cargo-target-dir.patch new file mode 100644 index 0000000..e7abf6b --- /dev/null +++ b/src/test-dir/debian/patches/write-test-files-in-cargo-target-dir.patch @@ -0,0 +1,24 @@ +Index: test-dir/src/lib.rs +=================================================================== +--- test-dir.orig/src/lib.rs ++++ test-dir/src/lib.rs +@@ -313,6 +313,9 @@ mod tests { + fn test_testdir_current_rnd_dir() { + let path; + { ++ if let Some(cargo_target_dir) = option_env!("CARGO_TARGET_DIR") { ++ std::env::set_current_dir(cargo_target_dir).unwrap(); ++ } + let dir = TestDir::current_rnd(); + + // Dir created +@@ -332,6 +335,9 @@ mod tests { + fn test_testdir_current_dir() { + let path; + { ++ if let Some(cargo_target_dir) = option_env!("CARGO_TARGET_DIR") { ++ std::env::set_current_dir(cargo_target_dir).unwrap(); ++ } + let dir = TestDir::current("a/b/c"); + + // Dir created diff --git a/src/unindent/debian/RFS b/src/unindent/debian/RFS new file mode 100644 index 0000000..e69de29 diff --git a/src/unindent/debian/changelog b/src/unindent/debian/changelog index 78c6d3b..5a9efc6 100644 --- a/src/unindent/debian/changelog +++ b/src/unindent/debian/changelog @@ -1,3 +1,11 @@ +rust-unindent (0.2.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Team upload. + * Package unindent 0.2.0 from crates.io using debcargo 2.6.0 + * Patch to fix an ambiguous (mod) name error + + -- Blair Noctis Fri, 10 Feb 2023 14:17:57 +0000 + rust-unindent (0.1.8-1) unstable; urgency=medium * Team upload. diff --git a/src/unindent/debian/copyright.debcargo.hint b/src/unindent/debian/copyright.debcargo.hint index adfe639..e641ba8 100644 --- a/src/unindent/debian/copyright.debcargo.hint +++ b/src/unindent/debian/copyright.debcargo.hint @@ -14,8 +14,8 @@ Files: debian/* Copyright: - 2020-2022 Debian Rust Maintainers - 2020-2022 Sylvestre Ledru + 2020-2023 Debian Rust Maintainers + 2020-2023 Sylvestre Ledru License: MIT or Apache-2.0 License: Apache-2.0 diff --git a/src/unindent/debian/patches/series b/src/unindent/debian/patches/series new file mode 100644 index 0000000..04d6bf4 --- /dev/null +++ b/src/unindent/debian/patches/series @@ -0,0 +1 @@ +unambiguous-mod-unindent.patch diff --git a/src/unindent/debian/patches/unambiguous-mod-unindent.patch b/src/unindent/debian/patches/unambiguous-mod-unindent.patch new file mode 100644 index 0000000..a94c037 --- /dev/null +++ b/src/unindent/debian/patches/unambiguous-mod-unindent.patch @@ -0,0 +1,10 @@ +Description: Fix "ambiguous name" error when testing as a separate crate +Bug: https://github.com/dtolnay/indoc/issues/58 +--- a/src/lib.rs ++++ b/src/lib.rs +@@ -56,4 +56,4 @@ + + mod unindent; + +-pub use unindent::*; ++pub use crate::unindent::*; diff --git a/src/unsafe-libyaml/debian/RFS b/src/unsafe-libyaml/debian/RFS new file mode 100644 index 0000000..e69de29 diff --git a/src/unsafe-libyaml/debian/changelog b/src/unsafe-libyaml/debian/changelog new file mode 100644 index 0000000..b18de47 --- /dev/null +++ b/src/unsafe-libyaml/debian/changelog @@ -0,0 +1,5 @@ +rust-unsafe-libyaml (0.2.5-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Package unsafe-libyaml 0.2.5 from crates.io using debcargo 2.6.0 + + -- Blair Noctis Fri, 10 Feb 2023 15:40:17 +0000 diff --git a/src/unsafe-libyaml/debian/copyright b/src/unsafe-libyaml/debian/copyright new file mode 100644 index 0000000..1ef0b92 --- /dev/null +++ b/src/unsafe-libyaml/debian/copyright @@ -0,0 +1,33 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: unsafe-libyaml +Upstream-Contact: David Tolnay +Source: https://github.com/dtolnay/unsafe-libyaml + +Files: * +Copyright: 2022 David Tolnay +License: MIT + +Files: debian/* +Copyright: + 2023 Debian Rust Maintainers + 2023 Blair Noctis +License: MIT + +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/unsafe-libyaml/debian/copyright.debcargo.hint b/src/unsafe-libyaml/debian/copyright.debcargo.hint new file mode 100644 index 0000000..87667a0 --- /dev/null +++ b/src/unsafe-libyaml/debian/copyright.debcargo.hint @@ -0,0 +1,38 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: unsafe-libyaml +Upstream-Contact: David Tolnay +Source: https://github.com/dtolnay/unsafe-libyaml + +Files: * +Copyright: FIXME (overlay) UNKNOWN-YEARS David Tolnay +License: 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: + 2023 Debian Rust Maintainers + 2023 Blair Noctis +License: MIT + +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/unsafe-libyaml/debian/debcargo.toml b/src/unsafe-libyaml/debian/debcargo.toml new file mode 100644 index 0000000..d5b2df0 --- /dev/null +++ b/src/unsafe-libyaml/debian/debcargo.toml @@ -0,0 +1,12 @@ +overlay = "." +uploaders = ["Blair Noctis "] + +# test bins in src/bin +bin = false + +[packages.lib] +# Git source has 0.2.5 published with a "unsafe-libyaml-test-suite" pointing +# to `tests/data` (commit b47a144ecd), but the one published on crates.io +# doesn't have this. This test crate has been published on crates.io but later +# yanked. +test_is_broken = true diff --git a/src/webbrowser/debian/changelog b/src/webbrowser/debian/changelog index b48e6d3..3d88654 100644 --- a/src/webbrowser/debian/changelog +++ b/src/webbrowser/debian/changelog @@ -1,10 +1,22 @@ -rust-webbrowser (0.5.5-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium +rust-webbrowser (0.8.7-1) unstable; urgency=medium + * Package webbrowser 0.8.7 from crates.io using debcargo 2.6.0 + * Disable tests that depend on actix-web and actix-files + * Add test_depends on firefox-esr + + [ Blair Noctis ] + * Package webbrowser 0.8.7 from crates.io using debcargo 2.6.0 + (Closes: #1031017) + * Patch to remove dep on actix-web, actix-files, not yet in Debian + * Patch to remove deps for other platforms + * Remove d/rules and dep on xdg-util, problem addressed upstream + + [ Nick Black ] * Team upload. * package.lib -> packages.lib * Package webbrowser 0.5.5 from crates.io using debcargo 2.4.2 - -- Nick Black Sun, 30 Aug 2020 08:19:18 -0400 + -- Peter Michael Green Sat, 11 Feb 2023 05:34:11 +0000 rust-webbrowser (0.5.2-2) unstable; urgency=medium diff --git a/src/webbrowser/debian/copyright b/src/webbrowser/debian/copyright index 7d4e5ee..c4677ee 100644 --- a/src/webbrowser/debian/copyright +++ b/src/webbrowser/debian/copyright @@ -4,12 +4,12 @@ Source: https://github.com/amodm/webbrowser-rs Files: * -Copyright: 2015-2019 Amod Malviya @amodm +Copyright: 2015-2023 Amod Malviya @amodm License: MIT or Apache-2.0 Files: debian/* Copyright: - 2019-2020 Debian Rust Maintainers + 2019-2023 Debian Rust Maintainers 2019-2020 Ximin Luo License: MIT or Apache-2.0 diff --git a/src/webbrowser/debian/copyright.debcargo.hint b/src/webbrowser/debian/copyright.debcargo.hint index 816406c..41716f4 100644 --- a/src/webbrowser/debian/copyright.debcargo.hint +++ b/src/webbrowser/debian/copyright.debcargo.hint @@ -12,15 +12,15 @@ be correct information so you should review and fix this before uploading to the archive. -Files: ./LICENSE-APACHE -Copyright: 2015 Amod Malviya +Files: LICENSE-APACHE +Copyright: 2015-2022 Amod Malviya 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: 2015 Amod Malviya +Files: LICENSE-MIT +Copyright: 2015-2022 Amod Malviya License: UNKNOWN-LICENSE; FIXME (overlay) Comment: FIXME (overlay): These notices are extracted from files. Please review them @@ -28,8 +28,8 @@ Files: debian/* Copyright: - 2019-2020 Debian Rust Maintainers - 2019-2020 Ximin Luo + 2019-2023 Debian Rust Maintainers + 2019-2023 Ximin Luo License: MIT or Apache-2.0 License: Apache-2.0 diff --git a/src/webbrowser/debian/debcargo.toml b/src/webbrowser/debian/debcargo.toml index c440c07..de55d69 100644 --- a/src/webbrowser/debian/debcargo.toml +++ b/src/webbrowser/debian/debcargo.toml @@ -2,4 +2,4 @@ uploaders = ["Ximin Luo "] [packages.lib] -depends = ["xdg-utils"] +test_depends = ["firefox-esr"] diff --git a/src/webbrowser/debian/patches/relax-deps.patch b/src/webbrowser/debian/patches/relax-deps.patch new file mode 100644 index 0000000..fc88fd6 --- /dev/null +++ b/src/webbrowser/debian/patches/relax-deps.patch @@ -0,0 +1,11 @@ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -47,7 +47,7 @@ + version = "0.8" + + [dev-dependencies.serial_test] +-version = "0.10" ++version = "0.9" + + [dev-dependencies.tokio] + version = "1" diff --git a/src/webbrowser/debian/patches/remove-other-platform-deps.patch b/src/webbrowser/debian/patches/remove-other-platform-deps.patch new file mode 100644 index 0000000..1e35e96 --- /dev/null +++ b/src/webbrowser/debian/patches/remove-other-platform-deps.patch @@ -0,0 +1,27 @@ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -64,24 +64,3 @@ + [target."cfg(any(target_os = \"linux\", target_os = \"freebsd\", target_os = \"netbsd\", target_os = \"openbsd\", target_os = \"haiku\"))".dependencies.dirs] + version = "4.0" + +-[target."cfg(target_arch = \"wasm32\")".dependencies.web-sys] +-version = "0.3" +-features = ["Window"] +- +-[target."cfg(target_os = \"android\")".dependencies.jni] +-version = "0.20" +- +-[target."cfg(target_os = \"android\")".dependencies.ndk-context] +-version = "0.1" +- +-[target."cfg(target_os = \"android\")".dev-dependencies.ndk-glue] +-version = ">= 0.3, <= 0.7" +- +-[target."cfg(target_os = \"ios\")".dependencies.objc] +-version = "0.2.7" +- +-[target."cfg(target_os = \"ios\")".dependencies.raw-window-handle] +-version = "0.5.0" +- +-[target."cfg(target_os = \"macos\")".dependencies.core-foundation] +-version = "0.9" diff --git a/src/webbrowser/debian/patches/remove-unavailable-actix-deps.patch b/src/webbrowser/debian/patches/remove-unavailable-actix-deps.patch new file mode 100644 index 0000000..1ad4323 --- /dev/null +++ b/src/webbrowser/debian/patches/remove-unavailable-actix-deps.patch @@ -0,0 +1,165 @@ +Index: webbrowser/Cargo.toml +=================================================================== +--- webbrowser.orig/Cargo.toml ++++ webbrowser/Cargo.toml +@@ -31,12 +31,6 @@ version = "0.4" + [dependencies.url] + version = "2" + +-[dev-dependencies.actix-files] +-version = "0.6" +- +-[dev-dependencies.actix-web] +-version = "4" +- + [dev-dependencies.crossbeam-channel] + version = "0.5" + +Index: webbrowser/tests/common.rs +=================================================================== +--- webbrowser.orig/tests/common.rs ++++ webbrowser/tests/common.rs +@@ -1,5 +1,5 @@ +-use actix_files as fs; +-use actix_web::{web, App, HttpRequest, HttpResponse, HttpServer, Responder}; ++//use actix_files as fs; ++//use actix_web::{web, App, HttpRequest, HttpResponse, HttpServer, Responder}; + use crossbeam_channel as cbc; + use rand::RngCore; + use std::{io::Write, path::PathBuf, sync::Arc}; +@@ -11,7 +11,7 @@ struct AppState { + tx: Arc>, + } + +-async fn log_handler(req: HttpRequest, data: web::Data) -> impl Responder { ++/*async fn log_handler(req: HttpRequest, data: web::Data) -> impl Responder { + if data.tx.send(req.uri().to_string()).is_err() { + panic!("channel send failed"); + } +@@ -25,9 +25,9 @@ async fn log_handler(req: HttpRequest, d + .content_type("text/html; charset=utf-8") + .body(format!("

URI: {}

", req.uri())) + } +-} ++}*/ + +-async fn delayed_response(req: HttpRequest) -> impl Responder { ++/*async fn delayed_response(req: HttpRequest) -> impl Responder { + let qs = req.query_string(); + let ms: u64 = qs + .replace("ms=", "") +@@ -40,9 +40,9 @@ async fn delayed_response(req: HttpReque + "

Delayed by {}ms

", + qs + )) +-} ++}*/ + +-pub async fn check_request_received_using(uri: String, host: &str, op: F) ++/*pub async fn check_request_received_using(uri: String, host: &str, op: F) + where + F: FnOnce(&str), + { +@@ -89,17 +89,17 @@ where + + // stop the server + server_handle.stop(true).await; +-} ++}*/ + +-#[allow(dead_code)] ++/*#[allow(dead_code)] + pub async fn check_request_received(browser: Browser, uri: String) { + check_request_received_using(uri, "127.0.0.1", |url| { + open_browser(browser, url).expect("failed to open browser"); + }) + .await; +-} ++}*/ + +-#[allow(dead_code)] ++/*#[allow(dead_code)] + pub async fn check_local_file(browser: Browser, html_dir: Option, url_op: F) + where + F: FnOnce(&PathBuf) -> String, +@@ -126,13 +126,13 @@ where + }) + .await; + let _ = std::fs::remove_file(&pb); +-} ++}*/ + +-#[allow(dead_code)] ++/*#[allow(dead_code)] + pub async fn check_browser(browser: Browser, platform: &str) { + check_request_received(browser, format!("/{}", platform)).await; + check_request_received(browser, format!("/{}/😀😀😀", platform)).await; +-} ++}*/ + + const URI_PNG_1PX: &str = "/img/1px.png"; + +Index: webbrowser/tests/test_unix.rs +=================================================================== +--- webbrowser.orig/tests/test_unix.rs ++++ webbrowser/tests/test_unix.rs +@@ -9,11 +9,11 @@ mod tests { + use serial_test::serial; + use webbrowser::Browser; + +- #[tokio::test(flavor = "multi_thread", worker_threads = 2)] ++ /*#[tokio::test(flavor = "multi_thread", worker_threads = 2)] + #[serial] + async fn test_open_default() { + check_browser(Browser::Default, TEST_PLATFORM).await; +- } ++ }*/ + + #[test] + fn test_existence_default() { +@@ -25,7 +25,7 @@ mod tests { + assert!(!Browser::Safari.exists(), "should not have found Safari"); + } + +- #[cfg(not(feature = "hardened"))] ++ /*#[cfg(not(feature = "hardened"))] + #[tokio::test(flavor = "multi_thread", worker_threads = 2)] + #[serial] + async fn test_local_file_abs_path() { +@@ -60,7 +60,7 @@ mod tests { + .to_string() + }) + .await; +- } ++ }*/ + + #[cfg(feature = "hardened")] + #[test] +Index: webbrowser/tests/test_wasm.rs +=================================================================== +--- webbrowser.orig/tests/test_wasm.rs ++++ webbrowser/tests/test_wasm.rs +@@ -5,14 +5,14 @@ mod common; + mod tests { + const TEST_PLATFORM: &str = "wasm32"; + +- use super::common::check_request_received_using; ++ //use super::common::check_request_received_using; + use std::fs; + use std::path::PathBuf; + + // to run this test, run it as: + // cargo test --test test_wasm32 -- --ignored + // +- #[ignore] ++ /*#[ignore] + #[tokio::test(flavor = "multi_thread", worker_threads = 2)] + async fn test_wasm32() { + let uri = &format!("/{}", TEST_PLATFORM); +@@ -43,5 +43,5 @@ mod tests { + status.expect("browser open failed"); + }) + .await; +- } ++ }*/ + } diff --git a/src/webbrowser/debian/patches/remove-wasm-feature.patch b/src/webbrowser/debian/patches/remove-wasm-feature.patch new file mode 100644 index 0000000..c06aad9 --- /dev/null +++ b/src/webbrowser/debian/patches/remove-wasm-feature.patch @@ -0,0 +1,10 @@ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -59,7 +59,6 @@ + [features] + disable-wsl = [] + hardened = [] +-wasm-console = ["web-sys/console"] + + [target."cfg(any(target_os = \"linux\", target_os = \"freebsd\", target_os = \"netbsd\", target_os = \"openbsd\", target_os = \"haiku\"))".dependencies.dirs] + version = "4.0" diff --git a/src/webbrowser/debian/patches/series b/src/webbrowser/debian/patches/series new file mode 100644 index 0000000..43e4582 --- /dev/null +++ b/src/webbrowser/debian/patches/series @@ -0,0 +1,4 @@ +relax-deps.patch +remove-other-platform-deps.patch +remove-wasm-feature.patch +remove-unavailable-actix-deps.patch diff --git a/src/webbrowser/debian/rules b/src/webbrowser/debian/rules deleted file mode 100644 index a66973c..0000000 --- a/src/webbrowser/debian/rules +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/make -f -%: - dh $@ --buildsystem cargo - -override_dh_auto_test: - dh_auto_test -# tests fail due to https://github.com/amodm/webbrowser-rs/issues/18 -# dh_auto_test -- test --all diff --git a/src/webbrowser/debian/rules.debcargo.hint b/src/webbrowser/debian/rules.debcargo.hint deleted file mode 100755 index 92c239b..0000000 --- a/src/webbrowser/debian/rules.debcargo.hint +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/make -f -%: - dh $@ --buildsystem cargo - -override_dh_auto_test: - dh_auto_test -- test --all