diff -Nru rust-globset-0.4.9/Cargo.toml rust-globset-0.4.10/Cargo.toml --- rust-globset-0.4.9/Cargo.toml 1970-01-01 00:00:01.000000000 +0000 +++ rust-globset-0.4.10/Cargo.toml 1970-01-01 00:00:01.000000000 +0000 @@ -12,7 +12,7 @@ [package] edition = "2018" name = "globset" -version = "0.4.9" +version = "0.4.10" authors = ["Andrew Gallant "] description = """ Cross platform single glob and glob set matching. Glob set matching is the @@ -40,7 +40,7 @@ version = "0.7.3" [dependencies.bstr] -version = "0.2.0" +version = "1.1.0" features = ["std"] default-features = false diff -Nru rust-globset-0.4.9/Cargo.toml.orig rust-globset-0.4.10/Cargo.toml.orig --- rust-globset-0.4.9/Cargo.toml.orig 2006-07-24 01:21:28.000000000 +0000 +++ rust-globset-0.4.10/Cargo.toml.orig 2006-07-24 01:21:28.000000000 +0000 @@ -1,6 +1,6 @@ [package] name = "globset" -version = "0.4.9" #:version +version = "0.4.10" #:version authors = ["Andrew Gallant "] description = """ Cross platform single glob and glob set matching. Glob set matching is the @@ -21,7 +21,7 @@ [dependencies] aho-corasick = "0.7.3" -bstr = { version = "0.2.0", default-features = false, features = ["std"] } +bstr = { version = "1.1.0", default-features = false, features = ["std"] } fnv = "1.0.6" log = { version = "0.4.5", optional = true } regex = { version = "1.1.5", default-features = false, features = ["perf", "std"] } diff -Nru rust-globset-0.4.9/.cargo_vcs_info.json rust-globset-0.4.10/.cargo_vcs_info.json --- rust-globset-0.4.9/.cargo_vcs_info.json 1970-01-01 00:00:01.000000000 +0000 +++ rust-globset-0.4.10/.cargo_vcs_info.json 1970-01-01 00:00:01.000000000 +0000 @@ -1,6 +1,6 @@ { "git": { - "sha1": "2cfb338530ba4e59fea7f832ce2a5c77b957bad2" + "sha1": "364772ddd27d894ae3607a8c2b2314d47108ce0f" }, "path_in_vcs": "crates/globset" } \ No newline at end of file diff -Nru rust-globset-0.4.9/debian/cargo-checksum.json rust-globset-0.4.10/debian/cargo-checksum.json --- rust-globset-0.4.9/debian/cargo-checksum.json 2022-10-21 00:51:33.000000000 +0000 +++ rust-globset-0.4.10/debian/cargo-checksum.json 2023-06-12 22:26:08.000000000 +0000 @@ -1 +1 @@ -{"package":"Could not get crate checksum","files":{}} +{"package":"029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc","files":{}} diff -Nru rust-globset-0.4.9/debian/changelog rust-globset-0.4.10/debian/changelog --- rust-globset-0.4.9/debian/changelog 2022-10-21 00:51:33.000000000 +0000 +++ rust-globset-0.4.10/debian/changelog 2023-06-12 22:26:08.000000000 +0000 @@ -1,3 +1,14 @@ +rust-globset (0.4.10-1) unstable; urgency=medium + + * Package globset 0.4.10 from crates.io using debcargo 2.6.0 + + [ Blair Noctis ] + * Team upload. + * Package globset 0.4.10 from crates.io using debcargo 2.6.0 + * Drop disable-feature-serde.diff, mark tests for feature serde1 flaky + + -- Peter Michael Green Mon, 12 Jun 2023 22:26:08 +0000 + rust-globset (0.4.9-1) unstable; urgency=medium * Team upload. diff -Nru rust-globset-0.4.9/debian/control rust-globset-0.4.10/debian/control --- rust-globset-0.4.9/debian/control 2022-10-21 00:51:33.000000000 +0000 +++ rust-globset-0.4.10/debian/control 2023-06-12 22:26:08.000000000 +0000 @@ -7,7 +7,7 @@ rustc:native , libstd-rust-dev , librust-aho-corasick-0.7+default-dev (>= 0.7.3-~~) , - librust-bstr-0.2+std-dev , + librust-bstr-1+std-dev (>= 1.1.0-~~) , librust-fnv-1+default-dev (>= 1.0.6-~~) , librust-log-0.4+default-dev (>= 0.4.5-~~) , librust-regex-1+perf-dev (>= 1.1.5-~~) , @@ -15,10 +15,11 @@ Maintainer: Debian Rust Maintainers Uploaders: Sylvestre Ledru -Standards-Version: 4.5.1 +Standards-Version: 4.6.1 Vcs-Git: https://salsa.debian.org/rust-team/debcargo-conf.git [src/globset] Vcs-Browser: https://salsa.debian.org/rust-team/debcargo-conf/tree/master/src/globset Homepage: https://github.com/BurntSushi/ripgrep/tree/master/crates/globset +X-Cargo-Crate: globset Rules-Requires-Root: no Package: librust-globset-dev @@ -27,27 +28,36 @@ Depends: ${misc:Depends}, librust-aho-corasick-0.7+default-dev (>= 0.7.3-~~), - librust-bstr-0.2+std-dev, + librust-bstr-1+std-dev (>= 1.1.0-~~), librust-fnv-1+default-dev (>= 1.0.6-~~), librust-log-0.4+default-dev (>= 0.4.5-~~), librust-regex-1+perf-dev (>= 1.1.5-~~), - librust-regex-1+std-dev (>= 1.1.5-~~) + librust-regex-1+std-dev (>= 1.1.5-~~), + librust-serde-1+default-dev (>= 1.0.104-~~) Provides: librust-globset+default-dev (= ${binary:Version}), librust-globset+log-dev (= ${binary:Version}), + librust-globset+serde-dev (= ${binary:Version}), + librust-globset+serde1-dev (= ${binary:Version}), librust-globset+simd-accel-dev (= ${binary:Version}), librust-globset-0-dev (= ${binary:Version}), librust-globset-0+default-dev (= ${binary:Version}), librust-globset-0+log-dev (= ${binary:Version}), + librust-globset-0+serde-dev (= ${binary:Version}), + librust-globset-0+serde1-dev (= ${binary:Version}), librust-globset-0+simd-accel-dev (= ${binary:Version}), librust-globset-0.4-dev (= ${binary:Version}), librust-globset-0.4+default-dev (= ${binary:Version}), librust-globset-0.4+log-dev (= ${binary:Version}), + librust-globset-0.4+serde-dev (= ${binary:Version}), + librust-globset-0.4+serde1-dev (= ${binary:Version}), librust-globset-0.4+simd-accel-dev (= ${binary:Version}), - librust-globset-0.4.9-dev (= ${binary:Version}), - librust-globset-0.4.9+default-dev (= ${binary:Version}), - librust-globset-0.4.9+log-dev (= ${binary:Version}), - librust-globset-0.4.9+simd-accel-dev (= ${binary:Version}) + librust-globset-0.4.10-dev (= ${binary:Version}), + librust-globset-0.4.10+default-dev (= ${binary:Version}), + librust-globset-0.4.10+log-dev (= ${binary:Version}), + librust-globset-0.4.10+serde-dev (= ${binary:Version}), + librust-globset-0.4.10+serde1-dev (= ${binary:Version}), + librust-globset-0.4.10+simd-accel-dev (= ${binary:Version}) Description: Cross platform single glob and glob set matching - Rust source code Glob set matching is the process of matching one or more glob patterns against a single candidate path simultaneously, and returning all of the globs that diff -Nru rust-globset-0.4.9/debian/copyright rust-globset-0.4.10/debian/copyright --- rust-globset-0.4.9/debian/copyright 2022-10-21 00:51:33.000000000 +0000 +++ rust-globset-0.4.10/debian/copyright 2023-06-12 22:26:08.000000000 +0000 @@ -4,11 +4,11 @@ Source: https://github.com/BurntSushi/ripgrep/tree/master/globset Files: * -Copyright: 2015 Andrew Gallant +Copyright: 2015-2023 Andrew Gallant License: Unlicense or MIT Files: debian/* -Copyright: 2018 Debian Rust Maintainers +Copyright: 2018-2023 Debian Rust Maintainers 2018 Sylvestre Ledru License: Unlicense or MIT diff -Nru rust-globset-0.4.9/debian/copyright.debcargo.hint rust-globset-0.4.10/debian/copyright.debcargo.hint --- rust-globset-0.4.9/debian/copyright.debcargo.hint 2022-10-21 00:51:33.000000000 +0000 +++ rust-globset-0.4.10/debian/copyright.debcargo.hint 2023-06-12 22:26:08.000000000 +0000 @@ -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 Andrew Gallant License: UNKNOWN-LICENSE; FIXME (overlay) Comment: @@ -21,8 +21,8 @@ Files: debian/* Copyright: - 2018-2022 Debian Rust Maintainers - 2018-2022 Sylvestre Ledru + 2018-2023 Debian Rust Maintainers + 2018-2023 Sylvestre Ledru License: Unlicense or MIT License: MIT diff -Nru rust-globset-0.4.9/debian/debcargo.toml rust-globset-0.4.10/debian/debcargo.toml --- rust-globset-0.4.9/debian/debcargo.toml 2022-10-21 00:51:33.000000000 +0000 +++ rust-globset-0.4.10/debian/debcargo.toml 2023-06-12 22:26:08.000000000 +0000 @@ -1,3 +1,7 @@ overlay = "." uploaders = ["Sylvestre Ledru "] collapse_features = true + +[packages."lib+serde1"] +# uses feature gate +test_is_broken = true diff -Nru rust-globset-0.4.9/debian/patches/disable-feature-serde.diff rust-globset-0.4.10/debian/patches/disable-feature-serde.diff --- rust-globset-0.4.9/debian/patches/disable-feature-serde.diff 2022-10-21 00:51:33.000000000 +0000 +++ rust-globset-0.4.10/debian/patches/disable-feature-serde.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -Index: globset/Cargo.toml -=================================================================== ---- globset.orig/Cargo.toml -+++ globset/Cargo.toml -@@ -59,10 +59,6 @@ features = [ - ] - default-features = false - --[dependencies.serde] --version = "1.0.104" --optional = true -- - [dev-dependencies.glob] - version = "0.3.0" - -@@ -74,5 +70,4 @@ version = "1.0.45" - - [features] - default = ["log"] --serde1 = ["serde"] - simd-accel = [] diff -Nru rust-globset-0.4.9/debian/patches/series rust-globset-0.4.10/debian/patches/series --- rust-globset-0.4.9/debian/patches/series 2022-10-21 00:51:33.000000000 +0000 +++ rust-globset-0.4.10/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -disable-feature-serde.diff diff -Nru rust-globset-0.4.9/debian/tests/control rust-globset-0.4.10/debian/tests/control --- rust-globset-0.4.9/debian/tests/control 2022-10-21 00:51:33.000000000 +0000 +++ rust-globset-0.4.10/debian/tests/control 2023-06-12 22:26:08.000000000 +0000 @@ -1,24 +1,34 @@ -Test-Command: /usr/share/cargo/bin/cargo-auto-test globset 0.4.9 --all-targets --all-features +Test-Command: /usr/share/cargo/bin/cargo-auto-test globset 0.4.10 --all-targets --all-features Features: test-name=rust-globset:@ Depends: dh-cargo (>= 18), librust-glob-0.3+default-dev, librust-lazy-static-1+default-dev, librust-serde-json-1+default-dev (>= 1.0.45-~~), @ -Restrictions: allow-stderr, skip-not-installable +Restrictions: allow-stderr, skip-not-installable, flaky -Test-Command: /usr/share/cargo/bin/cargo-auto-test globset 0.4.9 --all-targets +Test-Command: /usr/share/cargo/bin/cargo-auto-test globset 0.4.10 --all-targets Features: test-name=librust-globset-dev:default Depends: dh-cargo (>= 18), librust-glob-0.3+default-dev, librust-lazy-static-1+default-dev, librust-serde-json-1+default-dev (>= 1.0.45-~~), @ Restrictions: allow-stderr, skip-not-installable -Test-Command: /usr/share/cargo/bin/cargo-auto-test globset 0.4.9 --all-targets --no-default-features --features log +Test-Command: /usr/share/cargo/bin/cargo-auto-test globset 0.4.10 --all-targets --no-default-features --features log Features: test-name=librust-globset-dev:log Depends: dh-cargo (>= 18), librust-glob-0.3+default-dev, librust-lazy-static-1+default-dev, librust-serde-json-1+default-dev (>= 1.0.45-~~), @ Restrictions: allow-stderr, skip-not-installable -Test-Command: /usr/share/cargo/bin/cargo-auto-test globset 0.4.9 --all-targets --no-default-features --features simd-accel +Test-Command: /usr/share/cargo/bin/cargo-auto-test globset 0.4.10 --all-targets --no-default-features --features serde +Features: test-name=librust-globset-dev:serde +Depends: dh-cargo (>= 18), librust-glob-0.3+default-dev, librust-lazy-static-1+default-dev, librust-serde-json-1+default-dev (>= 1.0.45-~~), @ +Restrictions: allow-stderr, skip-not-installable + +Test-Command: /usr/share/cargo/bin/cargo-auto-test globset 0.4.10 --all-targets --no-default-features --features serde1 +Features: test-name=librust-globset-dev:serde1 +Depends: dh-cargo (>= 18), librust-glob-0.3+default-dev, librust-lazy-static-1+default-dev, librust-serde-json-1+default-dev (>= 1.0.45-~~), @ +Restrictions: allow-stderr, skip-not-installable, flaky + +Test-Command: /usr/share/cargo/bin/cargo-auto-test globset 0.4.10 --all-targets --no-default-features --features simd-accel Features: test-name=librust-globset-dev:simd-accel Depends: dh-cargo (>= 18), librust-glob-0.3+default-dev, librust-lazy-static-1+default-dev, librust-serde-json-1+default-dev (>= 1.0.45-~~), @ Restrictions: allow-stderr, skip-not-installable -Test-Command: /usr/share/cargo/bin/cargo-auto-test globset 0.4.9 --all-targets --no-default-features +Test-Command: /usr/share/cargo/bin/cargo-auto-test globset 0.4.10 --all-targets --no-default-features Features: test-name=librust-globset-dev: Depends: dh-cargo (>= 18), librust-glob-0.3+default-dev, librust-lazy-static-1+default-dev, librust-serde-json-1+default-dev (>= 1.0.45-~~), @ Restrictions: allow-stderr, skip-not-installable diff -Nru rust-globset-0.4.9/README.md rust-globset-0.4.10/README.md --- rust-globset-0.4.9/README.md 2006-07-24 01:21:28.000000000 +0000 +++ rust-globset-0.4.10/README.md 2006-07-24 01:21:28.000000000 +0000 @@ -19,7 +19,7 @@ ```toml [dependencies] -globset = "0.3" +globset = "0.4" ``` ### Features @@ -78,12 +78,12 @@ This crate implements globs by converting them to regular expressions, and executing them with the -[`regex`](https://github.com/rust-lang-nursery/regex) +[`regex`](https://github.com/rust-lang/regex) crate. For single glob matching, performance of this crate should be roughly on par with the performance of the -[`glob`](https://github.com/rust-lang-nursery/glob) +[`glob`](https://github.com/rust-lang/glob) crate. (`*_regex` correspond to benchmarks for this library while `*_glob` correspond to benchmarks for the `glob` library.) Optimizations in the `regex` crate may propel this library past `glob`, @@ -108,7 +108,7 @@ test many_short_regex_set ... bench: 186 ns/iter (+/- 11) ``` -### Comparison with the [`glob`](https://github.com/rust-lang-nursery/glob) crate +### Comparison with the [`glob`](https://github.com/rust-lang/glob) crate * Supports alternate "or" globs, e.g., `*.{foo,bar}`. * Can match non-UTF-8 file paths correctly.