Merging debian version 1.66.0+dfsg1-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 36 insertions, 31 deletions

diff --git a/debian/copyright b/debian/copyright
index cd920fe5a..832050b28 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,6 +11,8 @@ Files-Excluded:
  vendor/mdbook/src/theme/FontAwesome
  vendor/mdbook/src/theme/highlight.js
  vendor/mdbook/src/theme/highlight.css
+# DOCX versions of TRPL book prepared for No Starch Press
+ src/doc/book/nostarch/docx
 # Exclude submodules https://github.com/rust-lang/rust/tree/master/src/tools
 # We prefer to do them in different Debian packages so they can have their own
 # version numbers. If upstream merges them "properly" (i.e. unify the version
@@ -43,12 +45,12 @@ Files-Excluded:
 # DO NOT EDIT below, AUTOGENERATED
  vendor/ahash-0.7.4
  vendor/anyhow-1.0.60
- vendor/anyhow-1.0.62
  vendor/anymap
  vendor/arbitrary
  vendor/ar
  vendor/arrayvec-0.7.0
  vendor/bitmaps
+ vendor/bumpalo
  vendor/byteorder
  vendor/bytesize
  vendor/camino-1.0.9
@@ -56,6 +58,8 @@ Files-Excluded:
  vendor/chalk-ir
  vendor/chalk-recursive
  vendor/chalk-solve
+ vendor/clap
+ vendor/clap_lex
  vendor/color-eyre
  vendor/color-spantrace
  vendor/combine
@@ -98,8 +102,6 @@ Files-Excluded:
  vendor/dunce
  vendor/either-1.6.0
  vendor/either-1.6.1
- vendor/enum-iterator
- vendor/enum-iterator-derive
  vendor/expect-test-1.0.1
  vendor/eyre
  vendor/filetime-0.2.14
@@ -107,6 +109,7 @@ Files-Excluded:
  vendor/flate2-1.0.16
  vendor/foreign-types
  vendor/foreign-types-shared
+ vendor/form_urlencoded-1.0.1
  vendor/fsevent-sys
  vendor/fs_extra-1.1.0
  vendor/fs_extra
@@ -115,7 +118,6 @@ Files-Excluded:
  vendor/fxhash
  vendor/generic-array-0.14.4
  vendor/getrandom-0.2.0
- vendor/getset
  vendor/gimli-0.26.1
  vendor/git2
  vendor/git2-curl
@@ -123,12 +125,12 @@ Files-Excluded:
  vendor/heck-0.3.3
  vendor/hex-0.3.2
  vendor/hex-0.4.2
+ vendor/home-0.5.3
  vendor/idna-0.2.0
  vendor/im-rc
  vendor/indenter
  vendor/inotify
  vendor/inotify-sys
- vendor/itertools-0.10.1
  vendor/itoa-1.0.2
  vendor/jemalloc-sys
  vendor/jod-thread
@@ -137,22 +139,22 @@ Files-Excluded:
  vendor/kstring
  vendor/libc-0.2.126
  vendor/libc-0.2.127
- vendor/libc-0.2.131
  vendor/libffi
  vendor/libffi-sys
  vendor/libgit2-sys
- vendor/libloading-0.6.7
  vendor/libloading-0.7.1
  vendor/libmimalloc-sys
  vendor/libnghttp2-sys
  vendor/libssh2-sys
  vendor/libz-sys
  vendor/linked-hash-map
+ vendor/lock_api-0.4.7
  vendor/log-0.4.14
  vendor/lzma-sys-0.1.16
  vendor/mach
- vendor/matches-0.1.8
+ vendor/matches
  vendor/mimalloc
+ vendor/miniz_oxide-0.5.3
  vendor/mio
  vendor/normalize-line-endings
  vendor/notify
@@ -163,14 +165,14 @@ Files-Excluded:
  vendor/openssl-probe
  vendor/openssl-src
  vendor/openssl-sys
+ vendor/ordered-float
  vendor/os_info
  vendor/owo-colors
  vendor/paste
+ vendor/percent-encoding-2.1.0
  vendor/pin-project-lite-0.2.8
- vendor/pkg-config-0.3.18
  vendor/pretty_env_logger
- vendor/proc-macro2-1.0.37
- vendor/proc-macro2-1.0.39
+ vendor/proc-macro2-1.0.46
  vendor/protobuf
  vendor/protobuf-support
  vendor/pulldown-cmark-to-cmark
@@ -181,6 +183,7 @@ Files-Excluded:
  vendor/regex-1.5.6
  vendor/regex-syntax-0.6.26
  vendor/region
+ vendor/rustc-build-sysroot
  vendor/rustc_version
  vendor/ryu-1.0.10
  vendor/ryu-1.0.5
