Bug#1051051: bullseye-pu: package rustc-mozilla/1.63.0+dfsg1-2~deb11u1
Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian.org@packages.debian.org
Usertags: pu
X-Debbugs-Cc: team+pkg-mozilla@tracker.debian.org
Hi,
The time has come for a new Firefox / Thunderbird ESR release in *stable.
This will require rustc/cargo/cbindgen backports as usual. For bookworm
we're in a good shape for this update, but for bullseye and buster we'll
need all three updates.
For rustc-mozilla, I've used the version from bookworm. Hopefully I got
all the stage0 binaries this time.
Risk is low as this package is only used to build FF/TB. I have
successfully built the whole chain up to FF 115 ESR on amd64.
I'm attaching a diff from rustc_1.63/bookworm to the proposed update. I don't think there's much value in a 1.59->1.63 diff, but if you want it say so and I'll prepare one.
Thanks,
Emilio
diff -ruNp debian.rustc/changelog debian/changelog
--- debian.rustc/changelog 2023-01-14 09:38:46.000000000 +0100
+++ debian/changelog 2023-07-28 13:44:06.000000000 +0200
@@ -1,3 +1,13 @@
+rustc-mozilla (1.63.0+dfsg1-2~deb11u1) bullseye; urgency=medium
+
+ * Non-maintainer upload.
+ * Backport to bullseye as rustc-mozilla.
+ * Do a bootstrap build.
+ * Disable wasm.
+ * Disable new binary packages rustfmt, -clippy, -all.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org> Fri, 28 Jul 2023 13:44:06 +0200
+
rustc (1.63.0+dfsg1-2) unstable; urgency=medium
[ Fabian Grünbichler ]
diff -ruNp debian.rustc/control debian/control
--- debian.rustc/control 2023-01-14 09:38:46.000000000 +0100
+++ debian/control 2023-07-28 13:44:06.000000000 +0200
@@ -1,4 +1,4 @@
-Source: rustc
+Source: rustc-mozilla
Section: devel
Priority: optional
Maintainer: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
@@ -12,14 +12,14 @@ Build-Depends:
debhelper-compat (= 13),
dpkg-dev (>= 1.17.14),
python3:native,
- cargo:native (>= 0.60.0) <!pkg.rustc.dlstage0>,
- rustc:native (>= 1.62.0+dfsg) <!pkg.rustc.dlstage0>,
- rustc:native (<= 1.63.0++) <!pkg.rustc.dlstage0>,
- llvm-14-dev:native,
- llvm-14-tools:native,
+# cargo:native (>= 0.60.0) <!pkg.rustc.dlstage0>,
+# rustc:native (>= 1.62.0+dfsg) <!pkg.rustc.dlstage0>,
+# rustc:native (<= 1.63.0++) <!pkg.rustc.dlstage0>,
+ llvm-13-dev:native,
+ llvm-13-tools:native,
gcc-mingw-w64-x86-64-posix:native [amd64] <!nowindows>,
gcc-mingw-w64-i686-posix:native [i386] <!nowindows>,
- libllvm14 (>= 1:14.0.0),
+ libllvm13 (>= 1:13.0.0),
cmake (>= 3.0) | cmake3,
# needed by some vendor crates
pkg-config,
@@ -38,30 +38,32 @@ Build-Depends:
curl <pkg.rustc.dlstage0>,
ca-certificates <pkg.rustc.dlstage0>,
Build-Depends-Indep:
- wasi-libc (>= 0.0~git20220510.9886d3d~~) <!nowasm>,
- wasi-libc (<= 0.0~git20220510.9886d3d++) <!nowasm>,
- clang-14:native,
+# wasi-libc (>= 0.0~git20220510.9886d3d~~) <!nowasm>,
+# wasi-libc (<= 0.0~git20220510.9886d3d++) <!nowasm>,
+ clang-13:native,
Build-Conflicts: gdb-minimal <!nocheck>
Standards-Version: 4.2.1
Homepage: http://www.rust-lang.org/
Vcs-Git: https://salsa.debian.org/rust-team/rust.git
Vcs-Browser: https://salsa.debian.org/rust-team/rust
-Package: rustc
+Package: rustc-mozilla
Architecture: any
Multi-Arch: allowed
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends},
- libstd-rust-dev (= ${binary:Version}),
+ libstd-rust-mozilla-dev (= ${binary:Version}),
gcc, libc-dev, binutils (>= 2.26)
Recommends:
cargo (>= 0.64.0~~), cargo (<< 0.65.0~~),
# llvm is needed for llvm-dwp for -C split-debuginfo=packed
- llvm-14,
+ llvm-13,
Suggests:
# lld and clang are needed for wasm compilation
- lld-14, clang-14,
-Replaces: libstd-rust-dev (<< 1.25.0+dfsg1-2~~)
+ lld-13, clang-13,
+Conflicts: rustc
+Provides: rustc (= ${binary:Version})
+Replaces: libstd-rust-dev (<< 1.25.0+dfsg1-2~~), rustc
Breaks: libstd-rust-dev (<< 1.25.0+dfsg1-2~~)
Description: Rust systems programming language
Rust is a curly-brace, block-structured expression language. It
@@ -76,7 +78,7 @@ Description: Rust systems programming la
generic programming and meta-programming, in both static and dynamic
styles.
-Package: libstd-rust-1.63
+Package: libstd-rust-mozilla-1.63
Section: libs
Architecture: any
Multi-Arch: same
@@ -98,12 +100,12 @@ Description: Rust standard libraries
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-mozilla-dev
Section: libdevel
Architecture: any
Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends},
- libstd-rust-1.63 (= ${binary:Version}),
+ libstd-rust-mozilla-1.63 (= ${binary:Version}),
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
@@ -121,7 +123,7 @@ Description: Rust standard libraries - d
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-mozilla-dev-windows
Section: libdevel
Architecture: amd64 i386
Multi-Arch: same
@@ -129,6 +131,7 @@ Depends: ${shlibs:Depends}, ${misc:Depen
Recommends:
gcc-mingw-w64-x86-64-posix [amd64],
gcc-mingw-w64-i686-posix [i386],
+Conflicts: libstd-rust-dev-windows
Build-Profiles: <!nowindows>
Description: Rust standard libraries - development files
Rust is a curly-brace, block-structured expression language. It
@@ -147,41 +150,42 @@ Description: Rust standard libraries - d
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-14, clang-14,
-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-wasi targets.
+#Package: libstd-rust-mozilla-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-13, clang-13,
+#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-wasi targets.
-Package: rust-gdb
+Package: rust-mozilla-gdb
Architecture: all
Depends: gdb, ${misc:Depends}
Suggests: gdb-doc
Replaces: rustc (<< 1.1.0+dfsg1-1)
+Conflicts: rust-gdb
Description: Rust debugger (gdb)
Rust is a curly-brace, block-structured expression language. It
visually resembles the C language family, but differs significantly
@@ -198,11 +202,12 @@ Description: Rust debugger (gdb)
This package contains pretty printers and a wrapper script for
invoking gdb on rust binaries.
-Package: rust-lldb
+Package: rust-mozilla-lldb
Architecture: all
# When updating, also update rust-lldb.links
-Depends: lldb-14, ${misc:Depends}, python3-lldb-14
+Depends: lldb-13, ${misc:Depends}, python3-lldb-13
Replaces: rustc (<< 1.1.0+dfsg1-1)
+Conflicts: rust-lldb
Description: Rust debugger (lldb)
Rust is a curly-brace, block-structured expression language. It
visually resembles the C language family, but differs significantly
@@ -219,7 +224,7 @@ Description: Rust debugger (lldb)
This package contains pretty printers and a wrapper script for
invoking lldb on rust binaries.
-Package: rust-doc
+Package: rust-mozilla-doc
Section: doc
Architecture: all
Build-Profiles: <!nodoc>
@@ -227,6 +232,7 @@ Depends: ${misc:Depends},
libjs-jquery, libjs-highlight.js, libjs-mathjax,
fonts-open-sans, fonts-font-awesome
Recommends: cargo-doc
+Conflicts: rust-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
@@ -243,9 +249,10 @@ Description: Rust systems programming la
This package contains the Rust tutorial, language reference and
standard library documentation.
-Package: rust-src
+Package: rust-mozilla-src
Architecture: all
Depends: ${misc:Depends}
+Conflicts: rust-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
@@ -262,83 +269,83 @@ Description: Rust systems programming la
This package contains sources of the Rust compiler and standard
libraries, useful for IDEs and code analysis tools such as Racer.
-Package: rust-clippy
-Architecture: any
-Multi-Arch: allowed
-Depends: ${misc:Depends}, ${shlibs:Depends},
- libstd-rust-1.63 (= ${binary:Version})
-Recommends: cargo
-Description: Rust linter
- 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 'clippy', a linter to catch common mistakes and improve
- your Rust code as well a collection of over 400 compatible lints.
- .
- Lints are divided into categories, each with a default lint level. You can
- choose how much Clippy is supposed to annoy help you by changing the lint
- level by category.
- .
- Clippy is integrated into the 'cargo' build tool, available via 'cargo clippy'.
-
-Package: rustfmt
-Architecture: any
-Multi-Arch: allowed
-Depends: ${misc:Depends}, ${shlibs:Depends},
-Recommends: cargo
-Description: Rust formatting helper
- 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 'rustfmt', a tool for formatting Rust code according to
- style guidelines, as well as 'cargo-fmt', a helper enabling running rustfmt
- directly with 'cargo fmt'.
-
-Package: rust-all
-Architecture: all
-Depends: ${misc:Depends}, ${shlibs:Depends},
- rustc (>= ${binary:Version}),
- rustfmt (>= ${binary:Version}),
- rust-clippy (>= ${binary:Version}),
- rust-gdb (>= ${binary:Version}) | rust-lldb (>= ${binary:Version}),
- cargo,
-Recommends:
- cargo (>= 0.64.0~~), cargo (<< 0.65.0~~)
-Suggests:
- rust-doc (>= ${binary:Version}),
- rust-src (>= ${binary:Version}),
- libstd-rust-dev-wasm32 (>= ${binary:Version}),
- libstd-rust-dev-windows (>= ${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.
+#Package: rust-mozilla-clippy
+#Architecture: any
+#Multi-Arch: allowed
+#Depends: ${misc:Depends}, ${shlibs:Depends},
+# libstd-rust-mozilla-1.63 (= ${binary:Version})
+#Recommends: cargo
+#Description: Rust linter
+# 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 'clippy', a linter to catch common mistakes and improve
+# your Rust code as well a collection of over 400 compatible lints.
+# .
+# Lints are divided into categories, each with a default lint level. You can
+# choose how much Clippy is supposed to annoy help you by changing the lint
+# level by category.
+# .
+# Clippy is integrated into the 'cargo' build tool, available via 'cargo clippy'.
+#
+#Package: rustfmt-mozilla
+#Architecture: any
+#Multi-Arch: allowed
+#Depends: ${misc:Depends}, ${shlibs:Depends},
+#Recommends: cargo
+#Description: Rust formatting helper
+# 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 'rustfmt', a tool for formatting Rust code according to
+# style guidelines, as well as 'cargo-fmt', a helper enabling running rustfmt
+# directly with 'cargo fmt'.
+#
+#Package: rust-mozilla-all
+#Architecture: all
+#Depends: ${misc:Depends}, ${shlibs:Depends},
+# rustc-mozilla (>= ${binary:Version}),
+# rustfmt (>= ${binary:Version}),
+# rust-mozilla-clippy (>= ${binary:Version}),
+# rust-mozilla-gdb (>= ${binary:Version}) | rust-mozilla-lldb (>= ${binary:Version}),
+# cargo,
+#Recommends:
+# cargo (>= 0.64.0~~), cargo (<< 0.65.0~~)
+#Suggests:
+# rust-mozilla-doc (>= ${binary:Version}),
+# rust-mozilla-src (>= ${binary:Version}),
+# libstd-rust-mozilla-dev-wasm32 (>= ${binary:Version}),
+# libstd-rust-mozilla-dev-windows (>= ${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.
diff -ruNp debian.rustc/libstd-rust-1.63.install debian/libstd-rust-1.63.install
--- debian.rustc/libstd-rust-1.63.install 2023-01-14 09:38:46.000000000 +0100
+++ debian/libstd-rust-1.63.install 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/
diff -ruNp debian.rustc/libstd-rust-1.63.lintian-overrides debian/libstd-rust-1.63.lintian-overrides
--- debian.rustc/libstd-rust-1.63.lintian-overrides 2023-01-14 09:38:46.000000000 +0100
+++ debian/libstd-rust-1.63.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-# "libstd" just seemed too generic
-libstd-rust-1.63 binary: package-name-doesnt-match-sonames
-libstd-rust-1.63 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.63 binary: dev-pkg-without-shlib-symlink
-libstd-rust-1.63 binary: shlib-without-versioned-soname
-libstd-rust-1.63 binary: unused-shlib-entry-in-control-file
-
-# 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.63 binary: library-not-linked-against-libc
diff -ruNp debian.rustc/libstd-rust-dev.install debian/libstd-rust-dev.install
--- debian.rustc/libstd-rust-dev.install 2022-12-15 21:23:00.000000000 +0100
+++ debian/libstd-rust-dev.install 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/lib/
diff -ruNp debian.rustc/libstd-rust-dev.lintian-overrides debian/libstd-rust-dev.lintian-overrides
--- debian.rustc/libstd-rust-dev.lintian-overrides 2022-12-15 21:23:00.000000000 +0100
+++ debian/libstd-rust-dev.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
@@ -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 -ruNp debian.rustc/libstd-rust-dev-wasm32.install debian/libstd-rust-dev-wasm32.install
--- debian.rustc/libstd-rust-dev-wasm32.install 2022-12-15 21:23:00.000000000 +0100
+++ debian/libstd-rust-dev-wasm32.install 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/rustlib/wasm32-*/lib/
diff -ruNp debian.rustc/libstd-rust-dev-wasm32.lintian-overrides debian/libstd-rust-dev-wasm32.lintian-overrides
--- debian.rustc/libstd-rust-dev-wasm32.lintian-overrides 2022-12-15 21:23:00.000000000 +0100
+++ debian/libstd-rust-dev-wasm32.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
@@ -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 -ruNp debian.rustc/libstd-rust-dev-windows.install debian/libstd-rust-dev-windows.install
--- debian.rustc/libstd-rust-dev-windows.install 2022-12-15 21:23:00.000000000 +0100
+++ debian/libstd-rust-dev-windows.install 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/rustlib/${env:WINDOWS_ARCH}-pc-windows-gnu/lib/
diff -ruNp debian.rustc/libstd-rust-dev-windows.lintian-overrides debian/libstd-rust-dev-windows.lintian-overrides
--- debian.rustc/libstd-rust-dev-windows.lintian-overrides 2023-01-14 09:38:46.000000000 +0100
+++ debian/libstd-rust-dev-windows.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
@@ -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/x86_64-pc-windows-gnu/lib/lib*.dll.a]
diff -ruNp debian.rustc/libstd-rust-mozilla-1.63.install debian/libstd-rust-mozilla-1.63.install
--- debian.rustc/libstd-rust-mozilla-1.63.install 1970-01-01 01:00:00.000000000 +0100
+++ debian/libstd-rust-mozilla-1.63.install 2023-01-14 09:38:46.000000000 +0100
@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/
diff -ruNp debian.rustc/libstd-rust-mozilla-1.63.lintian-overrides debian/libstd-rust-mozilla-1.63.lintian-overrides
--- debian.rustc/libstd-rust-mozilla-1.63.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ debian/libstd-rust-mozilla-1.63.lintian-overrides 2023-01-14 09:38:46.000000000 +0100
@@ -0,0 +1,13 @@
+# "libstd" just seemed too generic
+libstd-rust-1.63 binary: package-name-doesnt-match-sonames
+libstd-rust-1.63 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.63 binary: dev-pkg-without-shlib-symlink
+libstd-rust-1.63 binary: shlib-without-versioned-soname
+libstd-rust-1.63 binary: unused-shlib-entry-in-control-file
+
+# 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.63 binary: library-not-linked-against-libc
diff -ruNp debian.rustc/libstd-rust-mozilla-dev.install debian/libstd-rust-mozilla-dev.install
--- debian.rustc/libstd-rust-mozilla-dev.install 1970-01-01 01:00:00.000000000 +0100
+++ debian/libstd-rust-mozilla-dev.install 2022-12-15 21:23:00.000000000 +0100
@@ -0,0 +1 @@
+usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/lib/
diff -ruNp debian.rustc/libstd-rust-mozilla-dev.lintian-overrides debian/libstd-rust-mozilla-dev.lintian-overrides
--- debian.rustc/libstd-rust-mozilla-dev.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ debian/libstd-rust-mozilla-dev.lintian-overrides 2022-12-15 21:23:00.000000000 +0100
@@ -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 -ruNp debian.rustc/libstd-rust-mozilla-dev-wasm32.install debian/libstd-rust-mozilla-dev-wasm32.install
--- debian.rustc/libstd-rust-mozilla-dev-wasm32.install 1970-01-01 01:00:00.000000000 +0100
+++ debian/libstd-rust-mozilla-dev-wasm32.install 2022-12-15 21:23:00.000000000 +0100
@@ -0,0 +1 @@
+usr/lib/rustlib/wasm32-*/lib/
diff -ruNp debian.rustc/libstd-rust-mozilla-dev-wasm32.lintian-overrides debian/libstd-rust-mozilla-dev-wasm32.lintian-overrides
--- debian.rustc/libstd-rust-mozilla-dev-wasm32.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ debian/libstd-rust-mozilla-dev-wasm32.lintian-overrides 2022-12-15 21:23:00.000000000 +0100
@@ -0,0 +1,6 @@
+# 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 -ruNp debian.rustc/libstd-rust-mozilla-dev-windows.install debian/libstd-rust-mozilla-dev-windows.install
--- debian.rustc/libstd-rust-mozilla-dev-windows.install 1970-01-01 01:00:00.000000000 +0100
+++ debian/libstd-rust-mozilla-dev-windows.install 2022-12-15 21:23:00.000000000 +0100
@@ -0,0 +1 @@
+usr/lib/rustlib/${env:WINDOWS_ARCH}-pc-windows-gnu/lib/
diff -ruNp debian.rustc/libstd-rust-mozilla-dev-windows.lintian-overrides debian/libstd-rust-mozilla-dev-windows.lintian-overrides
--- debian.rustc/libstd-rust-mozilla-dev-windows.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ debian/libstd-rust-mozilla-dev-windows.lintian-overrides 2023-01-14 09:38:46.000000000 +0100
@@ -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/x86_64-pc-windows-gnu/lib/lib*.dll.a]
diff -ruNp debian.rustc/make_orig-stage0_tarball.sh debian/make_orig-stage0_tarball.sh
--- debian.rustc/make_orig-stage0_tarball.sh 2022-12-15 21:23:00.000000000 +0100
+++ debian/make_orig-stage0_tarball.sh 2023-07-28 13:44:06.000000000 +0200
@@ -7,7 +7,7 @@
set -e
upstream_version="$(dpkg-parsechangelog -SVersion | sed -e 's/\(.*\)-.*/\1/g')"
-upstream_bootstrap_arch="${upstream_bootstrap_arch:-amd64 arm64 armhf i386 mips64 mips64el powerpc ppc64 ppc64el s390x}"
+upstream_bootstrap_arch="${upstream_bootstrap_arch:-amd64 arm64 armhf i386 mips64el mipsel ppc64el s390x}"
rm -f stage0/*/*.sha256
mkdir -p stage0 build && ln -sf ../stage0 build/cache
diff -ruNp debian.rustc/rules debian/rules
--- debian.rustc/rules 2023-01-14 09:38:46.000000000 +0100
+++ debian/rules 2023-07-28 13:44:06.000000000 +0200
@@ -7,9 +7,9 @@ include /usr/share/dpkg/architecture.mk
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-mozilla-$(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-mozilla:native .*,/p}" debian/control
# Version of /usr/bin/rustc
LOCAL_RUST_VERSION := $(shell rustc --version --verbose | sed -ne 's/^release: //p')
@@ -28,8 +28,8 @@ export RUST_LONG_VERSION
DEB_DESTDIR := $(CURDIR)/debian/tmp
# Use system LLVM (comment out to use vendored LLVM)
-LLVM_VERSION = 14
-OLD_LLVM_VERSION = 13
+LLVM_VERSION = 13
+OLD_LLVM_VERSION = 12
# Make it easier to test against a custom LLVM
ifneq (,$(LLVM_DESTDIR))
LLVM_LIBRARY_PATH := $(LLVM_DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH):$(LLVM_DESTDIR)/usr/lib
@@ -117,7 +117,7 @@ ifneq (,$(findstring nodoc,$(DEB_BUILD_O
BUILD_DOCS := false
endif
-BUILD_WASM := true
+BUILD_WASM := false
ifneq (,$(findstring nowasm,$(DEB_BUILD_PROFILES)))
BUILD_WASM := false
endif
@@ -405,9 +405,9 @@ endif
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-mozilla-src/usr/src/rustc-$(RUST_LONG_VERSION)/%)
# Get rid of lintian warnings
- find debian/rust-src/usr/src/rustc-$(RUST_LONG_VERSION) \
+ find debian/rust-mozilla-src/usr/src/rustc-$(RUST_LONG_VERSION) \
\( -name .gitignore \
-o -name 'LICENSE*' \
-o -name 'LICENCE' \
@@ -416,10 +416,10 @@ override_dh_install-indep:
-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-mozilla-src/usr/src/rustc-*/vendor/cssparser/docs/*.html
+ $(RM) -rf debian/rust-mozilla-src/usr/src/rustc-*/vendor/kuchiki/docs/*.html
+ $(RM) -rf debian/rust-mozilla-src/usr/src/rustc-*/vendor/url/docs/*.html
+ $(RM) -rf debian/rust-mozilla-src/usr/src/rustc-*/vendor/xz2/.gitmodules
override_dh_installchangelogs:
dh_installchangelogs RELEASES.md
@@ -437,12 +437,12 @@ override_dh_compress:
#
#override_dh_strip:
# # Work around #35733, #468333
-# find debian/libstd-rust-dev*/ -name '*.rlib' -execdir mv '{}' '{}.a' \;
+# find debian/libstd-rust-mozilla-dev*/ -name '*.rlib' -execdir mv '{}' '{}.a' \;
# # This is expected to print out lots of "File format unrecognized" warnings about
# # rust.metadata.bin and *.deflate but the .o files inside the rlibs should be stripped
# # Some files are still omitted because of #875780 however.
# dh_strip -v
-# find debian/libstd-rust-dev*/ -name '*.rlib.a' -execdir sh -c 'mv "$$1" "$${1%.a}"' - '{}' \;
+# find debian/libstd-rust-mozilla-dev*/ -name '*.rlib.a' -execdir sh -c 'mv "$$1" "$${1%.a}"' - '{}' \;
override_dh_dwz:
# otherwise rustc gets an empty multifile which lintian errors on, causing
@@ -494,3 +494,6 @@ source_orig-beta: debian/watch-beta
rm -f rustc-beta-src/version; \
rmdir -p rustc-beta-src; \
echo "prepared rustc $$newver.0~beta.$$bv in $$bd"
+
+override_dh_missing:
+ dh_missing --list-missing
diff -ruNp debian.rustc/rustc.install debian/rustc.install
--- debian.rustc/rustc.install 2023-01-14 09:38:46.000000000 +0100
+++ debian/rustc.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-usr/bin/rustc
-usr/bin/rustdoc
-usr/lib/rustlib/etc/rust_types.py
-debian/architecture.mk usr/share/rustc/
-debian/wasi-node usr/share/rustc/bin/
diff -ruNp debian.rustc/rustc.links debian/rustc.links
--- debian.rustc/rustc.links 2023-01-06 13:50:34.000000000 +0100
+++ debian/rustc.links 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-usr/bin/lld-14 usr/bin/rust-lld
-usr/bin/clang-14 usr/bin/rust-clang
-usr/bin/llvm-dwp-14 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
diff -ruNp debian.rustc/rustc.lintian-overrides debian/rustc.lintian-overrides
--- debian.rustc/rustc.lintian-overrides 2022-12-15 21:23:00.000000000 +0100
+++ debian/rustc.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
@@ -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 -ruNp debian.rustc/rust-clippy.install debian/rust-clippy.install
--- debian.rustc/rust-clippy.install 2022-12-15 21:23:00.000000000 +0100
+++ debian/rust-clippy.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/bin/clippy-driver
-usr/bin/cargo-clippy
diff -ruNp debian.rustc/rustc.manpages debian/rustc.manpages
--- debian.rustc/rustc.manpages 2022-12-15 21:23:00.000000000 +0100
+++ debian/rustc.manpages 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-debian/tmp/usr/share/man/man1/rustc.1
-debian/tmp/usr/share/man/man1/rustdoc.1
-
diff -ruNp debian.rustc/rustc-mozilla.install debian/rustc-mozilla.install
--- debian.rustc/rustc-mozilla.install 1970-01-01 01:00:00.000000000 +0100
+++ debian/rustc-mozilla.install 2023-01-14 09:38:46.000000000 +0100
@@ -0,0 +1,5 @@
+usr/bin/rustc
+usr/bin/rustdoc
+usr/lib/rustlib/etc/rust_types.py
+debian/architecture.mk usr/share/rustc/
+debian/wasi-node usr/share/rustc/bin/
diff -ruNp debian.rustc/rustc-mozilla.links debian/rustc-mozilla.links
--- debian.rustc/rustc-mozilla.links 1970-01-01 01:00:00.000000000 +0100
+++ debian/rustc-mozilla.links 2023-01-06 13:50:34.000000000 +0100
@@ -0,0 +1,6 @@
+usr/bin/lld-14 usr/bin/rust-lld
+usr/bin/clang-14 usr/bin/rust-clang
+usr/bin/llvm-dwp-14 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
diff -ruNp debian.rustc/rustc-mozilla.lintian-overrides debian/rustc-mozilla.lintian-overrides
--- debian.rustc/rustc-mozilla.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ debian/rustc-mozilla.lintian-overrides 2022-12-15 21:23:00.000000000 +0100
@@ -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 -ruNp debian.rustc/rustc-mozilla.manpages debian/rustc-mozilla.manpages
--- debian.rustc/rustc-mozilla.manpages 1970-01-01 01:00:00.000000000 +0100
+++ debian/rustc-mozilla.manpages 2022-12-15 21:23:00.000000000 +0100
@@ -0,0 +1,3 @@
+debian/tmp/usr/share/man/man1/rustc.1
+debian/tmp/usr/share/man/man1/rustdoc.1
+
diff -ruNp debian.rustc/rust-doc.doc-base.book debian/rust-doc.doc-base.book
--- debian.rustc/rust-doc.doc-base.book 2022-12-15 21:23:00.000000000 +0100
+++ debian/rust-doc.doc-base.book 1970-01-01 01:00:00.000000000 +0100
@@ -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 -ruNp debian.rustc/rust-doc.doc-base.reference debian/rust-doc.doc-base.reference
--- debian.rustc/rust-doc.doc-base.reference 2022-12-15 21:23:00.000000000 +0100
+++ debian/rust-doc.doc-base.reference 1970-01-01 01:00:00.000000000 +0100
@@ -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 -ruNp debian.rustc/rust-doc.docs debian/rust-doc.docs
--- debian.rustc/rust-doc.docs 2022-12-15 21:23:00.000000000 +0100
+++ debian/rust-doc.docs 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-debian/tmp/usr/share/doc/rust/html
diff -ruNp debian.rustc/rust-doc.install debian/rust-doc.install
--- debian.rustc/rust-doc.install 2022-12-15 21:23:00.000000000 +0100
+++ debian/rust-doc.install 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-debian/icons/rust-logo-32x32-blk.png usr/share/doc/rust-doc/html/
diff -ruNp debian.rustc/rustfmt.install debian/rustfmt.install
--- debian.rustc/rustfmt.install 2022-12-15 21:23:00.000000000 +0100
+++ debian/rustfmt.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/bin/rustfmt
-usr/bin/cargo-fmt
diff -ruNp debian.rustc/rustfmt-mozilla.install debian/rustfmt-mozilla.install
--- debian.rustc/rustfmt-mozilla.install 1970-01-01 01:00:00.000000000 +0100
+++ debian/rustfmt-mozilla.install 2022-12-15 21:23:00.000000000 +0100
@@ -0,0 +1,2 @@
+usr/bin/rustfmt
+usr/bin/cargo-fmt
diff -ruNp debian.rustc/rust-gdb.install debian/rust-gdb.install
--- debian.rustc/rust-gdb.install 2022-12-15 21:23:00.000000000 +0100
+++ debian/rust-gdb.install 1970-01-01 01:00:00.000000000 +0100
@@ -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 -ruNp debian.rustc/rust-gdb.links debian/rust-gdb.links
--- debian.rustc/rust-gdb.links 2022-12-15 21:23:00.000000000 +0100
+++ debian/rust-gdb.links 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/share/man/man1/gdb.1.gz usr/share/man/man1/rust-gdb.1.gz
diff -ruNp debian.rustc/rust-lldb.install debian/rust-lldb.install
--- debian.rustc/rust-lldb.install 2022-12-15 21:23:00.000000000 +0100
+++ debian/rust-lldb.install 1970-01-01 01:00:00.000000000 +0100
@@ -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 -ruNp debian.rustc/rust-lldb.links debian/rust-lldb.links
--- debian.rustc/rust-lldb.links 2023-01-06 13:50:34.000000000 +0100
+++ debian/rust-lldb.links 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/share/man/man1/lldb-14.1.gz usr/share/man/man1/rust-lldb.1.gz
diff -ruNp debian.rustc/rust-mozilla-clippy.install debian/rust-mozilla-clippy.install
--- debian.rustc/rust-mozilla-clippy.install 1970-01-01 01:00:00.000000000 +0100
+++ debian/rust-mozilla-clippy.install 2022-12-15 21:23:00.000000000 +0100
@@ -0,0 +1,2 @@
+usr/bin/clippy-driver
+usr/bin/cargo-clippy
diff -ruNp debian.rustc/rust-mozilla-doc.doc-base.book debian/rust-mozilla-doc.doc-base.book
--- debian.rustc/rust-mozilla-doc.doc-base.book 1970-01-01 01:00:00.000000000 +0100
+++ debian/rust-mozilla-doc.doc-base.book 2022-12-15 21:23:00.000000000 +0100
@@ -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 -ruNp debian.rustc/rust-mozilla-doc.doc-base.reference debian/rust-mozilla-doc.doc-base.reference
--- debian.rustc/rust-mozilla-doc.doc-base.reference 1970-01-01 01:00:00.000000000 +0100
+++ debian/rust-mozilla-doc.doc-base.reference 2022-12-15 21:23:00.000000000 +0100
@@ -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 -ruNp debian.rustc/rust-mozilla-doc.docs debian/rust-mozilla-doc.docs
--- debian.rustc/rust-mozilla-doc.docs 1970-01-01 01:00:00.000000000 +0100
+++ debian/rust-mozilla-doc.docs 2022-12-15 21:23:00.000000000 +0100
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/rust/html
diff -ruNp debian.rustc/rust-mozilla-doc.install debian/rust-mozilla-doc.install
--- debian.rustc/rust-mozilla-doc.install 1970-01-01 01:00:00.000000000 +0100
+++ debian/rust-mozilla-doc.install 2022-12-15 21:23:00.000000000 +0100
@@ -0,0 +1 @@
+debian/icons/rust-logo-32x32-blk.png usr/share/doc/rust-doc/html/
diff -ruNp debian.rustc/rust-mozilla-gdb.install debian/rust-mozilla-gdb.install
--- debian.rustc/rust-mozilla-gdb.install 1970-01-01 01:00:00.000000000 +0100
+++ debian/rust-mozilla-gdb.install 2022-12-15 21:23:00.000000000 +0100
@@ -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 -ruNp debian.rustc/rust-mozilla-gdb.links debian/rust-mozilla-gdb.links
--- debian.rustc/rust-mozilla-gdb.links 1970-01-01 01:00:00.000000000 +0100
+++ debian/rust-mozilla-gdb.links 2022-12-15 21:23:00.000000000 +0100
@@ -0,0 +1 @@
+usr/share/man/man1/gdb.1.gz usr/share/man/man1/rust-gdb.1.gz
diff -ruNp debian.rustc/rust-mozilla-lldb.install debian/rust-mozilla-lldb.install
--- debian.rustc/rust-mozilla-lldb.install 1970-01-01 01:00:00.000000000 +0100
+++ debian/rust-mozilla-lldb.install 2022-12-15 21:23:00.000000000 +0100
@@ -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 -ruNp debian.rustc/rust-mozilla-lldb.links debian/rust-mozilla-lldb.links
--- debian.rustc/rust-mozilla-lldb.links 1970-01-01 01:00:00.000000000 +0100
+++ debian/rust-mozilla-lldb.links 2023-01-06 13:50:34.000000000 +0100
@@ -0,0 +1 @@
+usr/share/man/man1/lldb-14.1.gz usr/share/man/man1/rust-lldb.1.gz
diff -ruNp debian.rustc/rust-mozilla-src.install debian/rust-mozilla-src.install
--- debian.rustc/rust-mozilla-src.install 1970-01-01 01:00:00.000000000 +0100
+++ debian/rust-mozilla-src.install 2022-12-15 21:23:00.000000000 +0100
@@ -0,0 +1,15 @@
+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.toml.example 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}
diff -ruNp debian.rustc/rust-mozilla-src.links debian/rust-mozilla-src.links
--- debian.rustc/rust-mozilla-src.links 1970-01-01 01:00:00.000000000 +0100
+++ debian/rust-mozilla-src.links 2022-12-15 21:23:00.000000000 +0100
@@ -0,0 +1 @@
+usr/src/rustc-${env:RUST_LONG_VERSION} usr/lib/rustlib/src/rust
diff -ruNp debian.rustc/rust-mozilla-src.lintian-overrides debian/rust-mozilla-src.lintian-overrides
--- debian.rustc/rust-mozilla-src.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ debian/rust-mozilla-src.lintian-overrides 2022-12-15 21:23:00.000000000 +0100
@@ -0,0 +1,6 @@
+# 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-*/*]
diff -ruNp debian.rustc/rust-src.install debian/rust-src.install
--- debian.rustc/rust-src.install 2022-12-15 21:23:00.000000000 +0100
+++ debian/rust-src.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +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.toml.example 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}
diff -ruNp debian.rustc/rust-src.links debian/rust-src.links
--- debian.rustc/rust-src.links 2022-12-15 21:23:00.000000000 +0100
+++ debian/rust-src.links 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/src/rustc-${env:RUST_LONG_VERSION} usr/lib/rustlib/src/rust
diff -ruNp debian.rustc/rust-src.lintian-overrides debian/rust-src.lintian-overrides
--- debian.rustc/rust-src.lintian-overrides 2022-12-15 21:23:00.000000000 +0100
+++ debian/rust-src.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +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-*/*]
Reply to: