X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=debian%2Fcontrol;h=b39b0dbfeaf4fe0248d340e1a9ec64b7a15bbf73;hb=HEAD;hp=89b35524cfb040fe05c248c91e6a583d7080802b;hpb=46d3380e147eea3a1da248d0c9b777365fa1117f;p=rustc.git

diff --git a/debian/control b/debian/control
index 89b35524cf..8fed7104ae 100644
--- a/debian/control
+++ b/debian/control
@@ -13,17 +13,19 @@ Build-Depends:
  debhelper-compat (= 13),
  dpkg-dev (>= 1.17.14),
  python3:native,
- cargo:native (>= 1.69.0+dfsg)      <!pkg.rustc.dlstage0>,
- rustc:native (>= 1.69.0+dfsg) <!pkg.rustc.dlstage0>,
- rustc:native (<= 1.70.0++)    <!pkg.rustc.dlstage0>,
- llvm-16-dev:native,
- llvm-16-tools:native,
+ cargo:native (>= 1.79.0+dfsg)      <!pkg.rustc.dlstage0>,
+ rustc:native (>= 1.79.0+dfsg) <!pkg.rustc.dlstage0>,
+ rustc:native (<= 1.80.1++)    <!pkg.rustc.dlstage0>,
+ llvm-17-dev:native,
+ llvm-17-tools:native,
  gcc-mingw-w64-x86-64-posix:native [amd64] <!nowindows>,
  gcc-mingw-w64-i686-posix:native [i386] <!nowindows>,
- libllvm16t64 (>= 1:16.0.0),
- libclang-rt-16-dev:native,
- cmake (>= 3.0) | cmake3,
+ libllvm17 (>= 1:17.0.0),
+ libclang-rt-17-dev:native,
+ libclang-rt-17-dev,
+ cmake (>= 3.0),
 # needed by some vendor crates
+ pkgconf:native,
  pkgconf,
 # this is sometimes needed by rustc_llvm
  zlib1g-dev:native,
@@ -32,15 +34,18 @@ Build-Depends:
  liblzma-dev:native,
 # used by cargo
  bash-completion,
- libcurl4-gnutls-dev | libcurl4-openssl-dev,
+ libcurl4-openssl-dev | libcurl4-gnutls-dev,
  libssh2-1-dev,
- libgit2-dev (>= 1.5.0),
- libgit2-dev (<< 1.6~~),
+ libssl-dev,
+ libsqlite3-dev,
+ libgit2-dev (>= 1.7.2),
+ libgit2-dev (<< 1.8~~),
  libhttp-parser-dev,
+ libonig-dev,
 # test dependencies:
  binutils (>= 2.26) <!nocheck> | binutils-2.26 <!nocheck>,
 # temporarily disabled cause of #1066794 / t64 transition
-# git <!nocheck>,
+ git <!nocheck>,
  procps <!nocheck>,
 # below are optional tools even for 'make check'
  gdb (>= 7.12) <!nocheck>,
@@ -48,11 +53,12 @@ Build-Depends:
  curl <pkg.rustc.dlstage0>,
  ca-certificates <pkg.rustc.dlstage0>,
 Build-Depends-Indep:
- wasi-libc (>= 0.0~git20230113.4362b18-2~) <!nowasm>,
- wasi-libc (<= 0.0~git20230113.4362b18++) <!nowasm>,
- clang-16:native,
-Build-Conflicts: gdb-minimal <!nocheck>
-Standards-Version: 4.6.2
+ wasi-libc (>= 0.0~git20240411.9e8c542-3~~) <!nowasm>,
+ wasi-libc (<= 0.0~git20240411.9e8c542++) <!nowasm>,
+ clang-17:native,
+# see #1057780, gdb now Conflicts gdb-minimal
+#Build-Conflicts: gdb-minimal <!nocheck>
+Standards-Version: 4.7.0
 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
@@ -65,12 +71,9 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  libstd-rust-dev (= ${binary:Version}),
  gcc, libc-dev, binutils (>= 2.26)
 Recommends:
- cargo (>= 0.71.0~~), cargo (<< 0.72.0~~),
+ cargo (= ${binary:Version}),
 # llvm is needed for llvm-dwp for -C split-debuginfo=packed
- llvm-16,
-Suggests:
-# lld and clang are needed for wasm compilation
- lld-16, clang-16,
+ rust-llvm,
 Replaces: libstd-rust-dev (<< 1.25.0+dfsg1-2~~)
 Breaks: libstd-rust-dev (<< 1.25.0+dfsg1-2~~)
 Description: Rust systems programming language
@@ -86,7 +89,7 @@ Description: Rust systems programming language
  generic programming and meta-programming, in both static and dynamic
  styles.
 
-Package: libstd-rust-1.70
+Package: libstd-rust-1.80
 Section: libs
 Architecture: any
 Multi-Arch: same
@@ -113,7 +116,7 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libstd-rust-1.70 (= ${binary:Version}),
+ libstd-rust-1.80 (= ${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
@@ -165,7 +168,7 @@ 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-16, clang-16,
+ lld-17, clang-17,
 Suggests:
 # nodejs contains wasi-node for running the program
  nodejs (>= 12.16),
@@ -185,7 +188,7 @@ Description: Rust standard libraries - development files
  .
  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.
+ wasm32-wasip1/wasm32-wasip2 targets.
 
 Package: rust-gdb
 Architecture: all
@@ -211,7 +214,7 @@ Description: Rust debugger (gdb)
 Package: rust-lldb
 Architecture: all
 # When updating, also update rust-lldb.links
-Depends: lldb-16, ${misc:Depends}, python3-lldb-16
+Depends: lldb-17, ${misc:Depends}, python3-lldb-17
 Replaces: rustc (<< 1.1.0+dfsg1-1)
 Description: Rust debugger (lldb)
  Rust is a curly-brace, block-structured expression language.  It
@@ -229,6 +232,38 @@ 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
 Section: doc
 Architecture: all
@@ -276,7 +311,7 @@ Package: rust-clippy
 Architecture: any
 Multi-Arch: allowed
 Depends: ${misc:Depends}, ${shlibs:Depends},
- libstd-rust-1.70 (= ${binary:Version})
+ libstd-rust-1.80 (= ${binary:Version})
 Recommends: cargo
 Description: Rust linter
  Rust is a curly-brace, block-structured expression language.  It
@@ -304,6 +339,7 @@ Package: rustfmt
 Architecture: any
 Multi-Arch: allowed
 Depends: ${misc:Depends}, ${shlibs:Depends},
+ libstd-rust-1.80 (= ${binary:Version}),
 Recommends: cargo
 Description: Rust formatting helper
  Rust is a curly-brace, block-structured expression language.  It
@@ -373,7 +409,7 @@ Description: Rust package manager
     your project.
   * Introduces conventions, making working with Rust projects easier.
  .
- Cargo downloads your Rust project’s dependencies and compiles your
+ Cargo downloads your Rust project's dependencies and compiles your
  project.
 
 Package: cargo-doc
@@ -393,7 +429,7 @@ Description: Rust package manager, documentation
     your project.
   * Introduces conventions, making working with Rust projects easier.
  .
- Cargo downloads your Rust project’s dependencies and compiles your
+ Cargo downloads your Rust project's dependencies and compiles your
  project.
  .
  This package contains the documentation.