@@ -192,51 +195,52 @@ Files-Excluded:
  vendor/security-framework-sys
  vendor/semver-1.0.12
  vendor/serde-1.0.137
+ vendor/serde-1.0.145
  vendor/serde_derive-1.0.137
+ vendor/serde_derive-1.0.145
  vendor/serde_ignored
  vendor/serde_json-1.0.81
- vendor/serde_json-1.0.83
+ vendor/serde_json-1.0.85
+ vendor/serde-value
  vendor/sha2-0.10.1
  vendor/sharded-slab-0.1.1
  vendor/similar
  vendor/sized-chunks
  vendor/slice-group-by
  vendor/smallvec-1.8.1
+ vendor/smallvec-1.9.0
  vendor/snap-1.0.1
  vendor/snapbox
  vendor/snapbox-macros
  vendor/socket2
  vendor/static_assertions
  vendor/strip-ansi-escapes
- vendor/syn-1.0.91
- vendor/syn-1.0.95
  vendor/target-lexicon
- vendor/thiserror-1.0.31
- vendor/thiserror-impl-1.0.31
+ vendor/thiserror-1.0.33
+ vendor/thiserror-impl-1.0.33
  vendor/threadpool
  vendor/tikv-jemallocator
  vendor/tikv-jemalloc-ctl
  vendor/tikv-jemalloc-sys
- vendor/tinyvec-0.3.4
  vendor/toml-0.5.7
+ vendor/toml_datetime
  vendor/toml_edit
  vendor/tracing-0.1.35
+ vendor/tracing-attributes-0.1.22
  vendor/tracing-core-0.1.28
  vendor/tracing-error
  vendor/tracing-log-0.1.2
- vendor/tracing-subscriber-0.3.3
+ vendor/tracing-subscriber
  vendor/tracing-tree-0.2.0
  vendor/typed-arena
  vendor/typenum-1.12.0
  vendor/ui_test
  vendor/unicode-bidi-0.3.4
  vendor/unicode-ident-1.0.0
- vendor/unicode-normalization-0.1.13
- vendor/unicode-width-0.1.8
- vendor/unicode-xid-0.2.2
+ vendor/unicode-width-0.1.9
+ vendor/url-2.2.2
  vendor/utf8parse
  vendor/vcpkg
- vendor/vergen
  vendor/version_check-0.9.3
  vendor/vte
  vendor/xattr-0.2.2
@@ -255,6 +259,7 @@ Files: C*.md
        configure
        config.toml.example
        git-commit-hash
+       git-commit-info
        library/*
        src/README.md
        src/bootstrap/*
@@ -567,10 +572,10 @@ License: MIT or Apache-2.0
 Comment: see https://github.com/chronotope/chrono
 
 Files: 
- vendor/clap/*
+ vendor/clap-3.*/*
  vendor/clap_complete/*
  vendor/clap_derive/*
- vendor/clap_lex/*
+ vendor/clap_lex-0.*/*
 Copyright: 2015-2022 Kevin K. <kbknapp@gmail.com>
 License: MIT
 Comment: see https://github.com/clap-rs/clap
@@ -918,11 +923,6 @@ Copyright: 2019-2019 Eliza Weisman <eliza@buoyant.io>
 License: MIT
 Comment: see https://github.com/hawkw/matchers
 
-Files: vendor/matches/*
-Copyright: 2014-2017 Simon Sapin <simon.sapin@exyr.org>
-License: MIT
-Comment: see https://github.com/SimonSapin
-
 Files: vendor/mdbook/*
 Copyright: 2015-2017 Mathieu David <mathieudavid@mathieudavid.org>
 License: MPL-2.0
@@ -1188,9 +1188,14 @@ Comment: see https://github.com/rust-analyzer/rowan
 
 Files: vendor/rustc-ap-rustc_lexer/*
 Copyright: 2010-2022 The Rust Project Developers
-License: MIT  or  Apache-2.0
+License: MIT or Apache-2.0
 Comment: see https://github.com/rust-lang/rust
 
+Files: vendor/rustc_tools_util/*
+Copyright: 2014-2022 The Rust Project Developers
+License: MIT or Apache-2.0
+Comment: see https://github.com/rust-lang/rust-clippy/tree/master/rustc_tools_util
+
 Files: vendor/rustc-semver/*
 Copyright: 2020-2020 flip1995 <hello@philkrones.com>
 License: MIT OR Apache-2.0
@@ -1395,7 +1400,7 @@ Files:
  vendor/tracing-attributes/*
  vendor/tracing-core/*
  vendor/tracing-log/*
- vendor/tracing-subscriber/*
+ vendor/tracing-subscriber-0.*/*
 Copyright:
  2018-2020 Eliza Weisman <eliza@buoyant.io>
  2018-2020 Tokio Contributors <team@tokio.rs>