[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1110080: marked as done (bookworm-pu: package rustc-web/1.85.0+dfsg3-1~deb12u1)

Your message dated Sat, 06 Sep 2025 12:14:50 +0100
with message-id <ee4c0876608d99eb3f8b333b556fbd92e7a652eb.camel@adam-barratt.org.uk>
and subject line Closing p-u requests for fixes included in 12.12
has caused the Debian Bug report #1110080,
regarding bookworm-pu: package rustc-web/1.85.0+dfsg3-1~deb12u1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1110080: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1110080
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian.org@packages.debian.org
Usertags: pu
Control: affects -1 + src:rustc-web

[ Reason ]
Chromium and firefox-esr both require newer versions of rustc than we currently have in bookworm. This is an update to rustc-web to match the 1.85.0 version that trixie will soon release with. I've already confirmed with firefox maintainers that 1.85 is new enough for the upcoming firefox-esr 140.
It's pretty straightforward, as I only needed to fix one minor issue (se the changelog bug closure). Like Emilio's previous rustc-web upload (1.78.0), I needed to embed a newer version of libgit2; I pulled the 1.9.0 orig.tar.xz from trixie. 

[ Impact ]
There should be no impact for bookworm users, as packages in stable must
explicitly choose to build against rustc-web. I believe that the only ones doing so are chromium and firefox-esr. 

[ Tests ]
Chromium 138.0.7204.168-1~deb12u1 successfully builds & runs on bookworm using this rustc-web package. 

[ Risks ]
Low/no risk.

[ Checklist ]
 [x] *all* changes are documented in the d/changelog
 [x] I reviewed all changes and I approve them
 [X] attach debdiff against the package in stable
 [x] the issue is verified as fixed in unstable

[ Changes ]
Along with libgit2*.orig.tar.xz, there's the updated bootstrap compilers in rustc-web*.orig-stage0.tar.xz. The changelog entry: 
 .
   * Non-maintainer upload.
   * Backport to bookworm, as required by newer firefox & chromium.
   * Rename rustc & friends to rustc-web or similar.
   * Generate & include bootstrap compilers via orig-stage0.tar.xz.
   * Disable wasm, -all, and -llvm packages.
   * Vendor libgit2 dependency, switching from llhttp/builtin to the
     (debian package) http-parser.
   * Increase allowed test failures up to 15 to work around random fails.
   * Add 'Provides: cargo' for cargo-web (closes: #1084926).

I've attached a diff against trixie's rustc 1.85.0+dfsg3-1.

Thanks,
Andres

diff -urN a/rustc-1.85.0+dfsg3/debian/cargo-doc.docs b/rustc-web-1.85.0+dfsg3/debian/cargo-doc.docs
--- a/rustc-1.85.0+dfsg3/debian/cargo-doc.docs	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/cargo-doc.docs	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/share/doc/cargo/reference
-usr/share/doc/cargo/book
diff -urN a/rustc-1.85.0+dfsg3/debian/cargo-web-doc.docs b/rustc-web-1.85.0+dfsg3/debian/cargo-web-doc.docs
--- a/rustc-1.85.0+dfsg3/debian/cargo-web-doc.docs	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/cargo-web-doc.docs	2025-03-17 18:06:58.000000000 +0000
@@ -0,0 +1,2 @@
+usr/share/doc/cargo/reference
+usr/share/doc/cargo/book
diff -urN a/rustc-1.85.0+dfsg3/debian/cargo-web.bash-completion b/rustc-web-1.85.0+dfsg3/debian/cargo-web.bash-completion
--- a/rustc-1.85.0+dfsg3/debian/cargo-web.bash-completion	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/cargo-web.bash-completion	2025-03-17 18:06:58.000000000 +0000
@@ -0,0 +1 @@
+etc/bash_completion.d/cargo cargo
diff -urN a/rustc-1.85.0+dfsg3/debian/cargo-web.install b/rustc-web-1.85.0+dfsg3/debian/cargo-web.install
--- a/rustc-1.85.0+dfsg3/debian/cargo-web.install	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/cargo-web.install	2025-03-17 18:06:58.000000000 +0000
@@ -0,0 +1,4 @@
+usr/bin/cargo
+debian/scripts/*                        usr/share/cargo/scripts
+debian/bin/cargo                        usr/share/cargo/bin
+usr/share/zsh/site-functions/_cargo     usr/share/zsh/vendor-completions
diff -urN a/rustc-1.85.0+dfsg3/debian/cargo-web.manpages b/rustc-web-1.85.0+dfsg3/debian/cargo-web.manpages
--- a/rustc-1.85.0+dfsg3/debian/cargo-web.manpages	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/cargo-web.manpages	2025-03-17 18:06:58.000000000 +0000
@@ -0,0 +1,2 @@
+usr/share/man/man1/cargo-*.1
+usr/share/man/man1/cargo.1
diff -urN a/rustc-1.85.0+dfsg3/debian/cargo.bash-completion b/rustc-web-1.85.0+dfsg3/debian/cargo.bash-completion
--- a/rustc-1.85.0+dfsg3/debian/cargo.bash-completion	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/cargo.bash-completion	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-etc/bash_completion.d/cargo cargo
diff -urN a/rustc-1.85.0+dfsg3/debian/cargo.install b/rustc-web-1.85.0+dfsg3/debian/cargo.install
--- a/rustc-1.85.0+dfsg3/debian/cargo.install	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/cargo.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-usr/bin/cargo
-debian/scripts/*                        usr/share/cargo/scripts
-debian/bin/cargo                        usr/share/cargo/bin
-usr/share/zsh/site-functions/_cargo     usr/share/zsh/vendor-completions
diff -urN a/rustc-1.85.0+dfsg3/debian/cargo.manpages b/rustc-web-1.85.0+dfsg3/debian/cargo.manpages
--- a/rustc-1.85.0+dfsg3/debian/cargo.manpages	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/cargo.manpages	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/share/man/man1/cargo-*.1
-usr/share/man/man1/cargo.1
diff -urN a/rustc-1.85.0+dfsg3/debian/changelog b/rustc-web-1.85.0+dfsg3/debian/changelog
--- a/rustc-1.85.0+dfsg3/debian/changelog	2025-04-24 15:47:57.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/changelog	2025-07-27 21:04:10.000000000 +0000
@@ -1,3 +1,17 @@
+rustc-web (1.85.0+dfsg3-1~deb12u1) bookworm; urgency=medium
+
+  * Non-maintainer upload.
+  * Backport to bookworm, as required by newer firefox & chromium.
+  * Rename rustc & friends to rustc-web or similar.
+  * Generate & include bootstrap compilers via orig-stage0.tar.xz.
+  * Disable wasm, -all, and -llvm packages.
+  * Vendor libgit2 dependency, switching from llhttp/builtin to the
+    (debian package) http-parser.
+  * Increase allowed test failures up to 15 to work around random fails.
+  * Add 'Provides: cargo' for cargo-web (closes: #1084926).
+
+ -- Andres Salomon <dilinger@debian.org>  Sun, 27 Jul 2025 21:04:10 +0000
+
 rustc (1.85.0+dfsg3-1) unstable; urgency=medium
 
   * backport fix for gix-features CVE-2025-31130
diff -urN a/rustc-1.85.0+dfsg3/debian/control b/rustc-web-1.85.0+dfsg3/debian/control
--- a/rustc-1.85.0+dfsg3/debian/control	2025-04-11 11:13:51.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/control	2025-07-27 21:04:10.000000000 +0000
@@ -1,4 +1,4 @@
-Source: rustc
+Source: rustc-web
 Section: devel
 Priority: optional
 Maintainer: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
@@ -13,9 +13,6 @@
  debhelper-compat (= 13),
  dpkg-dev (>= 1.17.14),
  python3:native,
- cargo:native (>= 1.84.0+dfsg)      <!pkg.rustc.dlstage0>,
- rustc:native (>= 1.84.0+dfsg) <!pkg.rustc.dlstage0>,
- rustc:native (<= 1.85.0+dfsg++)    <!pkg.rustc.dlstage0>,
  llvm-19-dev:native,
  llvm-19-tools:native,
  gcc-mingw-w64-x86-64-posix:native [amd64] <pkg.rustc.windows>,
@@ -38,8 +35,8 @@
  libssh2-1-dev,
  libssl-dev,
  libsqlite3-dev,
- libgit2-dev (>= 1.9),
- libgit2-dev (<< 1.10~~),
+# needed by libgit2-dev, which is now vendored
+ libpcre3-dev,
  libhttp-parser-dev,
  libonig-dev,
 # test dependencies:
@@ -53,8 +50,6 @@
  curl <pkg.rustc.dlstage0>,
  ca-certificates <pkg.rustc.dlstage0>,
 Build-Depends-Indep:
- wasi-libc (>= 0.0~git20241209.574b88d~~) <!nowasm>,
- wasi-libc (<= 0.0~git20241209.574b88d++) <!nowasm>,
  clang-19:native,
 # see #1057780, gdb now Conflicts gdb-minimal
 #Build-Conflicts: gdb-minimal <!nocheck>
@@ -63,20 +58,19 @@
 Vcs-Git: https://salsa.debian.org/rust-team/rust.git
 Vcs-Browser: https://salsa.debian.org/rust-team/rust
 
-Package: rustc
+Package: rustc-web
 Architecture: any
 Multi-Arch: allowed
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libstd-rust-dev (= ${binary:Version}),
+ libstd-rust-web-dev (= ${binary:Version}),
  gcc, libc-dev, binutils (>= 2.26)
 Recommends:
- cargo (= ${binary:Version}),
-# llvm is needed for llvm-dwp for -C split-debuginfo=packed
- rust-llvm,
-Replaces: libstd-rust-dev (<< 1.25.0+dfsg1-2~~)
+ cargo-web (= ${binary:Version})
+Provides: rustc (= ${binary:Version})
+Replaces: libstd-rust-dev (<< 1.25.0+dfsg1-2~~), rustc, rustc-mozilla
 Breaks: libstd-rust-dev (<< 1.25.0+dfsg1-2~~),
-Conflicts: rustup
+Conflicts: rustup, rustc, rustc-mozilla, rustup
 Description: Rust systems programming language
  Rust is a curly-brace, block-structured expression language.  It
  visually resembles the C language family, but differs significantly
@@ -90,13 +84,15 @@
  generic programming and meta-programming, in both static and dynamic
  styles.
 
-Package: libstd-rust-1.85
+Package: libstd-rust-web-1.85
 Section: libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: rustup
+Conflicts: rustup, libstd-rust-1.85
+Replaces: libstd-rust-1.85
+Provides: libstd-rust-1.85
 Description: Rust standard libraries
  Rust is a curly-brace, block-structured expression language.  It
  visually resembles the C language family, but differs significantly
@@ -113,13 +109,15 @@
  This package contains the standard Rust libraries, built as dylibs,
  needed to run dynamically-linked Rust programs (-C prefer-dynamic).
 
-Package: libstd-rust-dev
+Package: libstd-rust-web-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libstd-rust-1.85 (= ${binary:Version}),
-Conflicts: rustup
+ libstd-rust-web-1.85 (= ${binary:Version}),
+Conflicts: rustup, libstd-rust-dev, libstd-rust-mozilla-dev
+Provides: libstd-rust-dev (= ${binary:Version})
+Replaces: libstd-rust-dev, libstd-rust-mozilla-dev
 Description: Rust standard libraries - development files
  Rust is a curly-brace, block-structured expression language.  It
  visually resembles the C language family, but differs significantly
@@ -137,7 +135,7 @@
  needed to compile Rust programs. It may also be installed on a system
  of another host architecture, for cross-compiling to this architecture.
 
-Package: libstd-rust-dev-windows
+Package: libstd-rust-web-dev-windows
 Section: libdevel
 Architecture: amd64 i386
 Multi-Arch: same
@@ -145,6 +143,8 @@
 Recommends:
  gcc-mingw-w64-x86-64-posix [amd64],
  gcc-mingw-w64-i686-posix [i386],
+Conflicts: libstd-rust-dev-windows, libstd-rust-mozilla-dev-windows
+Replaces: libstd-rust-mozilla-dev-windows
 Build-Profiles: <pkg.rustc.windows>
 Description: Rust standard libraries - development files
  Rust is a curly-brace, block-structured expression language.  It
@@ -163,41 +163,12 @@
  needed to cross-compile Rust programs to the *-pc-windows-gnu target
  corresponding to the architecture of this package.
 
-Package: libstd-rust-dev-wasm32
-Section: libdevel
-Architecture: all
-Multi-Arch: foreign
-Depends: ${shlibs:Depends}, ${misc:Depends}
-# Embeds wasi-libc so doesn't need to depend on it
-# None of its licenses require source redistrib, so no need for Built-Using
-Recommends:
- lld-19, clang-19,
-Suggests:
-# nodejs contains wasi-node for running the program
- nodejs (>= 12.16),
-Build-Profiles: <!nowasm>
-Description: Rust standard libraries - development files
- Rust is a curly-brace, block-structured expression language.  It
- visually resembles the C language family, but differs significantly
- in syntactic and semantic details.  Its design is oriented toward
- concerns of "programming in the large", that is, of creating and
- maintaining boundaries - both abstract and operational - that
- preserve large-system integrity, availability and concurrency.
- .
- It supports a mixture of imperative procedural, concurrent actor,
- object-oriented and pure functional styles.  Rust also supports
- generic programming and meta-programming, in both static and dynamic
- styles.
- .
- This package contains the standard Rust libraries including development files,
- needed to cross-compile Rust programs to the wasm32-unknown-unknown and
- wasm32-wasip1/wasm32-wasip2 targets.
-
-Package: rust-gdb
+Package: rust-web-gdb
 Architecture: all
 Depends: gdb, ${misc:Depends}
 Suggests: gdb-doc
-Replaces: rustc (<< 1.1.0+dfsg1-1)
+Conflicts: rust-gdb, rust-mozilla-gdb
+Replaces: rustc (<< 1.1.0+dfsg1-1), rust-mozilla-gdb
 Description: Rust debugger (gdb)
  Rust is a curly-brace, block-structured expression language.  It
  visually resembles the C language family, but differs significantly
@@ -214,11 +185,12 @@
  This package contains pretty printers and a wrapper script for
  invoking gdb on rust binaries.
 
-Package: rust-lldb
+Package: rust-web-lldb
 Architecture: all
 # When updating, also update rust-lldb.links
 Depends: lldb-19, ${misc:Depends}, python3-lldb-19
-Replaces: rustc (<< 1.1.0+dfsg1-1)
+Replaces: rustc (<< 1.1.0+dfsg1-1), rust-mozilla-lldb
+Conflicts: rust-lldb, rust-mozilla-lldb
 Description: Rust debugger (lldb)
  Rust is a curly-brace, block-structured expression language.  It
  visually resembles the C language family, but differs significantly
@@ -235,45 +207,15 @@
  This package contains pretty printers and a wrapper script for
  invoking lldb on rust binaries.
 
-Package: rust-llvm
-Architecture: any
-Breaks:
- rustc (<< 1.71.1+dfsg1-1~exp1),
- rustc-web (<< 1.71.1+dfsg1-1~exp1),
- rustc-mozilla (<< 1.71.1+dfsg1-1~exp1),
-Replaces:
- rustc (<< 1.71.1+dfsg1-1~exp1),
- rustc-web (<< 1.71.1+dfsg1-1~exp1),
- rustc-mozilla (<< 1.71.1+dfsg1-1~exp1),
-Depends: ${shlibs:Depends}, ${misc:Depends},
-# lld and clang are needed for wasm compilation
- lld-19, clang-19,
-# llvm is needed for llvm-dwp for split-debuginfo=packed
- llvm-19
-Description: Rust LLVM integration
- Rust is a curly-brace, block-structured expression language.  It
- visually resembles the C language family, but differs significantly
- in syntactic and semantic details.  Its design is oriented toward
- concerns of "programming in the large", that is, of creating and
- maintaining boundaries - both abstract and operational - that
- preserve large-system integrity, availability and concurrency.
- .
- It supports a mixture of imperative procedural, concurrent actor,
- object-oriented and pure functional styles.  Rust also supports
- generic programming and meta-programming, in both static and dynamic
- styles.
- .
- This package contains symlinks for integration with LLVM tools such as lld and
- grcov, and the wasm-component-ld helper binary for the wasm-wasip2 target.
-
-Package: rust-doc
+Package: rust-web-doc
 Section: doc
 Architecture: all
 Build-Profiles: <!nodoc>
 Depends: ${misc:Depends},
  libjs-jquery, libjs-highlight.js, libjs-mathjax,
  fonts-open-sans, fonts-font-awesome
-Recommends: cargo-doc
+Recommends: cargo-web-doc
+Conflicts: rust-doc, rust-mozilla-doc
 Description: Rust systems programming language - Documentation
  Rust is a curly-brace, block-structured expression language.  It
  visually resembles the C language family, but differs significantly
@@ -290,10 +232,11 @@
  This package contains the Rust tutorial, language reference and
  standard library documentation.
 
-Package: rust-src
+Package: rust-web-src
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: rustup
+Conflicts: rustup, rust-src, rust-mozilla-src
+Replaces: rust-mozilla-src
 Description: Rust systems programming language - source code
  Rust is a curly-brace, block-structured expression language.  It
  visually resembles the C language family, but differs significantly
@@ -310,13 +253,13 @@
  This package contains sources of the Rust compiler and standard
  libraries, useful for IDEs and code analysis tools such as Racer.
 
-Package: rust-clippy
+Package: rust-web-clippy
 Architecture: any
 Multi-Arch: allowed
 Depends: ${misc:Depends}, ${shlibs:Depends},
- libstd-rust-1.85 (= ${binary:Version})
-Conflicts: rustup
-Recommends: cargo
+ libstd-rust-web-1.85 (= ${binary:Version})
+Conflicts: rustup, rust-clippy
+Recommends: cargo-web
 Description: Rust linter
  Rust is a curly-brace, block-structured expression language.  It
  visually resembles the C language family, but differs significantly
@@ -339,13 +282,13 @@
  .
  Clippy is integrated into the 'cargo' build tool, available via 'cargo clippy'.
 
-Package: rustfmt
+Package: rustfmt-web
 Architecture: any
 Multi-Arch: allowed
 Depends: ${misc:Depends}, ${shlibs:Depends},
  libstd-rust-1.85 (= ${binary:Version}),
-Conflicts: rustup
-Recommends: cargo
+Conflicts: rustup, rustfmt
+Recommends: cargo-web
 Description: Rust formatting helper
  Rust is a curly-brace, block-structured expression language.  It
  visually resembles the C language family, but differs significantly
@@ -363,13 +306,13 @@
  style guidelines, as well as 'cargo-fmt', a helper enabling running rustfmt
  directly with 'cargo fmt'.
 
-Package: rust-analyzer
+Package: rust-web-analyzer
 Architecture: any
 Multi-Arch: allowed
 Depends: ${misc:Depends}, ${shlibs:Depends},
- libstd-rust-1.85 (= ${binary:Version}),
-Conflicts: rustup
-Recommends: cargo
+ libstd-rust-web-1.85 (= ${binary:Version}),
+Conflicts: rustup, rust-analyzer, rust-mozilla-analyzer
+Recommends: cargo-web
 Description: Rust Language Server Protocol (LSP) implementation
  Rust is a curly-brace, block-structured expression language.  It
  visually resembles the C language family, but differs significantly
@@ -387,48 +330,17 @@
  Server Protocol for the Rust language. It provides features like completion
  and goto definition for many editors, like Emacs and (Neo)Vim.
 
-Package: rust-all
-Architecture: all
-Depends: ${misc:Depends}, ${shlibs:Depends},
- rustc (>= ${binary:Version}),
- rustfmt (>= ${binary:Version}),
- rust-analyzer (>= ${binary:Version}),
- rust-clippy (>= ${binary:Version}),
- rust-gdb (>= ${binary:Version}) | rust-lldb (>= ${binary:Version}),
- rust-llvm (>= ${binary:Version}),
- cargo,
-Recommends:
- cargo (= ${binary:Version})
-Suggests:
- rust-doc (>= ${binary:Version}),
- rust-src (>= ${binary:Version}),
- libstd-rust-dev-wasm32 (>= ${binary:Version}),
-Description: Rust systems programming language - all developer tools
- Rust is a curly-brace, block-structured expression language.  It
- visually resembles the C language family, but differs significantly
- in syntactic and semantic details.  Its design is oriented toward
- concerns of "programming in the large", that is, of creating and
- maintaining boundaries - both abstract and operational - that
- preserve large-system integrity, availability and concurrency.
- .
- It supports a mixture of imperative procedural, concurrent actor,
- object-oriented and pure functional styles.  Rust also supports
- generic programming and meta-programming, in both static and dynamic
- styles.
- .
- This package is an empty metapackage that depends on all developer tools
- in the standard rustc distribution that have been packaged for Debian.
-
 # Cargo binaries
-Package: cargo
+Package: cargo-web
 Architecture: any
 Multi-Arch: allowed
 Depends: ${shlibs:Depends}, ${misc:Depends},
-         rustc (= ${binary:Version}),
+         rustc-web (= ${binary:Version}),
          binutils,
          gcc | clang | c-compiler
-Conflicts: rustup
-Suggests: cargo-doc, python3
+Conflicts: rustup, cargo, cargo-mozilla
+Suggests: cargo-web-doc, python3
+Provides: cargo
 Description: Rust package manager
  Cargo is a tool that allows Rust projects to declare their various
  dependencies, and ensure that you'll always get a repeatable build.
@@ -443,11 +355,13 @@
  Cargo downloads your Rust project's dependencies and compiles your
  project.
 
-Package: cargo-doc
+Package: cargo-web-doc
 Section: doc
 Architecture: all
 Build-Profiles: <!nodoc>
-Recommends: rust-doc
+Recommends: rust-web-doc
+Conflicts: cargo-doc
+Provides: cargo-doc
 Depends: ${misc:Depends}
 Description: Rust package manager, documentation
  Cargo is a tool that allows Rust projects to declare their various
Binary files a/rustc-1.85.0+dfsg3/debian/libgit2_1.9.0+ds.orig.tar.xz and b/rustc-web-1.85.0+dfsg3/debian/libgit2_1.9.0+ds.orig.tar.xz differ
diff -urN a/rustc-1.85.0+dfsg3/debian/libstd-rust-1.85.install b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-1.85.install
--- a/rustc-1.85.0+dfsg3/debian/libstd-rust-1.85.install	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-1.85.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/
diff -urN a/rustc-1.85.0+dfsg3/debian/libstd-rust-1.85.lintian-overrides b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-1.85.lintian-overrides
--- a/rustc-1.85.0+dfsg3/debian/libstd-rust-1.85.lintian-overrides	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-1.85.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-# "libstd" just seemed too generic
-libstd-rust-1.85 binary: package-name-doesnt-match-sonames
-libstd-rust-1.85 binary: sharedobject-in-library-directory-missing-soname
-
-# Rust doesn't use dev shlib symlinks nor any of the other shlib support stuff
-libstd-rust-1.85 binary: dev-pkg-without-shlib-symlink
-libstd-rust-1.85 binary: shlib-without-versioned-soname
-libstd-rust-1.85 binary: unused-shlib-entry-in-control-file
-
-# can trigger if all its so files' hashes start with a latter and not a digit
-libstd-rust-1.85 binary: empty-shlibs
-
-# Libraries that use libc symbols (libterm, libstd, etc) *are* linked
-# to libc.  Lintian gets upset that some Rust libraries don't need
-# libc, boo hoo.
-libstd-rust-1.85 binary: library-not-linked-against-libc
diff -urN a/rustc-1.85.0+dfsg3/debian/libstd-rust-1.85.triggers b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-1.85.triggers
--- a/rustc-1.85.0+dfsg3/debian/libstd-rust-1.85.triggers	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-1.85.triggers	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-# normally added by dh_makeshlibs, but fails for our versioning scheme
-activate-noawait ldconfig
diff -urN a/rustc-1.85.0+dfsg3/debian/libstd-rust-dev-wasm32.install b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-dev-wasm32.install
--- a/rustc-1.85.0+dfsg3/debian/libstd-rust-dev-wasm32.install	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-dev-wasm32.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/rustlib/wasm32-*/lib/
diff -urN a/rustc-1.85.0+dfsg3/debian/libstd-rust-dev-wasm32.lintian-overrides b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-dev-wasm32.lintian-overrides
--- a/rustc-1.85.0+dfsg3/debian/libstd-rust-dev-wasm32.lintian-overrides	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-dev-wasm32.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-# wasm object files count as arch-independent for now,
-# at least until we starting offering Debian in wasm
-libstd-rust-dev-wasm32 binary: arch-independent-package-contains-binary-or-object *
-
-# lintian doesn't understand rlib files
-libstd-rust-dev-wasm32 binary: no-code-sections *
diff -urN a/rustc-1.85.0+dfsg3/debian/libstd-rust-dev-windows.install b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-dev-windows.install
--- a/rustc-1.85.0+dfsg3/debian/libstd-rust-dev-windows.install	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-dev-windows.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/rustlib/${env:WINDOWS_ARCH}-pc-windows-gnu/lib/
diff -urN a/rustc-1.85.0+dfsg3/debian/libstd-rust-dev-windows.lintian-overrides b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-dev-windows.lintian-overrides
--- a/rustc-1.85.0+dfsg3/debian/libstd-rust-dev-windows.lintian-overrides	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-dev-windows.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-# lintian does not know about rust arch-specific directories
-libstd-rust-dev-windows binary: arch-dependent-file-not-in-arch-specific-directory [usr/lib/rustlib/*/lib/lib*.rlib]
-libstd-rust-dev-windows binary: arch-dependent-file-not-in-arch-specific-directory [usr/lib/rustlib/*/lib/lib*.a]
-libstd-rust-dev-windows binary: executable-not-elf-or-script [usr/lib/rustlib/*/lib/*.dll]
-
-# lintian doesn't understand these files
-libstd-rust-dev-windows binary: no-code-sections [*.rlib]
-libstd-rust-dev-windows binary: no-code-sections [usr/lib/rustlib/*-pc-windows-gnu/lib/lib*.dll.a]
diff -urN a/rustc-1.85.0+dfsg3/debian/libstd-rust-dev.install b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-dev.install
--- a/rustc-1.85.0+dfsg3/debian/libstd-rust-dev.install	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-dev.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/lib/
diff -urN a/rustc-1.85.0+dfsg3/debian/libstd-rust-dev.lintian-overrides b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-dev.lintian-overrides
--- a/rustc-1.85.0+dfsg3/debian/libstd-rust-dev.lintian-overrides	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-dev.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-# lintian does not know about rust arch-specific directories
-libstd-rust-dev binary: arch-dependent-file-not-in-arch-specific-directory [usr/lib/rustlib/*/lib/lib*.rlib]
-libstd-rust-dev binary: breakout-link usr/lib/rustlib/*/lib/lib*.so -> usr/lib/*/lib*.so
-
-# lintian doesn't understand rlib files
-libstd-rust-dev binary: no-code-sections [*.rlib]
-
-# See debhelper bug #875780. This override is commented out because it's not
-# always needed, but we want it here for documentation purposes. Basically,
-# if you see it then you probably don't need to worry about it.
-#libstd-rust-dev binary: unstripped-static-library usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/lib*.rlib(*)
diff -urN a/rustc-1.85.0+dfsg3/debian/libstd-rust-web-1.85.install b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-web-1.85.install
--- a/rustc-1.85.0+dfsg3/debian/libstd-rust-web-1.85.install	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-web-1.85.install	2025-03-17 18:06:58.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/
diff -urN a/rustc-1.85.0+dfsg3/debian/libstd-rust-web-1.85.lintian-overrides b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-web-1.85.lintian-overrides
--- a/rustc-1.85.0+dfsg3/debian/libstd-rust-web-1.85.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-web-1.85.lintian-overrides	2025-03-17 18:06:58.000000000 +0000
@@ -0,0 +1,16 @@
+# "libstd" just seemed too generic
+libstd-rust-1.85 binary: package-name-doesnt-match-sonames
+libstd-rust-1.85 binary: sharedobject-in-library-directory-missing-soname
+
+# Rust doesn't use dev shlib symlinks nor any of the other shlib support stuff
+libstd-rust-1.85 binary: dev-pkg-without-shlib-symlink
+libstd-rust-1.85 binary: shlib-without-versioned-soname
+libstd-rust-1.85 binary: unused-shlib-entry-in-control-file
+
+# can trigger if all its so files' hashes start with a latter and not a digit
+libstd-rust-1.85 binary: empty-shlibs
+
+# Libraries that use libc symbols (libterm, libstd, etc) *are* linked
+# to libc.  Lintian gets upset that some Rust libraries don't need
+# libc, boo hoo.
+libstd-rust-1.85 binary: library-not-linked-against-libc
diff -urN a/rustc-1.85.0+dfsg3/debian/libstd-rust-web-1.85.triggers b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-web-1.85.triggers
--- a/rustc-1.85.0+dfsg3/debian/libstd-rust-web-1.85.triggers	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-web-1.85.triggers	2025-03-17 18:06:58.000000000 +0000
@@ -0,0 +1,2 @@
+# normally added by dh_makeshlibs, but fails for our versioning scheme
+activate-noawait ldconfig
diff -urN a/rustc-1.85.0+dfsg3/debian/libstd-rust-web-dev-windows.install b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-web-dev-windows.install
--- a/rustc-1.85.0+dfsg3/debian/libstd-rust-web-dev-windows.install	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-web-dev-windows.install	2025-03-17 18:06:58.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/rustlib/${env:WINDOWS_ARCH}-pc-windows-gnu/lib/
diff -urN a/rustc-1.85.0+dfsg3/debian/libstd-rust-web-dev-windows.lintian-overrides b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-web-dev-windows.lintian-overrides
--- a/rustc-1.85.0+dfsg3/debian/libstd-rust-web-dev-windows.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-web-dev-windows.lintian-overrides	2025-03-17 18:06:58.000000000 +0000
@@ -0,0 +1,8 @@
+# lintian does not know about rust arch-specific directories
+libstd-rust-dev-windows binary: arch-dependent-file-not-in-arch-specific-directory [usr/lib/rustlib/*/lib/lib*.rlib]
+libstd-rust-dev-windows binary: arch-dependent-file-not-in-arch-specific-directory [usr/lib/rustlib/*/lib/lib*.a]
+libstd-rust-dev-windows binary: executable-not-elf-or-script [usr/lib/rustlib/*/lib/*.dll]
+
+# lintian doesn't understand these files
+libstd-rust-dev-windows binary: no-code-sections [*.rlib]
+libstd-rust-dev-windows binary: no-code-sections [usr/lib/rustlib/*-pc-windows-gnu/lib/lib*.dll.a]
diff -urN a/rustc-1.85.0+dfsg3/debian/libstd-rust-web-dev.install b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-web-dev.install
--- a/rustc-1.85.0+dfsg3/debian/libstd-rust-web-dev.install	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-web-dev.install	2025-03-17 18:06:58.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/lib/
diff -urN a/rustc-1.85.0+dfsg3/debian/libstd-rust-web-dev.lintian-overrides b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-web-dev.lintian-overrides
--- a/rustc-1.85.0+dfsg3/debian/libstd-rust-web-dev.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/libstd-rust-web-dev.lintian-overrides	2025-03-17 18:06:58.000000000 +0000
@@ -0,0 +1,11 @@
+# lintian does not know about rust arch-specific directories
+libstd-rust-dev binary: arch-dependent-file-not-in-arch-specific-directory [usr/lib/rustlib/*/lib/lib*.rlib]
+libstd-rust-dev binary: breakout-link usr/lib/rustlib/*/lib/lib*.so -> usr/lib/*/lib*.so
+
+# lintian doesn't understand rlib files
+libstd-rust-dev binary: no-code-sections [*.rlib]
+
+# See debhelper bug #875780. This override is commented out because it's not
+# always needed, but we want it here for documentation purposes. Basically,
+# if you see it then you probably don't need to worry about it.
+#libstd-rust-dev binary: unstripped-static-library usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/lib*.rlib(*)
diff -urN a/rustc-1.85.0+dfsg3/debian/make_orig-stage0_tarball.sh b/rustc-web-1.85.0+dfsg3/debian/make_orig-stage0_tarball.sh
--- a/rustc-1.85.0+dfsg3/debian/make_orig-stage0_tarball.sh	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/make_orig-stage0_tarball.sh	2025-07-27 21:04:10.000000000 +0000
@@ -28,7 +28,7 @@
 touch --date="$stamp" stage0/dpkg-source-dont-rename-parent-directory
 tar --mtime="$stamp" --clamp-mtime \
   --owner=root --group=root \
-  -cJf "../rustc_${upstream_version}.orig-stage0.tar.xz" \
+  -cJf "../rustc-web_${upstream_version}.orig-stage0.tar.xz" \
   --transform "s/^stage0\///" \
   stage0/*
 
@@ -36,7 +36,7 @@
 
 cat <<eof
 ================================================================================
-orig-stage0 bootstrapping tarball created in ../rustc_${upstream_version}.orig-stage0.tar.xz
+orig-stage0 bootstrapping tarball created in ../rustc-web_${upstream_version}.orig-stage0.tar.xz
 containing the upstream compilers for $upstream_bootstrap_arch
 
 You *probably* now want to do the following steps:
diff -urN a/rustc-1.85.0+dfsg3/debian/not-installed b/rustc-web-1.85.0+dfsg3/debian/not-installed
--- a/rustc-1.85.0+dfsg3/debian/not-installed	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/not-installed	2025-07-27 21:04:10.000000000 +0000
@@ -24,3 +24,6 @@
 
 # backup files from the previous stages
 usr/bin/*.old
+
+# -wasm is disabled
+usr/lib/rustlib/x86_64-unknown-linux-gnu/bin/wasm-component-ld
diff -urN a/rustc-1.85.0+dfsg3/debian/patches/vendor/use-vendored-libgit.patch b/rustc-web-1.85.0+dfsg3/debian/patches/vendor/use-vendored-libgit.patch
--- a/rustc-1.85.0+dfsg3/debian/patches/vendor/use-vendored-libgit.patch	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/patches/vendor/use-vendored-libgit.patch	2025-07-27 21:04:10.000000000 +0000
@@ -0,0 +1,54 @@
+Author: Emilio Pozuelo Monfort <pochu@debian.org>
+
+Use vendored libgit
+
+--- a/vendor/libgit2-sys/build.rs	2025-07-28 07:25:59.798563861 +0000
++++ b/vendor/libgit2-sys/build.rs	2025-07-28 07:26:38.217269817 +0000
+@@ -55,7 +55,7 @@
+     }
+ 
+     // To use zlib-ng in zlib-compat mode, we have to build libgit2 ourselves.
+-    let try_to_use_system_libgit2 = !vendored && !zlib_ng_compat;
++    let try_to_use_system_libgit2 = false;
+     if try_to_use_system_libgit2 && try_system_libgit2().is_ok() {
+         // using system libgit2 has worked
+         return;
+@@ -96,8 +96,8 @@
+     add_c_files(&mut cfg, "libgit2/src/libgit2/streams");
+ 
+     // Always use bundled HTTP parser (llhttp) for now
+-    cfg.include("libgit2/deps/llhttp");
+-    add_c_files(&mut cfg, "libgit2/deps/llhttp");
++    cfg.flag("-DUSE_HTTP_PARSER=http-parser")
++    .flag("-DGIT_HTTPPARSER_HTTPPARSER");
+ 
+     // external/system xdiff is not yet supported
+     cfg.include("libgit2/deps/xdiff");
+@@ -110,7 +110,7 @@
+     // reasons, just define on the command-line for everything. Perhaps there
+     // is some way with cc to have different instructions per-file?
+     cfg.define("GIT_REGEX_BUILTIN", "1")
+-        .include("libgit2/deps/pcre")
++        //.include("libgit2/deps/pcre")
+         .define("HAVE_STDINT_H", Some("1"))
+         .define("HAVE_MEMMOVE", Some("1"))
+         .define("NO_RECURSE", Some("1"))
+@@ -124,7 +124,8 @@
+         .define("MAX_NAME_COUNT", Some("10000"));
+     // "no symbols" warning on pcre_string_utils.c is because it is only used
+     // when when COMPILE_PCRE8 is not defined, which is the default.
+-    add_c_files(&mut cfg, "libgit2/deps/pcre");
++    //add_c_files(&mut cfg, "libgit2/deps/pcre");
++    println!("cargo:rustc-link-lib=pcre");
+ 
+     cfg.file("libgit2/src/util/allocators/failalloc.c");
+     cfg.file("libgit2/src/util/allocators/stdalloc.c");
+@@ -246,6 +247,8 @@
+ 
+     println!("cargo:root={}", dst.display());
+ 
++    println!("cargo:rustc-link-lib=http_parser");
++
+     if target.contains("windows") {
+         println!("cargo:rustc-link-lib=winhttp");
+         println!("cargo:rustc-link-lib=rpcrt4");
diff -urN a/rustc-1.85.0+dfsg3/debian/rules b/rustc-web-1.85.0+dfsg3/debian/rules
--- a/rustc-1.85.0+dfsg3/debian/rules	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rules	2025-07-27 21:04:10.000000000 +0000
@@ -7,9 +7,9 @@
 SED_VERSION_SHORT := sed -re 's/([^.]+)\.([^.]+)\..*/\1.\2/'
 RUST_VERSION := $(shell echo '$(DEB_VERSION_UPSTREAM)' | $(SED_VERSION_SHORT))
 RUST_LONG_VERSION := $(shell echo '$(DEB_VERSION_UPSTREAM)' | sed -re 's/([^+]+).*/\1/')
-LIBSTD_PKG := libstd-rust-$(RUST_VERSION)
+LIBSTD_PKG := libstd-rust-web-$(RUST_VERSION)
 # Sed expression that matches the "rustc" we have in our Build-Depends field
-SED_RUSTC_BUILDDEP := sed -ne "/^Build-Depends:/,/^[^[:space:]\#]/{/^ *rustc:native .*,/p}" debian/control
+SED_RUSTC_BUILDDEP := sed -ne "/^Build-Depends:/,/^[^[:space:]\#]/{/^ *rustc-web:native .*,/p}" debian/control
 # Version of /usr/bin/rustc
 LOCAL_RUST_VERSION := $(shell rustc --version --verbose | sed -ne 's/^release: //p')
 
@@ -148,7 +148,7 @@
   BUILD_DOCS := false
 endif
 
-BUILD_WASM := true
+BUILD_WASM := false
 WASM_TARGETS := "wasm32-unknown-unknown,wasm32-wasip1,wasm32-wasip2"
 ifneq (,$(findstring nowasm,$(DEB_BUILD_PROFILES)))
   BUILD_WASM := false
@@ -267,6 +267,10 @@
 .PHONY: extra-vendor
 
 debian/dh_auto_configure.stamp: debian/config.toml check-no-old-llvm extra-vendor
+	set -e; \
+		tar xf debian/libgit2_1.9.0+ds.orig.tar.xz; \
+		mv libgit2-1.9.0 vendor/libgit2-sys/libgit2;
+		patch -p1 < debian/patches/vendor/use-vendored-libgit.patch
 	# fail the build if we accidentally vendored openssl, indicates we pulled in unnecessary dependencies
 	test ! -e vendor/openssl-src-*
 	# fail the build if our version contains ~exp and we are not releasing to experimental
@@ -303,6 +307,7 @@
 	$(RM) -rf build tmp debian/cargo_home config.stamp config.mk Makefile
 	$(RM) -rf $(TEST_LOG) debian/config.toml debian/*.stamp
 	$(RM) -rf $(SRC_CLEAN) config.toml
+	-$(RM) -rf vendor/libgit2-sys/libgit2
 
 debian/dh_auto_build.stamp:
 	$(RUSTBUILD) build $(RUSTBUILD_FLAGS)
@@ -332,7 +337,7 @@
 # method is imprecise and in practise we count some failures twice.
 # temporarily bumped from 8 to 10 to account for test output changes depending
 # on build path length, bump down again once 1.78 is imported
-FAILURES_ALLOWED = 10
+FAILURES_ALLOWED = 15
 ifneq (,$(filter $(DEB_BUILD_ARCH), armhf))
 # temporarily bumped from 12 to 15, see above
   FAILURES_ALLOWED = 15
@@ -492,12 +497,12 @@
 
 override_dh_install-indep:
 	dh_install
-	$(RM) -rf $(SRC_CLEAN:%=debian/rust-src/usr/src/rustc-$(RUST_LONG_VERSION)/%)
+	$(RM) -rf $(SRC_CLEAN:%=debian/rust-web-src/usr/src/rustc-$(RUST_LONG_VERSION)/%)
 
-	mv debian/rust-src/usr/src/rustc-$(RUST_LONG_VERSION)/library/Cargo.lock.orig \
-		debian/rust-src/usr/src/rustc-$(RUST_LONG_VERSION)/library/Cargo.lock
+	mv debian/rust-web-src/usr/src/rustc-$(RUST_LONG_VERSION)/library/Cargo.lock.orig \
+		debian/rust-web-src/usr/src/rustc-$(RUST_LONG_VERSION)/library/Cargo.lock
 	# Get rid of lintian warnings
-	find debian/rust-src/usr/src/rustc-$(RUST_LONG_VERSION) -type f \
+	find debian/rust-web-src/usr/src/rustc-$(RUST_LONG_VERSION) -type f \
 		\( -name .gitignore \
 		-o -name 'LICENSE*' \
 		-o -name 'LICENCE' \
@@ -506,10 +511,10 @@
 		-o -name '.eslintrc.js' \
 		\) -delete
 	# Remove files that autoload remote resources, caught by lintian
-	$(RM) -rf debian/rust-src/usr/src/rustc-*/vendor/cssparser-*/docs/*.html
-	$(RM) -rf debian/rust-src/usr/src/rustc-*/vendor/kuchiki-*/docs/*.html
-	$(RM) -rf debian/rust-src/usr/src/rustc-*/vendor/url-*/docs/*.html
-	$(RM) -rf debian/rust-src/usr/src/rustc-*/vendor/xz2-*/.gitmodules
+	$(RM) -rf debian/rust-web-src/usr/src/rustc-*/vendor/cssparser-*/docs/*.html
+	$(RM) -rf debian/rust-web-src/usr/src/rustc-*/vendor/kuchiki-*/docs/*.html
+	$(RM) -rf debian/rust-web-src/usr/src/rustc-*/vendor/url-*/docs/*.html
+	$(RM) -rf debian/rust-web-src/usr/src/rustc-*/vendor/xz2-*/.gitmodules
 
 override_dh_installchangelogs:
 	dh_installchangelogs RELEASES.md
diff -urN a/rustc-1.85.0+dfsg3/debian/rust-analyzer.install b/rustc-web-1.85.0+dfsg3/debian/rust-analyzer.install
--- a/rustc-1.85.0+dfsg3/debian/rust-analyzer.install	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rust-analyzer.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/bin/rust-analyzer
diff -urN a/rustc-1.85.0+dfsg3/debian/rust-clippy.install b/rustc-web-1.85.0+dfsg3/debian/rust-clippy.install
--- a/rustc-1.85.0+dfsg3/debian/rust-clippy.install	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rust-clippy.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/bin/clippy-driver
-usr/bin/cargo-clippy
diff -urN a/rustc-1.85.0+dfsg3/debian/rust-doc.doc-base.book b/rustc-web-1.85.0+dfsg3/debian/rust-doc.doc-base.book
--- a/rustc-1.85.0+dfsg3/debian/rust-doc.doc-base.book	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rust-doc.doc-base.book	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-Document: rust-book
-Title: The Rust Programming Language
-Section: Programming/Rust
-Abstract:
- This book will teach you about the Rust Programming Language. Rust is
- a modern systems programming language focusing on safety and speed. It
- accomplishes these goals by being memory safe without using garbage
- collection.
-
-Format: HTML
-Index: /usr/share/doc/rust-doc/html/book/index.html
-Files: /usr/share/doc/rust-doc/html/book/*.html
-       /usr/share/doc/rust-doc/html/book/*/*.html
diff -urN a/rustc-1.85.0+dfsg3/debian/rust-doc.doc-base.reference b/rustc-web-1.85.0+dfsg3/debian/rust-doc.doc-base.reference
--- a/rustc-1.85.0+dfsg3/debian/rust-doc.doc-base.reference	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rust-doc.doc-base.reference	1970-01-01 00:00:00.000000000 +0000
@@ -1,11 +0,0 @@
-Document: rust-reference
-Title: The Rust Reference
-Section: Programming/Rust
-Abstract:
- This document is the primary reference for the Rust programming
- language.
-
-Format: HTML
-Index: /usr/share/doc/rust-doc/html/reference/index.html
-Files: /usr/share/doc/rust-doc/html/reference/*.html
-       /usr/share/doc/rust-doc/html/reference/*/*.html
diff -urN a/rustc-1.85.0+dfsg3/debian/rust-doc.docs b/rustc-web-1.85.0+dfsg3/debian/rust-doc.docs
--- a/rustc-1.85.0+dfsg3/debian/rust-doc.docs	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rust-doc.docs	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-debian/tmp/usr/share/doc/docs/html
diff -urN a/rustc-1.85.0+dfsg3/debian/rust-doc.install b/rustc-web-1.85.0+dfsg3/debian/rust-doc.install
--- a/rustc-1.85.0+dfsg3/debian/rust-doc.install	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rust-doc.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-debian/icons/rust-logo-32x32-blk.png usr/share/doc/rust-doc/html/
diff -urN a/rustc-1.85.0+dfsg3/debian/rust-gdb.install b/rustc-web-1.85.0+dfsg3/debian/rust-gdb.install
--- a/rustc-1.85.0+dfsg3/debian/rust-gdb.install	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rust-gdb.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-usr/bin/rust-gdb
-usr/bin/rust-gdbgui
-usr/lib/rustlib/etc/gdb_load_rust_pretty_printers.py
-usr/lib/rustlib/etc/gdb_lookup.py
-usr/lib/rustlib/etc/gdb_providers.py
diff -urN a/rustc-1.85.0+dfsg3/debian/rust-gdb.links b/rustc-web-1.85.0+dfsg3/debian/rust-gdb.links
--- a/rustc-1.85.0+dfsg3/debian/rust-gdb.links	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rust-gdb.links	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/share/man/man1/gdb.1.gz usr/share/man/man1/rust-gdb.1.gz
diff -urN a/rustc-1.85.0+dfsg3/debian/rust-lldb.install b/rustc-web-1.85.0+dfsg3/debian/rust-lldb.install
--- a/rustc-1.85.0+dfsg3/debian/rust-lldb.install	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rust-lldb.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-usr/bin/rust-lldb
-usr/lib/rustlib/etc/lldb_commands
-usr/lib/rustlib/etc/lldb_lookup.py
-usr/lib/rustlib/etc/lldb_providers.py
diff -urN a/rustc-1.85.0+dfsg3/debian/rust-lldb.links b/rustc-web-1.85.0+dfsg3/debian/rust-lldb.links
--- a/rustc-1.85.0+dfsg3/debian/rust-lldb.links	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rust-lldb.links	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/share/man/man1/lldb-19.1.gz usr/share/man/man1/rust-lldb.1.gz
diff -urN a/rustc-1.85.0+dfsg3/debian/rust-llvm.install b/rustc-web-1.85.0+dfsg3/debian/rust-llvm.install
--- a/rustc-1.85.0+dfsg3/debian/rust-llvm.install	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rust-llvm.install	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/wasm-component-ld
diff -urN a/rustc-1.85.0+dfsg3/debian/rust-llvm.links b/rustc-web-1.85.0+dfsg3/debian/rust-llvm.links
--- a/rustc-1.85.0+dfsg3/debian/rust-llvm.links	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rust-llvm.links	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-usr/bin/lld-19 usr/bin/rust-lld
-usr/bin/clang-19 usr/bin/rust-clang
-usr/bin/llvm-dwp-19 usr/bin/rust-llvm-dwp
-# for -Z gcc-ld=lld, see compiler/rustc_codegen_ssa/src/back/link.rs for logic
-usr/bin/rust-lld usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/gcc-ld/ld
-usr/bin/rust-lld usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/gcc-ld/ld64
-
-# instead of shipping the one copied by bootstrap, which would be for the wrong
-# architecture in case of a cross build anyway
-usr/bin/llvm-objcopy-19 usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/rust-objcopy
-
-# For applications that use cargo-binutils, e.g. grcov
-usr/bin/llvm-profdata-19 usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/llvm-profdata
-usr/bin/llvm-cov-19 usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/llvm-cov
diff -urN a/rustc-1.85.0+dfsg3/debian/rust-src.install b/rustc-web-1.85.0+dfsg3/debian/rust-src.install
--- a/rustc-1.85.0+dfsg3/debian/rust-src.install	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rust-src.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-debian/patches  usr/src/rustc-${env:RUST_LONG_VERSION}/debian
-# from src/bootstrap/dist.rs:370 onwards
-COPYRIGHT       usr/src/rustc-${env:RUST_LONG_VERSION}
-LICENSE-APACHE  usr/src/rustc-${env:RUST_LONG_VERSION}
-LICENSE-MIT     usr/src/rustc-${env:RUST_LONG_VERSION}
-CONTRIBUTING.md usr/src/rustc-${env:RUST_LONG_VERSION}
-README.md       usr/src/rustc-${env:RUST_LONG_VERSION}
-RELEASES.md     usr/src/rustc-${env:RUST_LONG_VERSION}
-configure       usr/src/rustc-${env:RUST_LONG_VERSION}
-x.py            usr/src/rustc-${env:RUST_LONG_VERSION}
-config.example.toml    usr/src/rustc-${env:RUST_LONG_VERSION}
-Cargo.toml      usr/src/rustc-${env:RUST_LONG_VERSION}
-src             usr/src/rustc-${env:RUST_LONG_VERSION}
-library         usr/src/rustc-${env:RUST_LONG_VERSION}
-compiler        usr/src/rustc-${env:RUST_LONG_VERSION}
-Cargo.lock        usr/src/rustc-${env:RUST_LONG_VERSION}
diff -urN a/rustc-1.85.0+dfsg3/debian/rust-src.links b/rustc-web-1.85.0+dfsg3/debian/rust-src.links
--- a/rustc-1.85.0+dfsg3/debian/rust-src.links	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rust-src.links	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/src/rustc-${env:RUST_LONG_VERSION} usr/lib/rustlib/src/rust
diff -urN a/rustc-1.85.0+dfsg3/debian/rust-src.lintian-overrides b/rustc-web-1.85.0+dfsg3/debian/rust-src.lintian-overrides
--- a/rustc-1.85.0+dfsg3/debian/rust-src.lintian-overrides	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rust-src.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-# False positives that change quite often, so just override with a wildcard
-rust-src binary: executable-not-elf-or-script [usr/src/rustc-*/*]
-rust-src binary: package-contains-eslint-config-file usr/src/rustc-*/src/librustdoc/html/static/.eslintrc.js
-rust-src binary: breakout-link usr/lib/rustlib/src/rust -> usr/src/rustc-*
-rust-src binary: embedded-javascript-library * [usr/src/rustc-*/*]
-rust-src binary: national-encoding [usr/src/rustc-*/*]
-
-rust-src binary: duplicate-font-file * [usr/src/rustc-1.*.*/src/tools/rustc-perf/collector/compile-benchmarks/webrender-2022/wrench/reftests/text/FreeSans.ttf]
-rust-src binary: duplicate-font-file * [usr/src/rustc-1.*.*/src/tools/rustc-perf/collector/compile-benchmarks/webrender-2022/wrench/reftests/text/VeraBd.ttf]
-rust-src binary: package-contains-vcs-control-dir [usr/src/rustc-1.*.*/src/tools/cargo/tests/testsuite/cargo_init/mercurial_autodetect/in/.hg/]
-rust-src binary: package-contains-vcs-control-dir [usr/src/rustc-1.*.*/src/tools/cargo/tests/testsuite/cargo_init/simple_hg_ignore_exists/in/.hg/]
-rust-src binary: package-contains-vcs-control-file [usr/src/rustc-1.*.*/src/tools/cargo/tests/testsuite/cargo_init/mercurial_autodetect/out/.hgignore]
-rust-src binary: package-contains-vcs-control-file [usr/src/rustc-1.*.*/src/tools/cargo/tests/testsuite/cargo_init/simple_hg/out/.hgignore]
-rust-src binary: package-contains-vcs-control-file [usr/src/rustc-1.*.*/src/tools/cargo/tests/testsuite/cargo_init/simple_hg_ignore_exists/in/.hgignore]
-rust-src binary: package-contains-vcs-control-file [usr/src/rustc-1.*.*/src/tools/cargo/tests/testsuite/cargo_init/simple_hg_ignore_exists/out/.hgignore]
-rust-src binary: truetype-font-prohibits-installable-embedding (preview/print only) [usr/src/rustc-1.*.*/src/tools/rustc-perf/collector/compile-benchmarks/webrender-2022/wrench/reftests/text/VeraBd.ttf]
diff -urN a/rustc-1.85.0+dfsg3/debian/rust-web-analyzer.install b/rustc-web-1.85.0+dfsg3/debian/rust-web-analyzer.install
--- a/rustc-1.85.0+dfsg3/debian/rust-web-analyzer.install	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rust-web-analyzer.install	2025-03-17 18:06:58.000000000 +0000
@@ -0,0 +1 @@
+usr/bin/rust-analyzer
diff -urN a/rustc-1.85.0+dfsg3/debian/rust-web-clippy.install b/rustc-web-1.85.0+dfsg3/debian/rust-web-clippy.install
--- a/rustc-1.85.0+dfsg3/debian/rust-web-clippy.install	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rust-web-clippy.install	2025-03-17 18:06:58.000000000 +0000
@@ -0,0 +1,2 @@
+usr/bin/clippy-driver
+usr/bin/cargo-clippy
diff -urN a/rustc-1.85.0+dfsg3/debian/rust-web-doc.doc-base.book b/rustc-web-1.85.0+dfsg3/debian/rust-web-doc.doc-base.book
--- a/rustc-1.85.0+dfsg3/debian/rust-web-doc.doc-base.book	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rust-web-doc.doc-base.book	2025-03-17 18:06:58.000000000 +0000
@@ -0,0 +1,13 @@
+Document: rust-book
+Title: The Rust Programming Language
+Section: Programming/Rust
+Abstract:
+ This book will teach you about the Rust Programming Language. Rust is
+ a modern systems programming language focusing on safety and speed. It
+ accomplishes these goals by being memory safe without using garbage
+ collection.
+
+Format: HTML
+Index: /usr/share/doc/rust-doc/html/book/index.html
+Files: /usr/share/doc/rust-doc/html/book/*.html
+       /usr/share/doc/rust-doc/html/book/*/*.html
diff -urN a/rustc-1.85.0+dfsg3/debian/rust-web-doc.doc-base.reference b/rustc-web-1.85.0+dfsg3/debian/rust-web-doc.doc-base.reference
--- a/rustc-1.85.0+dfsg3/debian/rust-web-doc.doc-base.reference	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rust-web-doc.doc-base.reference	2025-03-17 18:06:58.000000000 +0000
@@ -0,0 +1,11 @@
+Document: rust-reference
+Title: The Rust Reference
+Section: Programming/Rust
+Abstract:
+ This document is the primary reference for the Rust programming
+ language.
+
+Format: HTML
+Index: /usr/share/doc/rust-doc/html/reference/index.html
+Files: /usr/share/doc/rust-doc/html/reference/*.html
+       /usr/share/doc/rust-doc/html/reference/*/*.html
diff -urN a/rustc-1.85.0+dfsg3/debian/rust-web-doc.docs b/rustc-web-1.85.0+dfsg3/debian/rust-web-doc.docs
--- a/rustc-1.85.0+dfsg3/debian/rust-web-doc.docs	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rust-web-doc.docs	2025-03-17 18:06:58.000000000 +0000
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/docs/html
diff -urN a/rustc-1.85.0+dfsg3/debian/rust-web-doc.install b/rustc-web-1.85.0+dfsg3/debian/rust-web-doc.install
--- a/rustc-1.85.0+dfsg3/debian/rust-web-doc.install	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rust-web-doc.install	2025-03-17 18:06:58.000000000 +0000
@@ -0,0 +1 @@
+debian/icons/rust-logo-32x32-blk.png usr/share/doc/rust-doc/html/
diff -urN a/rustc-1.85.0+dfsg3/debian/rust-web-gdb.install b/rustc-web-1.85.0+dfsg3/debian/rust-web-gdb.install
--- a/rustc-1.85.0+dfsg3/debian/rust-web-gdb.install	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rust-web-gdb.install	2025-03-17 18:06:58.000000000 +0000
@@ -0,0 +1,5 @@
+usr/bin/rust-gdb
+usr/bin/rust-gdbgui
+usr/lib/rustlib/etc/gdb_load_rust_pretty_printers.py
+usr/lib/rustlib/etc/gdb_lookup.py
+usr/lib/rustlib/etc/gdb_providers.py
diff -urN a/rustc-1.85.0+dfsg3/debian/rust-web-gdb.links b/rustc-web-1.85.0+dfsg3/debian/rust-web-gdb.links
--- a/rustc-1.85.0+dfsg3/debian/rust-web-gdb.links	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rust-web-gdb.links	2025-03-17 18:06:58.000000000 +0000
@@ -0,0 +1 @@
+usr/share/man/man1/gdb.1.gz usr/share/man/man1/rust-gdb.1.gz
diff -urN a/rustc-1.85.0+dfsg3/debian/rust-web-lldb.install b/rustc-web-1.85.0+dfsg3/debian/rust-web-lldb.install
--- a/rustc-1.85.0+dfsg3/debian/rust-web-lldb.install	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rust-web-lldb.install	2025-03-17 18:06:58.000000000 +0000
@@ -0,0 +1,4 @@
+usr/bin/rust-lldb
+usr/lib/rustlib/etc/lldb_commands
+usr/lib/rustlib/etc/lldb_lookup.py
+usr/lib/rustlib/etc/lldb_providers.py
diff -urN a/rustc-1.85.0+dfsg3/debian/rust-web-lldb.links b/rustc-web-1.85.0+dfsg3/debian/rust-web-lldb.links
--- a/rustc-1.85.0+dfsg3/debian/rust-web-lldb.links	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rust-web-lldb.links	2025-03-17 18:06:58.000000000 +0000
@@ -0,0 +1 @@
+usr/share/man/man1/lldb-19.1.gz usr/share/man/man1/rust-lldb.1.gz
diff -urN a/rustc-1.85.0+dfsg3/debian/rust-web-src.install b/rustc-web-1.85.0+dfsg3/debian/rust-web-src.install
--- a/rustc-1.85.0+dfsg3/debian/rust-web-src.install	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rust-web-src.install	2025-03-17 18:06:58.000000000 +0000
@@ -0,0 +1,16 @@
+debian/patches  usr/src/rustc-${env:RUST_LONG_VERSION}/debian
+# from src/bootstrap/dist.rs:370 onwards
+COPYRIGHT       usr/src/rustc-${env:RUST_LONG_VERSION}
+LICENSE-APACHE  usr/src/rustc-${env:RUST_LONG_VERSION}
+LICENSE-MIT     usr/src/rustc-${env:RUST_LONG_VERSION}
+CONTRIBUTING.md usr/src/rustc-${env:RUST_LONG_VERSION}
+README.md       usr/src/rustc-${env:RUST_LONG_VERSION}
+RELEASES.md     usr/src/rustc-${env:RUST_LONG_VERSION}
+configure       usr/src/rustc-${env:RUST_LONG_VERSION}
+x.py            usr/src/rustc-${env:RUST_LONG_VERSION}
+config.example.toml    usr/src/rustc-${env:RUST_LONG_VERSION}
+Cargo.toml      usr/src/rustc-${env:RUST_LONG_VERSION}
+src             usr/src/rustc-${env:RUST_LONG_VERSION}
+library         usr/src/rustc-${env:RUST_LONG_VERSION}
+compiler        usr/src/rustc-${env:RUST_LONG_VERSION}
+Cargo.lock        usr/src/rustc-${env:RUST_LONG_VERSION}
diff -urN a/rustc-1.85.0+dfsg3/debian/rust-web-src.links b/rustc-web-1.85.0+dfsg3/debian/rust-web-src.links
--- a/rustc-1.85.0+dfsg3/debian/rust-web-src.links	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rust-web-src.links	2025-03-17 18:06:58.000000000 +0000
@@ -0,0 +1 @@
+usr/src/rustc-${env:RUST_LONG_VERSION} usr/lib/rustlib/src/rust
diff -urN a/rustc-1.85.0+dfsg3/debian/rust-web-src.lintian-overrides b/rustc-web-1.85.0+dfsg3/debian/rust-web-src.lintian-overrides
--- a/rustc-1.85.0+dfsg3/debian/rust-web-src.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rust-web-src.lintian-overrides	2025-03-17 18:06:58.000000000 +0000
@@ -0,0 +1,16 @@
+# False positives that change quite often, so just override with a wildcard
+rust-src binary: executable-not-elf-or-script [usr/src/rustc-*/*]
+rust-src binary: package-contains-eslint-config-file usr/src/rustc-*/src/librustdoc/html/static/.eslintrc.js
+rust-src binary: breakout-link usr/lib/rustlib/src/rust -> usr/src/rustc-*
+rust-src binary: embedded-javascript-library * [usr/src/rustc-*/*]
+rust-src binary: national-encoding [usr/src/rustc-*/*]
+
+rust-src binary: duplicate-font-file * [usr/src/rustc-1.*.*/src/tools/rustc-perf/collector/compile-benchmarks/webrender-2022/wrench/reftests/text/FreeSans.ttf]
+rust-src binary: duplicate-font-file * [usr/src/rustc-1.*.*/src/tools/rustc-perf/collector/compile-benchmarks/webrender-2022/wrench/reftests/text/VeraBd.ttf]
+rust-src binary: package-contains-vcs-control-dir [usr/src/rustc-1.*.*/src/tools/cargo/tests/testsuite/cargo_init/mercurial_autodetect/in/.hg/]
+rust-src binary: package-contains-vcs-control-dir [usr/src/rustc-1.*.*/src/tools/cargo/tests/testsuite/cargo_init/simple_hg_ignore_exists/in/.hg/]
+rust-src binary: package-contains-vcs-control-file [usr/src/rustc-1.*.*/src/tools/cargo/tests/testsuite/cargo_init/mercurial_autodetect/out/.hgignore]
+rust-src binary: package-contains-vcs-control-file [usr/src/rustc-1.*.*/src/tools/cargo/tests/testsuite/cargo_init/simple_hg/out/.hgignore]
+rust-src binary: package-contains-vcs-control-file [usr/src/rustc-1.*.*/src/tools/cargo/tests/testsuite/cargo_init/simple_hg_ignore_exists/in/.hgignore]
+rust-src binary: package-contains-vcs-control-file [usr/src/rustc-1.*.*/src/tools/cargo/tests/testsuite/cargo_init/simple_hg_ignore_exists/out/.hgignore]
+rust-src binary: truetype-font-prohibits-installable-embedding (preview/print only) [usr/src/rustc-1.*.*/src/tools/rustc-perf/collector/compile-benchmarks/webrender-2022/wrench/reftests/text/VeraBd.ttf]
diff -urN a/rustc-1.85.0+dfsg3/debian/rustc-web.install b/rustc-web-1.85.0+dfsg3/debian/rustc-web.install
--- a/rustc-1.85.0+dfsg3/debian/rustc-web.install	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rustc-web.install	2025-03-17 18:06:58.000000000 +0000
@@ -0,0 +1,6 @@
+usr/bin/rustc
+usr/bin/rustdoc
+usr/lib/rustlib/etc/rust_types.py
+usr/libexec/rust-analyzer-proc-macro-srv
+debian/architecture.mk usr/share/rustc/
+debian/wasi-node usr/share/rustc/bin/
diff -urN a/rustc-1.85.0+dfsg3/debian/rustc-web.lintian-overrides b/rustc-web-1.85.0+dfsg3/debian/rustc-web.lintian-overrides
--- a/rustc-1.85.0+dfsg3/debian/rustc-web.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rustc-web.lintian-overrides	2025-03-17 18:06:58.000000000 +0000
@@ -0,0 +1,7 @@
+# unofficial example script, no dependency needed
+rustc binary: missing-dep-for-interpreter /usr/bin/node (does not satisfy nodejs:any) [usr/share/rustc/bin/wasi-node]
+
+# symlinks to other programs
+rustc binary: no-manual-page [usr/bin/rust-clang]
+rustc binary: no-manual-page [usr/bin/rust-lld]
+rustc binary: no-manual-page [usr/bin/rust-llvm-dwp]
diff -urN a/rustc-1.85.0+dfsg3/debian/rustc-web.manpages b/rustc-web-1.85.0+dfsg3/debian/rustc-web.manpages
--- a/rustc-1.85.0+dfsg3/debian/rustc-web.manpages	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rustc-web.manpages	2025-03-17 18:06:58.000000000 +0000
@@ -0,0 +1,3 @@
+debian/tmp/usr/share/man/man1/rustc.1
+debian/tmp/usr/share/man/man1/rustdoc.1
+
diff -urN a/rustc-1.85.0+dfsg3/debian/rustc.install b/rustc-web-1.85.0+dfsg3/debian/rustc.install
--- a/rustc-1.85.0+dfsg3/debian/rustc.install	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rustc.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-usr/bin/rustc
-usr/bin/rustdoc
-usr/lib/rustlib/etc/rust_types.py
-usr/libexec/rust-analyzer-proc-macro-srv
-debian/architecture.mk usr/share/rustc/
-debian/wasi-node usr/share/rustc/bin/
diff -urN a/rustc-1.85.0+dfsg3/debian/rustc.lintian-overrides b/rustc-web-1.85.0+dfsg3/debian/rustc.lintian-overrides
--- a/rustc-1.85.0+dfsg3/debian/rustc.lintian-overrides	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rustc.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-# unofficial example script, no dependency needed
-rustc binary: missing-dep-for-interpreter /usr/bin/node (does not satisfy nodejs:any) [usr/share/rustc/bin/wasi-node]
-
-# symlinks to other programs
-rustc binary: no-manual-page [usr/bin/rust-clang]
-rustc binary: no-manual-page [usr/bin/rust-lld]
-rustc binary: no-manual-page [usr/bin/rust-llvm-dwp]
diff -urN a/rustc-1.85.0+dfsg3/debian/rustc.manpages b/rustc-web-1.85.0+dfsg3/debian/rustc.manpages
--- a/rustc-1.85.0+dfsg3/debian/rustc.manpages	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rustc.manpages	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-debian/tmp/usr/share/man/man1/rustc.1
-debian/tmp/usr/share/man/man1/rustdoc.1
-
diff -urN a/rustc-1.85.0+dfsg3/debian/rustfmt-web.install b/rustc-web-1.85.0+dfsg3/debian/rustfmt-web.install
--- a/rustc-1.85.0+dfsg3/debian/rustfmt-web.install	1970-01-01 00:00:00.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rustfmt-web.install	2025-03-17 18:06:58.000000000 +0000
@@ -0,0 +1,2 @@
+usr/bin/rustfmt
+usr/bin/cargo-fmt
diff -urN a/rustc-1.85.0+dfsg3/debian/rustfmt.install b/rustc-web-1.85.0+dfsg3/debian/rustfmt.install
--- a/rustc-1.85.0+dfsg3/debian/rustfmt.install	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/rustfmt.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/bin/rustfmt
-usr/bin/cargo-fmt
diff -urN a/rustc-1.85.0+dfsg3/debian/source/include-binaries b/rustc-web-1.85.0+dfsg3/debian/source/include-binaries
--- a/rustc-1.85.0+dfsg3/debian/source/include-binaries	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/source/include-binaries	2025-07-27 21:04:10.000000000 +0000
@@ -1,4 +1,5 @@
 debian/icons/rust-logo-32x32-blk.png
+debian/libgit2_1.9.0+ds.orig.tar.xz
 # if you are here because dpkg-source told you to "add stage0/rustc-** in d/source/include-binaries",
 # ignore that instruction and instead:
 # a) if you want to use the orig-stage0 for your next upload, then extract it into stage0/
diff -urN a/rustc-1.85.0+dfsg3/debian/tests/control b/rustc-web-1.85.0+dfsg3/debian/tests/control
--- a/rustc-1.85.0+dfsg3/debian/tests/control	2025-03-17 18:06:58.000000000 +0000
+++ b/rustc-web-1.85.0+dfsg3/debian/tests/control	2025-07-27 21:04:10.000000000 +0000
@@ -4,12 +4,4 @@
 #
 Tests: create-and-build-crate
 Restrictions: rw-build-tree, allow-stderr, needs-internet
-Depends: cargo, ca-certificates
-
-Tests: create-and-build-wasm-wasip1-crate
-Restrictions: rw-build-tree, allow-stderr, needs-internet
-Depends: cargo, ca-certificates, libstd-rust-dev-wasm32, rust-llvm
-
-Tests: create-and-build-wasm-wasip2-crate
-Restrictions: rw-build-tree, allow-stderr, needs-internet
-Depends: cargo, ca-certificates, libstd-rust-dev-wasm32, rust-llvm
+Depends: cargo-web, ca-certificates
Binary files a/rustc-1.85.0+dfsg3/stage0/2025-01-09/cargo-1.84.0-aarch64-unknown-linux-gnu.tar.xz and b/rustc-web-1.85.0+dfsg3/stage0/2025-01-09/cargo-1.84.0-aarch64-unknown-linux-gnu.tar.xz differ
Binary files a/rustc-1.85.0+dfsg3/stage0/2025-01-09/cargo-1.84.0-armv7-unknown-linux-gnueabihf.tar.xz and b/rustc-web-1.85.0+dfsg3/stage0/2025-01-09/cargo-1.84.0-armv7-unknown-linux-gnueabihf.tar.xz differ
Binary files a/rustc-1.85.0+dfsg3/stage0/2025-01-09/cargo-1.84.0-i686-unknown-linux-gnu.tar.xz and b/rustc-web-1.85.0+dfsg3/stage0/2025-01-09/cargo-1.84.0-i686-unknown-linux-gnu.tar.xz differ
Binary files a/rustc-1.85.0+dfsg3/stage0/2025-01-09/cargo-1.84.0-powerpc64le-unknown-linux-gnu.tar.xz and b/rustc-web-1.85.0+dfsg3/stage0/2025-01-09/cargo-1.84.0-powerpc64le-unknown-linux-gnu.tar.xz differ
Binary files a/rustc-1.85.0+dfsg3/stage0/2025-01-09/cargo-1.84.0-riscv64gc-unknown-linux-gnu.tar.xz and b/rustc-web-1.85.0+dfsg3/stage0/2025-01-09/cargo-1.84.0-riscv64gc-unknown-linux-gnu.tar.xz differ
Binary files a/rustc-1.85.0+dfsg3/stage0/2025-01-09/cargo-1.84.0-s390x-unknown-linux-gnu.tar.xz and b/rustc-web-1.85.0+dfsg3/stage0/2025-01-09/cargo-1.84.0-s390x-unknown-linux-gnu.tar.xz differ
Binary files a/rustc-1.85.0+dfsg3/stage0/2025-01-09/cargo-1.84.0-x86_64-unknown-linux-gnu.tar.xz and b/rustc-web-1.85.0+dfsg3/stage0/2025-01-09/cargo-1.84.0-x86_64-unknown-linux-gnu.tar.xz differ
Binary files a/rustc-1.85.0+dfsg3/stage0/2025-01-09/rust-std-1.84.0-aarch64-unknown-linux-gnu.tar.xz and b/rustc-web-1.85.0+dfsg3/stage0/2025-01-09/rust-std-1.84.0-aarch64-unknown-linux-gnu.tar.xz differ
Binary files a/rustc-1.85.0+dfsg3/stage0/2025-01-09/rust-std-1.84.0-armv7-unknown-linux-gnueabihf.tar.xz and b/rustc-web-1.85.0+dfsg3/stage0/2025-01-09/rust-std-1.84.0-armv7-unknown-linux-gnueabihf.tar.xz differ
Binary files a/rustc-1.85.0+dfsg3/stage0/2025-01-09/rust-std-1.84.0-i686-unknown-linux-gnu.tar.xz and b/rustc-web-1.85.0+dfsg3/stage0/2025-01-09/rust-std-1.84.0-i686-unknown-linux-gnu.tar.xz differ
Binary files a/rustc-1.85.0+dfsg3/stage0/2025-01-09/rust-std-1.84.0-powerpc64le-unknown-linux-gnu.tar.xz and b/rustc-web-1.85.0+dfsg3/stage0/2025-01-09/rust-std-1.84.0-powerpc64le-unknown-linux-gnu.tar.xz differ
Binary files a/rustc-1.85.0+dfsg3/stage0/2025-01-09/rust-std-1.84.0-riscv64gc-unknown-linux-gnu.tar.xz and b/rustc-web-1.85.0+dfsg3/stage0/2025-01-09/rust-std-1.84.0-riscv64gc-unknown-linux-gnu.tar.xz differ
Binary files a/rustc-1.85.0+dfsg3/stage0/2025-01-09/rust-std-1.84.0-s390x-unknown-linux-gnu.tar.xz and b/rustc-web-1.85.0+dfsg3/stage0/2025-01-09/rust-std-1.84.0-s390x-unknown-linux-gnu.tar.xz differ
Binary files a/rustc-1.85.0+dfsg3/stage0/2025-01-09/rust-std-1.84.0-x86_64-unknown-linux-gnu.tar.xz and b/rustc-web-1.85.0+dfsg3/stage0/2025-01-09/rust-std-1.84.0-x86_64-unknown-linux-gnu.tar.xz differ
Binary files a/rustc-1.85.0+dfsg3/stage0/2025-01-09/rustc-1.84.0-aarch64-unknown-linux-gnu.tar.xz and b/rustc-web-1.85.0+dfsg3/stage0/2025-01-09/rustc-1.84.0-aarch64-unknown-linux-gnu.tar.xz differ
Binary files a/rustc-1.85.0+dfsg3/stage0/2025-01-09/rustc-1.84.0-armv7-unknown-linux-gnueabihf.tar.xz and b/rustc-web-1.85.0+dfsg3/stage0/2025-01-09/rustc-1.84.0-armv7-unknown-linux-gnueabihf.tar.xz differ
Binary files a/rustc-1.85.0+dfsg3/stage0/2025-01-09/rustc-1.84.0-i686-unknown-linux-gnu.tar.xz and b/rustc-web-1.85.0+dfsg3/stage0/2025-01-09/rustc-1.84.0-i686-unknown-linux-gnu.tar.xz differ
Binary files a/rustc-1.85.0+dfsg3/stage0/2025-01-09/rustc-1.84.0-powerpc64le-unknown-linux-gnu.tar.xz and b/rustc-web-1.85.0+dfsg3/stage0/2025-01-09/rustc-1.84.0-powerpc64le-unknown-linux-gnu.tar.xz differ
Binary files a/rustc-1.85.0+dfsg3/stage0/2025-01-09/rustc-1.84.0-riscv64gc-unknown-linux-gnu.tar.xz and b/rustc-web-1.85.0+dfsg3/stage0/2025-01-09/rustc-1.84.0-riscv64gc-unknown-linux-gnu.tar.xz differ
Binary files a/rustc-1.85.0+dfsg3/stage0/2025-01-09/rustc-1.84.0-s390x-unknown-linux-gnu.tar.xz and b/rustc-web-1.85.0+dfsg3/stage0/2025-01-09/rustc-1.84.0-s390x-unknown-linux-gnu.tar.xz differ
Binary files a/rustc-1.85.0+dfsg3/stage0/2025-01-09/rustc-1.84.0-x86_64-unknown-linux-gnu.tar.xz and b/rustc-web-1.85.0+dfsg3/stage0/2025-01-09/rustc-1.84.0-x86_64-unknown-linux-gnu.tar.xz differ

Attachment: OpenPGP_signature.asc
Description: OpenPGP digital signature


--- End Message ---
--- Begin Message --- 
Package: release.debian.org
Version: 12.12

Hi,

Each of the updates referenced by these requests was included in
today's 12.12 point release for bookworm.

Regards,

Adam

--- End Message ---
Reply to: