diff -Nru cargo-0.67.1+ds0ubuntu0.libgit2/debian/changelog cargo-0.67.1+ds0ubuntu0.libgit2/debian/changelog --- cargo-0.67.1+ds0ubuntu0.libgit2/debian/changelog 2023-02-26 01:05:50.000000000 +0000 +++ cargo-0.67.1+ds0ubuntu0.libgit2/debian/changelog 2023-03-08 22:15:16.000000000 +0000 @@ -1,10 +1,12 @@ -cargo (0.67.1+ds0ubuntu0.libgit2-0ubuntu0.18.04) bionic; urgency=medium +cargo (0.67.1+ds0ubuntu0.libgit2-0ubuntu0.18.04.1) bionic; urgency=medium - * Backport to Bionic (LP: #TBD) + * Backport to Bionic (LP: #2005123) + - d/control: Relax debhelper version requirements + - d/control: Remove the requirements of dh-cargo * Re-enable libgit2 vendoring: - - d/control: remove libgit2-dev and libhttp-parser-dev from B-D + - d/control: Remove libgit2-dev and libhttp-parser-dev from B-D - -- Zixing Liu Sat, 25 Feb 2023 18:05:50 -0700 + -- Zixing Liu Wed, 08 Mar 2023 15:15:16 -0700 cargo (0.67.1+ds0ubuntu1-0ubuntu1) lunar; urgency=medium @@ -17,6 +19,7 @@ - d/p: refresh debian patches to adapt to Cargo 0.67.1 - d/debcargo-conf.patch: refresh debconf patches to adapt to newer vendored dependencies + - d/copyright: update copyright information for vendored dependencies -- Zixing Liu Wed, 15 Feb 2023 13:08:31 -0700 diff -Nru cargo-0.67.1+ds0ubuntu0.libgit2/debian/copyright cargo-0.67.1+ds0ubuntu0.libgit2/debian/copyright --- cargo-0.67.1+ds0ubuntu0.libgit2/debian/copyright 2023-02-26 01:01:54.000000000 +0000 +++ cargo-0.67.1+ds0ubuntu0.libgit2/debian/copyright 2023-03-08 20:57:50.000000000 +0000 @@ -29,6 +29,7 @@ vendor/glob/* vendor/libc/* vendor/log/* + vendor/num-traits/* vendor/regex/* vendor/regex-syntax/* vendor/semver/* @@ -138,7 +139,6 @@ Files: vendor/bstr/* - vendor/bstr-*/* Copyright: 2015-2019 Andrew Gallant License: MIT or Apache-2.0 Comment: @@ -200,11 +200,6 @@ 2018, Alex Crichton License: MIT or Apache-2.0 -Files: vendor/crossbeam-utils/* -Copyright: 2017-2018 The Crossbeam Project Developers -License: MIT or Apache-2.0 -Comment: see https://github.com/crossbeam-rs - Files: vendor/crypto-common/* Copyright: 2017-2023 RustCrypto Developers License: MIT OR Apache-2.0 @@ -345,15 +340,17 @@ License: Apache-2.0 Comment: see https://github.com/derekdreery/normalize-line-endings -Files: vendor/num_cpus/* -Copyright: 2015, Sean McArthur -License: MIT or Apache-2.0 - Files: vendor/once_cell/* Copyright: 2018-2021 Aleksey Kladov License: MIT OR Apache-2.0 Comment: see https://github.com/matklad/once_cell +Files: vendor/ordered-float/* +Copyright: 2014-2018 Matt Brubeck + 2014-2018 Jonathan Reem +License: MIT +Comment: see https://github.com/reem/rust-ordered-float + Files: vendor/opener/* Copyright: 2018 Brian Bowman License: MIT or Apache-2.0 @@ -439,6 +436,11 @@ Comment: see https://github.com/serde-rs see https://github.com/dtolnay/serde-ignored +Files: vendor/serde-value/* +Copyright: arcnmx +License: MIT +Comment: see https://github.com/arcnmx/serde-value + Files: vendor/sha1/* Copyright: 2016-2022 RustCrypto Developers License: MIT OR Apache-2.0 @@ -483,10 +485,6 @@ License: MIT or Apache-2.0 Comment: see https://github.com/dtolnay/syn -Files: vendor/textwrap/* -Copyright: 2016, Martin Geisler -License: MIT - Files: vendor/tempfile/* Copyright: 2015, Steven Allen License: MIT or Apache-2.0 @@ -512,6 +510,11 @@ License: MIT or Apache-2.0 Comment: see https://github.com/ordian/toml_edit +Files: vendor/toml_datetime/* +Copyright: 2017-2019 Alex Crichton +License: MIT or Apache-2.0 +Comment: see https://github.com/toml-rs/toml + Files: vendor/typenum/* Copyright: 2015-2018 Paho Lurie-Gregg 2015-2018 Andre Bogus diff -Nru cargo-0.67.1+ds0ubuntu0.libgit2/debian/patches/remove-badges.patch cargo-0.67.1+ds0ubuntu0.libgit2/debian/patches/remove-badges.patch --- cargo-0.67.1+ds0ubuntu0.libgit2/debian/patches/remove-badges.patch 1970-01-01 00:00:00.000000000 +0000 +++ cargo-0.67.1+ds0ubuntu0.libgit2/debian/patches/remove-badges.patch 2023-03-08 20:49:29.000000000 +0000 @@ -0,0 +1,125 @@ +--- a/vendor/proc-macro2/README.md ++++ b/vendor/proc-macro2/README.md +@@ -1,10 +1,5 @@ + # proc-macro2 + +-[github](https://github.com/dtolnay/proc-macro2) +-[crates.io](https://crates.io/crates/proc-macro2) +-[docs.rs](https://docs.rs/proc-macro2) +-[build status](https://github.com/dtolnay/proc-macro2/actions?query=branch%3Amaster) +- + A wrapper around the procedural macro API of the compiler's `proc_macro` crate. + This library serves two purposes: + +--- a/vendor/quote/README.md ++++ b/vendor/quote/README.md +@@ -1,11 +1,6 @@ + Rust Quasi-Quoting + ================== + +-[github](https://github.com/dtolnay/quote) +-[crates.io](https://crates.io/crates/quote) +-[docs.rs](https://docs.rs/quote) +-[build status](https://github.com/dtolnay/quote/actions?query=branch%3Amaster) +- + This crate provides the [`quote!`] macro for turning Rust syntax tree data + structures into tokens of source code. + +--- a/vendor/syn/README.md ++++ b/vendor/syn/README.md +@@ -1,11 +1,6 @@ + Parser for Rust source code + =========================== + +-[github](https://github.com/dtolnay/syn) +-[crates.io](https://crates.io/crates/syn) +-[docs.rs](https://docs.rs/syn) +-[build status](https://github.com/dtolnay/syn/actions?query=branch%3Amaster) +- + Syn is a parsing library for parsing a stream of Rust tokens into a syntax tree + of Rust source code. + +--- a/vendor/proc-macro2/src/lib.rs ++++ b/vendor/proc-macro2/src/lib.rs +@@ -1,9 +1,5 @@ + //! [![github]](https://github.com/dtolnay/proc-macro2) [![crates-io]](https://crates.io/crates/proc-macro2) [![docs-rs]](crate) + //! +-//! [github]: https://img.shields.io/badge/github-8da0cb?style=for-the-badge&labelColor=555555&logo=github +-//! [crates-io]: https://img.shields.io/badge/crates.io-fc8d62?style=for-the-badge&labelColor=555555&logo=rust +-//! [docs-rs]: https://img.shields.io/badge/docs.rs-66c2a5?style=for-the-badge&labelColor=555555&logo=docs.rs +-//! + //!
+ //! + //! A wrapper around the procedural macro API of the compiler's [`proc_macro`] +--- a/vendor/quote/src/lib.rs ++++ b/vendor/quote/src/lib.rs +@@ -1,9 +1,5 @@ + //! [![github]](https://github.com/dtolnay/quote) [![crates-io]](https://crates.io/crates/quote) [![docs-rs]](https://docs.rs/quote) + //! +-//! [github]: https://img.shields.io/badge/github-8da0cb?style=for-the-badge&labelColor=555555&logo=github +-//! [crates-io]: https://img.shields.io/badge/crates.io-fc8d62?style=for-the-badge&labelColor=555555&logo=rust +-//! [docs-rs]: https://img.shields.io/badge/docs.rs-66c2a5?style=for-the-badge&labelColor=555555&logo=docs.rs +-//! + //!
+ //! + //! This crate provides the [`quote!`] macro for turning Rust syntax tree data +--- a/vendor/syn/src/lib.rs ++++ b/vendor/syn/src/lib.rs +@@ -1,9 +1,5 @@ + //! [![github]](https://github.com/dtolnay/syn) [![crates-io]](https://crates.io/crates/syn) [![docs-rs]](crate) + //! +-//! [github]: https://img.shields.io/badge/github-8da0cb?style=for-the-badge&labelColor=555555&logo=github +-//! [crates-io]: https://img.shields.io/badge/crates.io-fc8d62?style=for-the-badge&labelColor=555555&logo=rust +-//! [docs-rs]: https://img.shields.io/badge/docs.rs-66c2a5?style=for-the-badge&labelColor=555555&logo=docs.rs +-//! + //!
+ //! + //! Syn is a parsing library for parsing a stream of Rust tokens into a syntax +--- a/vendor/unicode-ident/README.md ++++ b/vendor/unicode-ident/README.md +@@ -1,11 +1,6 @@ + Unicode ident + ============= + +-[github](https://github.com/dtolnay/unicode-ident) +-[crates.io](https://crates.io/crates/unicode-ident) +-[docs.rs](https://docs.rs/unicode-ident) +-[build status](https://github.com/dtolnay/unicode-ident/actions?query=branch%3Amaster) +- + Implementation of [Unicode Standard Annex #31][tr31] for determining which + `char` values are valid in programming language identifiers. + +@@ -202,8 +197,8 @@ + + + +- +- ++ ++ + +
XID_StartXID_Continue
XID_Start bitmapXID_Continue bitmap[XID_Start bitmap](https://user-images.githubusercontent.com/1940490/168647353-c6eeb922-afec-49b2-9ef5-c03e9d1e0760.png)[XID_Continue bitmap](https://user-images.githubusercontent.com/1940490/168647367-f447cca7-2362-4d7d-8cd7-d21c011d329b.png)
+ +--- a/vendor/unicode-ident/src/lib.rs ++++ b/vendor/unicode-ident/src/lib.rs +@@ -1,9 +1,5 @@ + //! [![github]](https://github.com/dtolnay/unicode-ident) [![crates-io]](https://crates.io/crates/unicode-ident) [![docs-rs]](https://docs.rs/unicode-ident) + //! +-//! [github]: https://img.shields.io/badge/github-8da0cb?style=for-the-badge&labelColor=555555&logo=github +-//! [crates-io]: https://img.shields.io/badge/crates.io-fc8d62?style=for-the-badge&labelColor=555555&logo=rust +-//! [docs-rs]: https://img.shields.io/badge/docs.rs-66c2a5?style=for-the-badge&labelColor=555555&logo=docs.rs +-//! + //!
+ //! + //! Implementation of [Unicode Standard Annex #31][tr31] for determining which +@@ -210,8 +206,8 @@ + //! + //! + //! +-//! +-//! ++//! ++//! + //! + //!
XID_StartXID_Continue
XID_Start bitmapXID_Continue bitmap[XID_Start bitmap](https://user-images.githubusercontent.com/1940490/168647353-c6eeb922-afec-49b2-9ef5-c03e9d1e0760.png)[XID_Continue bitmap](https://user-images.githubusercontent.com/1940490/168647367-f447cca7-2362-4d7d-8cd7-d21c011d329b.png)
+ //! diff -Nru cargo-0.67.1+ds0ubuntu0.libgit2/debian/patches/series cargo-0.67.1+ds0ubuntu0.libgit2/debian/patches/series --- cargo-0.67.1+ds0ubuntu0.libgit2/debian/patches/series 2023-02-26 01:05:50.000000000 +0000 +++ cargo-0.67.1+ds0ubuntu0.libgit2/debian/patches/series 2023-03-08 20:57:50.000000000 +0000 @@ -5,6 +5,6 @@ disable-fs-specific-test.patch 0003-tests-add-missing-cross-disabled-checks.patch -#remove-badges.patch +remove-badges.patch proxy-skip-tests.patch i386-crossbuild-tests.patch