Bug#1079514: bookworm-pu: package rustc-web/1.78.0+dfsg1-2~deb12u1
Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian.org@packages.debian.org
Usertags: pu
X-Debbugs-Cc: rustc-web@packages.debian.org
Control: affects -1 + src:rustc-web
Hi,
This is an update for rustc-web to a newer release, needed by both
newer chromium and firefox ESR 128 (turns out the version I backported
was fine for firefox 125 in sid at the time, but 128 bumped it). I've
gone for rustc 1.78 because it can be built with LLVM 16. For the next
firefox ESR release (in about a year) or perhaps earlier for chromium
we'll probably need to update rustc and backport a newer LLVM.
I'm attaching a debdiff against rustc 1.78. The packages have been
used by Andres Salomon to successfully build and run chromium against
bookworm. I haven't been able to test firefox against it yet due to
OOM issues.
Cheers,
Emilio
diff -ruNp debian.sid/cargo.bash-completion debian.bookworm/cargo.bash-completion
--- debian.sid/cargo.bash-completion 2024-06-05 09:37:20.000000000 +0200
+++ debian.bookworm/cargo.bash-completion 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-etc/bash_completion.d/cargo cargo
diff -ruNp debian.sid/cargo-doc.docs debian.bookworm/cargo-doc.docs
--- debian.sid/cargo-doc.docs 2024-06-05 09:37:20.000000000 +0200
+++ debian.bookworm/cargo-doc.docs 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/share/doc/cargo/reference
-usr/share/doc/cargo/book
diff -ruNp debian.sid/cargo.install debian.bookworm/cargo.install
--- debian.sid/cargo.install 2024-06-05 09:37:20.000000000 +0200
+++ debian.bookworm/cargo.install 1970-01-01 01:00:00.000000000 +0100
@@ -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 -ruNp debian.sid/cargo.manpages debian.bookworm/cargo.manpages
--- debian.sid/cargo.manpages 2024-06-05 09:37:20.000000000 +0200
+++ debian.bookworm/cargo.manpages 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/share/man/man1/cargo-*.1
-usr/share/man/man1/cargo.1
diff -ruNp debian.sid/cargo-web.bash-completion debian.bookworm/cargo-web.bash-completion
--- debian.sid/cargo-web.bash-completion 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/cargo-web.bash-completion 2024-06-05 09:37:20.000000000 +0200
@@ -0,0 +1 @@
+etc/bash_completion.d/cargo cargo
diff -ruNp debian.sid/cargo-web-doc.docs debian.bookworm/cargo-web-doc.docs
--- debian.sid/cargo-web-doc.docs 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/cargo-web-doc.docs 2024-06-05 09:37:20.000000000 +0200
@@ -0,0 +1,2 @@
+usr/share/doc/cargo/reference
+usr/share/doc/cargo/book
diff -ruNp debian.sid/cargo-web.install debian.bookworm/cargo-web.install
--- debian.sid/cargo-web.install 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/cargo-web.install 2024-06-05 09:37:20.000000000 +0200
@@ -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 -ruNp debian.sid/cargo-web.manpages debian.bookworm/cargo-web.manpages
--- debian.sid/cargo-web.manpages 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/cargo-web.manpages 2024-06-05 09:37:20.000000000 +0200
@@ -0,0 +1,2 @@
+usr/share/man/man1/cargo-*.1
+usr/share/man/man1/cargo.1
diff -ruNp debian.sid/changelog debian.bookworm/changelog
--- debian.sid/changelog 2024-06-24 08:25:58.000000000 +0200
+++ debian.bookworm/changelog 2024-08-22 09:35:15.000000000 +0200
@@ -1,3 +1,14 @@
+rustc-web (1.78.0+dfsg1-2~deb12u1) bookworm; urgency=medium
+
+ * Non-maintainer upload.
+ * Backport rustc 1.78, as required by newer firefox and chromium.
+ * Rename rustc backport to rustc-web.
+ * Use LLVM 16.
+ * Disable wasm, -all, -llvm packages.
+ * Vendor libgit2 dependency.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org> Thu, 22 Aug 2024 09:35:15 +0200
+
rustc (1.78.0+dfsg1-2) unstable; urgency=medium
* unbreak loongson64 build
diff -ruNp debian.sid/control debian.bookworm/control
--- debian.sid/control 2024-06-24 07:36:38.000000000 +0200
+++ debian.bookworm/control 2024-08-13 10:46:43.000000000 +0200
@@ -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,16 +13,16 @@ Build-Depends:
debhelper-compat (= 13),
dpkg-dev (>= 1.17.14),
python3:native,
- cargo:native (>= 1.77.0+dfsg) <!pkg.rustc.dlstage0>,
- rustc:native (>= 1.77.0+dfsg) <!pkg.rustc.dlstage0>,
- rustc:native (<= 1.78.0++) <!pkg.rustc.dlstage0>,
- llvm-17-dev:native,
- llvm-17-tools:native,
+# cargo:native (>= 1.77.0+dfsg) <!pkg.rustc.dlstage0>,
+# rustc:native (>= 1.77.0+dfsg) <!pkg.rustc.dlstage0>,
+# rustc:native (<= 1.78.0++) <!pkg.rustc.dlstage0>,
+ llvm-16-dev:native,
+ llvm-16-tools:native,
gcc-mingw-w64-x86-64-posix:native [amd64] <!nowindows>,
gcc-mingw-w64-i686-posix:native [i386] <!nowindows>,
- libllvm17t64 (>= 1:17.0.0),
- libclang-rt-17-dev:native,
- libclang-rt-17-dev,
+ libllvm16 (>= 1:16.0.0),
+ libclang-rt-16-dev:native,
+ libclang-rt-16-dev,
cmake (>= 3.0),
# needed by some vendor crates
pkgconf:native,
@@ -38,9 +38,11 @@ Build-Depends:
libssh2-1-dev,
libssl-dev,
libsqlite3-dev,
- libgit2-dev (>= 1.7.2),
- libgit2-dev (<< 1.8~~),
+# libgit2-dev (>= 1.7.2),
+# libgit2-dev (<< 1.8~~),
libhttp-parser-dev,
+# for libgit2
+ libpcre3-dev,
# test dependencies:
binutils (>= 2.26) <!nocheck> | binutils-2.26 <!nocheck>,
# temporarily disabled cause of #1066794 / t64 transition
@@ -52,26 +54,24 @@ Build-Depends:
curl <pkg.rustc.dlstage0>,
ca-certificates <pkg.rustc.dlstage0>,
Build-Depends-Indep:
- wasi-libc (>= 0.0~git20230821.ec4566b~~) <!nowasm>,
- wasi-libc (<= 0.0~git20230821.ec4566b++) <!nowasm>,
- clang-17:native,
+ clang-16:native,
Build-Conflicts: gdb-minimal <!nocheck>
Standards-Version: 4.6.2
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-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}),
+ cargo-web (= ${binary:Version}),
# llvm is needed for llvm-dwp for -C split-debuginfo=packed
- rust-llvm,
+ rust-web-llvm,
Replaces: libstd-rust-dev (<< 1.25.0+dfsg1-2~~)
Breaks: libstd-rust-dev (<< 1.25.0+dfsg1-2~~)
Description: Rust systems programming language
@@ -87,12 +87,15 @@ Description: Rust systems programming la
generic programming and meta-programming, in both static and dynamic
styles.
-Package: libstd-rust-1.78
+Package: libstd-rust-web-1.78
Section: libs
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libstd-rust-1.78
+Replaces: libstd-rust-1.78
+Provides: libstd-rust-1.78
Description: Rust standard libraries
Rust is a curly-brace, block-structured expression language. It
visually resembles the C language family, but differs significantly
@@ -109,12 +112,15 @@ 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-web-dev
Section: libdevel
Architecture: any
Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends},
- libstd-rust-1.78 (= ${binary:Version}),
+ libstd-rust-web-1.78 (= ${binary:Version}),
+Conflicts: 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
@@ -132,7 +138,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-web-dev-windows
Section: libdevel
Architecture: amd64 i386
Multi-Arch: same
@@ -140,6 +146,8 @@ Depends: ${shlibs:Depends}, ${misc:Depen
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: <!nowindows>
Description: Rust standard libraries - development files
Rust is a curly-brace, block-structured expression language. It
@@ -158,41 +166,12 @@ 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-17, clang-17,
-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-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
@@ -209,11 +188,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-web-lldb
Architecture: all
-# When updating, also update rust-lldb.links
-Depends: lldb-17, ${misc:Depends}, python3-lldb-17
-Replaces: rustc (<< 1.1.0+dfsg1-1)
+# When updating, also update rust-web-lldb.links
+Depends: lldb-16, ${misc:Depends}, python3-lldb-16
+Conflicts: rust-lldb, rust-mozilla-lldb
+Replaces: rustc (<< 1.1.0+dfsg1-1), 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
@@ -230,46 +210,15 @@ Description: Rust debugger (lldb)
This package contains pretty printers and a wrapper script for
invoking lldb on rust binaries.
-Package: rust-llvm
-Architecture: all
-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:
- ${misc:Depends},
-# lld and clang are needed for wasm compilation
- lld-17, clang-17,
-# llvm is needed for llvm-dwp for split-debuginfo=packed
- llvm-17
-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.
-
-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
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
@@ -286,9 +235,11 @@ Description: Rust systems programming la
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: 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
@@ -305,12 +256,13 @@ 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
+Package: rust-web-clippy
Architecture: any
Multi-Arch: allowed
Depends: ${misc:Depends}, ${shlibs:Depends},
- libstd-rust-1.78 (= ${binary:Version})
-Recommends: cargo
+ libstd-rust-web-1.78 (= ${binary:Version})
+Recommends: cargo-web
+Conflicts: rust-clippy
Description: Rust linter
Rust is a curly-brace, block-structured expression language. It
visually resembles the C language family, but differs significantly
@@ -337,7 +289,8 @@ Package: rustfmt
Architecture: any
Multi-Arch: allowed
Depends: ${misc:Depends}, ${shlibs:Depends},
-Recommends: cargo
+Recommends: cargo-web
+Conflicts: rustfmt
Description: Rust formatting helper
Rust is a curly-brace, block-structured expression language. It
visually resembles the C language family, but differs significantly
@@ -355,46 +308,16 @@ Description: Rust formatting helper
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 (= ${binary:Version})
-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.
-
# 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
-Suggests: cargo-doc, python3
+Suggests: cargo-web-doc, python3
+Conflicts: 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.
@@ -409,12 +332,13 @@ Description: Rust package manager
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
Depends: ${misc:Depends}
+Conflicts: cargo-doc
Description: Rust package manager, documentation
Cargo is a tool that allows Rust projects to declare their various
dependencies, and ensure that you'll always get a repeatable build.
Binary files debian.sid/libgit2_1.7.2+ds.orig.tar.xz and debian.bookworm/libgit2_1.7.2+ds.orig.tar.xz differ
diff -ruNp debian.sid/libstd-rust-1.78.install debian.bookworm/libstd-rust-1.78.install
--- debian.sid/libstd-rust-1.78.install 2024-06-24 07:36:38.000000000 +0200
+++ debian.bookworm/libstd-rust-1.78.install 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/${DEB_HOST_MULTIARCH}/
diff -ruNp debian.sid/libstd-rust-1.78.lintian-overrides debian.bookworm/libstd-rust-1.78.lintian-overrides
--- debian.sid/libstd-rust-1.78.lintian-overrides 2024-06-24 07:36:38.000000000 +0200
+++ debian.bookworm/libstd-rust-1.78.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-# "libstd" just seemed too generic
-libstd-rust-1.78 binary: package-name-doesnt-match-sonames
-libstd-rust-1.78 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.78 binary: dev-pkg-without-shlib-symlink
-libstd-rust-1.78 binary: shlib-without-versioned-soname
-libstd-rust-1.78 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.78 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.78 binary: library-not-linked-against-libc
diff -ruNp debian.sid/libstd-rust-1.78.triggers debian.bookworm/libstd-rust-1.78.triggers
--- debian.sid/libstd-rust-1.78.triggers 2024-06-24 07:36:38.000000000 +0200
+++ debian.bookworm/libstd-rust-1.78.triggers 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-# normally added by dh_makeshlibs, but fails for our versioning scheme
-activate-noawait ldconfig
diff -ruNp debian.sid/libstd-rust-dev.install debian.bookworm/libstd-rust-dev.install
--- debian.sid/libstd-rust-dev.install 2024-06-05 09:37:20.000000000 +0200
+++ debian.bookworm/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.sid/libstd-rust-dev.lintian-overrides debian.bookworm/libstd-rust-dev.lintian-overrides
--- debian.sid/libstd-rust-dev.lintian-overrides 2024-06-05 09:37:20.000000000 +0200
+++ debian.bookworm/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.sid/libstd-rust-dev-wasm32.install debian.bookworm/libstd-rust-dev-wasm32.install
--- debian.sid/libstd-rust-dev-wasm32.install 2024-06-05 09:37:20.000000000 +0200
+++ debian.bookworm/libstd-rust-dev-wasm32.install 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/rustlib/wasm32-*/lib/
diff -ruNp debian.sid/libstd-rust-dev-wasm32.lintian-overrides debian.bookworm/libstd-rust-dev-wasm32.lintian-overrides
--- debian.sid/libstd-rust-dev-wasm32.lintian-overrides 2024-06-05 09:37:20.000000000 +0200
+++ debian.bookworm/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.sid/libstd-rust-dev-windows.install debian.bookworm/libstd-rust-dev-windows.install
--- debian.sid/libstd-rust-dev-windows.install 2024-06-05 09:37:20.000000000 +0200
+++ debian.bookworm/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.sid/libstd-rust-dev-windows.lintian-overrides debian.bookworm/libstd-rust-dev-windows.lintian-overrides
--- debian.sid/libstd-rust-dev-windows.lintian-overrides 2024-06-05 09:37:20.000000000 +0200
+++ debian.bookworm/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/*-pc-windows-gnu/lib/lib*.dll.a]
diff -ruNp debian.sid/libstd-rust-web-1.78.install debian.bookworm/libstd-rust-web-1.78.install
--- debian.sid/libstd-rust-web-1.78.install 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/libstd-rust-web-1.78.install 2024-06-24 07:36:38.000000000 +0200
@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/
diff -ruNp debian.sid/libstd-rust-web-1.78.lintian-overrides debian.bookworm/libstd-rust-web-1.78.lintian-overrides
--- debian.sid/libstd-rust-web-1.78.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/libstd-rust-web-1.78.lintian-overrides 2024-06-24 07:36:38.000000000 +0200
@@ -0,0 +1,16 @@
+# "libstd" just seemed too generic
+libstd-rust-1.78 binary: package-name-doesnt-match-sonames
+libstd-rust-1.78 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.78 binary: dev-pkg-without-shlib-symlink
+libstd-rust-1.78 binary: shlib-without-versioned-soname
+libstd-rust-1.78 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.78 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.78 binary: library-not-linked-against-libc
diff -ruNp debian.sid/libstd-rust-web-1.78.triggers debian.bookworm/libstd-rust-web-1.78.triggers
--- debian.sid/libstd-rust-web-1.78.triggers 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/libstd-rust-web-1.78.triggers 2024-06-24 07:36:38.000000000 +0200
@@ -0,0 +1,2 @@
+# normally added by dh_makeshlibs, but fails for our versioning scheme
+activate-noawait ldconfig
diff -ruNp debian.sid/libstd-rust-web-dev.install debian.bookworm/libstd-rust-web-dev.install
--- debian.sid/libstd-rust-web-dev.install 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/libstd-rust-web-dev.install 2024-06-05 09:37:20.000000000 +0200
@@ -0,0 +1 @@
+usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/lib/
diff -ruNp debian.sid/libstd-rust-web-dev.lintian-overrides debian.bookworm/libstd-rust-web-dev.lintian-overrides
--- debian.sid/libstd-rust-web-dev.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/libstd-rust-web-dev.lintian-overrides 2024-06-05 09:37:20.000000000 +0200
@@ -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.sid/libstd-rust-web-dev-wasm32.install debian.bookworm/libstd-rust-web-dev-wasm32.install
--- debian.sid/libstd-rust-web-dev-wasm32.install 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/libstd-rust-web-dev-wasm32.install 2024-06-05 09:37:20.000000000 +0200
@@ -0,0 +1 @@
+usr/lib/rustlib/wasm32-*/lib/
diff -ruNp debian.sid/libstd-rust-web-dev-wasm32.lintian-overrides debian.bookworm/libstd-rust-web-dev-wasm32.lintian-overrides
--- debian.sid/libstd-rust-web-dev-wasm32.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/libstd-rust-web-dev-wasm32.lintian-overrides 2024-06-05 09:37:20.000000000 +0200
@@ -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.sid/libstd-rust-web-dev-windows.install debian.bookworm/libstd-rust-web-dev-windows.install
--- debian.sid/libstd-rust-web-dev-windows.install 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/libstd-rust-web-dev-windows.install 2024-06-05 09:37:20.000000000 +0200
@@ -0,0 +1 @@
+usr/lib/rustlib/${env:WINDOWS_ARCH}-pc-windows-gnu/lib/
diff -ruNp debian.sid/libstd-rust-web-dev-windows.lintian-overrides debian.bookworm/libstd-rust-web-dev-windows.lintian-overrides
--- debian.sid/libstd-rust-web-dev-windows.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/libstd-rust-web-dev-windows.lintian-overrides 2024-06-05 09:37:20.000000000 +0200
@@ -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 -ruNp debian.sid/make_orig-stage0_tarball.sh debian.bookworm/make_orig-stage0_tarball.sh
--- debian.sid/make_orig-stage0_tarball.sh 2024-06-20 13:39:15.000000000 +0200
+++ debian.bookworm/make_orig-stage0_tarball.sh 2024-08-13 10:46:43.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 ppc64el riscv64 s390x}"
+upstream_bootstrap_arch="${upstream_bootstrap_arch:-amd64 arm64 armhf i386 ppc64el s390x}"
rm -f stage0/*/*.sha256
mkdir -p stage0 build && ln -sf ../stage0 build/cache
diff -ruNp debian.sid/patches/series debian.bookworm/patches/series
--- debian.sid/patches/series 2024-06-24 08:25:04.000000000 +0200
+++ debian.bookworm/patches/series 2024-08-13 10:46:43.000000000 +0200
@@ -26,6 +26,7 @@ vendor/u-hurd-gix-index-2.patch
vendor/u-hurd-socket2.patch
vendor/u-hurd-rustix.patch
vendor/d-0003-cc-psm-rebuild-wasm32.patch
+vendor/use-vendored-libgit.patch
build/d-bootstrap-rustflags.patch
build/d-bootstrap-install-symlinks.patch
build/d-bootstrap-disable-git.patch
diff -ruNp debian.sid/patches/vendor/use-vendored-libgit.patch debian.bookworm/patches/vendor/use-vendored-libgit.patch
--- debian.sid/patches/vendor/use-vendored-libgit.patch 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/patches/vendor/use-vendored-libgit.patch 2024-08-13 10:46:43.000000000 +0200
@@ -0,0 +1,54 @@
+Author: Emilio Pozuelo Monfort <pochu@debian.org>
+
+Use vendored libgit
+
+--- a/vendor/libgit2-sys/build.rs
++++ b/vendor/libgit2-sys/build.rs
+@@ -49,7 +49,7 @@ The build is now aborting. To disable, u
+ }
+
+ // 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;
+@@ -90,8 +90,8 @@ The build is now aborting. To disable, u
+ add_c_files(&mut cfg, "libgit2/src/libgit2/streams");
+
+ // Always use bundled http-parser for now
+- cfg.include("libgit2/deps/http-parser")
+- .file("libgit2/deps/http-parser/http_parser.c");
++ //cfg.include("libgit2/deps/http-parser")
++ // .file("libgit2/deps/http-parser/http_parser.c");
+
+ // external/system xdiff is not yet supported
+ cfg.include("libgit2/deps/xdiff");
+@@ -104,7 +104,7 @@ The build is now aborting. To disable, u
+ // 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"))
+@@ -118,7 +118,8 @@ The build is now aborting. To disable, u
+ .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");
+@@ -238,6 +239,8 @@ The build is now aborting. To disable, u
+
+ 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 -ruNp debian.sid/rules debian.bookworm/rules
--- debian.sid/rules 2024-06-24 07:36:38.000000000 +0200
+++ debian.bookworm/rules 2024-08-13 10:46:43.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-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')
@@ -34,8 +34,8 @@ export RUST_LONG_VERSION
DEB_DESTDIR := $(CURDIR)/debian/tmp
# Use system LLVM (comment out to use vendored LLVM)
-LLVM_VERSION = 17
-OLD_LLVM_VERSION = 16
+LLVM_VERSION = 16
+OLD_LLVM_VERSION = 15
# Cargo-specific flags
export LIBSSH2_SYS_USE_PKG_CONFIG=1
# Make it easier to test against a custom LLVM
@@ -144,7 +144,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
@@ -260,6 +260,9 @@ extra-vendor:
.PHONY: extra-vendor
debian/dh_auto_configure.stamp: debian/config.toml check-no-old-llvm extra-vendor
+ set -e; \
+ tar xf debian/libgit2_1.7.2+ds.orig.tar.xz; \
+ mv libgit2-1.7.2 vendor/libgit2-sys/libgit2
# 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
@@ -291,6 +294,8 @@ override_dh_auto_clean:
$(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)
@@ -475,9 +480,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-web-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-web-src/usr/src/rustc-$(RUST_LONG_VERSION) \
\( -name .gitignore \
-o -name 'LICENSE*' \
-o -name 'LICENCE' \
@@ -486,10 +491,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-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 -ruNp debian.sid/rustc.install debian.bookworm/rustc.install
--- debian.sid/rustc.install 2024-06-05 09:37:20.000000000 +0200
+++ debian.bookworm/rustc.install 1970-01-01 01:00:00.000000000 +0100
@@ -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 -ruNp debian.sid/rustc.lintian-overrides debian.bookworm/rustc.lintian-overrides
--- debian.sid/rustc.lintian-overrides 2024-06-05 09:37:20.000000000 +0200
+++ debian.bookworm/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.sid/rust-clippy.install debian.bookworm/rust-clippy.install
--- debian.sid/rust-clippy.install 2024-06-05 09:37:20.000000000 +0200
+++ debian.bookworm/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.sid/rustc.manpages debian.bookworm/rustc.manpages
--- debian.sid/rustc.manpages 2024-06-05 09:37:20.000000000 +0200
+++ debian.bookworm/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.sid/rustc-web.install debian.bookworm/rustc-web.install
--- debian.sid/rustc-web.install 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/rustc-web.install 2024-06-05 09:37:20.000000000 +0200
@@ -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 -ruNp debian.sid/rustc-web.lintian-overrides debian.bookworm/rustc-web.lintian-overrides
--- debian.sid/rustc-web.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/rustc-web.lintian-overrides 2024-06-05 09:37:20.000000000 +0200
@@ -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.sid/rustc-web.manpages debian.bookworm/rustc-web.manpages
--- debian.sid/rustc-web.manpages 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/rustc-web.manpages 2024-06-05 09:37:20.000000000 +0200
@@ -0,0 +1,3 @@
+debian/tmp/usr/share/man/man1/rustc.1
+debian/tmp/usr/share/man/man1/rustdoc.1
+
diff -ruNp debian.sid/rust-doc.doc-base.book debian.bookworm/rust-doc.doc-base.book
--- debian.sid/rust-doc.doc-base.book 2024-06-05 09:37:20.000000000 +0200
+++ debian.bookworm/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.sid/rust-doc.doc-base.reference debian.bookworm/rust-doc.doc-base.reference
--- debian.sid/rust-doc.doc-base.reference 2024-06-05 09:37:20.000000000 +0200
+++ debian.bookworm/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.sid/rust-doc.docs debian.bookworm/rust-doc.docs
--- debian.sid/rust-doc.docs 2024-06-24 07:36:38.000000000 +0200
+++ debian.bookworm/rust-doc.docs 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-debian/tmp/usr/share/doc/docs/html
diff -ruNp debian.sid/rust-doc.install debian.bookworm/rust-doc.install
--- debian.sid/rust-doc.install 2024-06-05 09:37:20.000000000 +0200
+++ debian.bookworm/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.sid/rust-gdb.install debian.bookworm/rust-gdb.install
--- debian.sid/rust-gdb.install 2024-06-05 09:37:20.000000000 +0200
+++ debian.bookworm/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.sid/rust-gdb.links debian.bookworm/rust-gdb.links
--- debian.sid/rust-gdb.links 2024-06-05 09:37:20.000000000 +0200
+++ debian.bookworm/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.sid/rust-lldb.install debian.bookworm/rust-lldb.install
--- debian.sid/rust-lldb.install 2024-06-05 09:37:20.000000000 +0200
+++ debian.bookworm/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.sid/rust-lldb.links debian.bookworm/rust-lldb.links
--- debian.sid/rust-lldb.links 2024-06-05 09:37:20.000000000 +0200
+++ debian.bookworm/rust-lldb.links 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/share/man/man1/lldb-17.1.gz usr/share/man/man1/rust-lldb.1.gz
diff -ruNp debian.sid/rust-llvm.links debian.bookworm/rust-llvm.links
--- debian.sid/rust-llvm.links 2024-06-05 09:37:20.000000000 +0200
+++ debian.bookworm/rust-llvm.links 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-usr/bin/lld-17 usr/bin/rust-lld
-usr/bin/clang-17 usr/bin/rust-clang
-usr/bin/llvm-dwp-17 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
-# For applications that use cargo-binutils, e.g. grcov
-usr/bin/llvm-profdata-17 usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/llvm-profdata
-usr/bin/llvm-cov-17 usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/llvm-cov
diff -ruNp debian.sid/rust-src.install debian.bookworm/rust-src.install
--- debian.sid/rust-src.install 2024-06-05 09:37:20.000000000 +0200
+++ debian.bookworm/rust-src.install 1970-01-01 01:00:00.000000000 +0100
@@ -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 -ruNp debian.sid/rust-src.links debian.bookworm/rust-src.links
--- debian.sid/rust-src.links 2024-06-05 09:37:20.000000000 +0200
+++ debian.bookworm/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.sid/rust-src.lintian-overrides debian.bookworm/rust-src.lintian-overrides
--- debian.sid/rust-src.lintian-overrides 2024-06-05 09:37:20.000000000 +0200
+++ debian.bookworm/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-*/*]
diff -ruNp debian.sid/rust-web-clippy.install debian.bookworm/rust-web-clippy.install
--- debian.sid/rust-web-clippy.install 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/rust-web-clippy.install 2024-06-05 09:37:20.000000000 +0200
@@ -0,0 +1,2 @@
+usr/bin/clippy-driver
+usr/bin/cargo-clippy
diff -ruNp debian.sid/rust-web-doc.doc-base.book debian.bookworm/rust-web-doc.doc-base.book
--- debian.sid/rust-web-doc.doc-base.book 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/rust-web-doc.doc-base.book 2024-06-05 09:37:20.000000000 +0200
@@ -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.sid/rust-web-doc.doc-base.reference debian.bookworm/rust-web-doc.doc-base.reference
--- debian.sid/rust-web-doc.doc-base.reference 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/rust-web-doc.doc-base.reference 2024-06-05 09:37:20.000000000 +0200
@@ -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.sid/rust-web-doc.docs debian.bookworm/rust-web-doc.docs
--- debian.sid/rust-web-doc.docs 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/rust-web-doc.docs 2024-06-24 07:36:38.000000000 +0200
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/docs/html
diff -ruNp debian.sid/rust-web-doc.install debian.bookworm/rust-web-doc.install
--- debian.sid/rust-web-doc.install 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/rust-web-doc.install 2024-06-05 09:37:20.000000000 +0200
@@ -0,0 +1 @@
+debian/icons/rust-logo-32x32-blk.png usr/share/doc/rust-doc/html/
diff -ruNp debian.sid/rust-web-gdb.install debian.bookworm/rust-web-gdb.install
--- debian.sid/rust-web-gdb.install 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/rust-web-gdb.install 2024-06-05 09:37:20.000000000 +0200
@@ -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.sid/rust-web-gdb.links debian.bookworm/rust-web-gdb.links
--- debian.sid/rust-web-gdb.links 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/rust-web-gdb.links 2024-06-05 09:37:20.000000000 +0200
@@ -0,0 +1 @@
+usr/share/man/man1/gdb.1.gz usr/share/man/man1/rust-gdb.1.gz
diff -ruNp debian.sid/rust-web-lldb.install debian.bookworm/rust-web-lldb.install
--- debian.sid/rust-web-lldb.install 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/rust-web-lldb.install 2024-06-05 09:37:20.000000000 +0200
@@ -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.sid/rust-web-lldb.links debian.bookworm/rust-web-lldb.links
--- debian.sid/rust-web-lldb.links 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/rust-web-lldb.links 2024-06-05 09:37:20.000000000 +0200
@@ -0,0 +1 @@
+usr/share/man/man1/lldb-17.1.gz usr/share/man/man1/rust-lldb.1.gz
diff -ruNp debian.sid/rust-web-llvm.links debian.bookworm/rust-web-llvm.links
--- debian.sid/rust-web-llvm.links 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/rust-web-llvm.links 2024-06-05 09:37:20.000000000 +0200
@@ -0,0 +1,9 @@
+usr/bin/lld-17 usr/bin/rust-lld
+usr/bin/clang-17 usr/bin/rust-clang
+usr/bin/llvm-dwp-17 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
+# For applications that use cargo-binutils, e.g. grcov
+usr/bin/llvm-profdata-17 usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/llvm-profdata
+usr/bin/llvm-cov-17 usr/lib/rustlib/${env:DEB_HOST_RUST_TYPE}/bin/llvm-cov
diff -ruNp debian.sid/rust-web-src.install debian.bookworm/rust-web-src.install
--- debian.sid/rust-web-src.install 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/rust-web-src.install 2024-06-05 09:37:20.000000000 +0200
@@ -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 -ruNp debian.sid/rust-web-src.links debian.bookworm/rust-web-src.links
--- debian.sid/rust-web-src.links 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/rust-web-src.links 2024-06-05 09:37:20.000000000 +0200
@@ -0,0 +1 @@
+usr/src/rustc-${env:RUST_LONG_VERSION} usr/lib/rustlib/src/rust
diff -ruNp debian.sid/rust-web-src.lintian-overrides debian.bookworm/rust-web-src.lintian-overrides
--- debian.sid/rust-web-src.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ debian.bookworm/rust-web-src.lintian-overrides 2024-06-05 09:37:20.000000000 +0200
@@ -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.sid/source/include-binaries debian.bookworm/source/include-binaries
--- debian.sid/source/include-binaries 2024-06-05 09:37:20.000000000 +0200
+++ debian.bookworm/source/include-binaries 2024-08-13 10:46:43.000000000 +0200
@@ -1,4 +1,5 @@
debian/icons/rust-logo-32x32-blk.png
+debian/libgit2_1.7.2+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/
Reply to: