From: Peter Michael Green <plugwash@raspbian.org>
Date: Fri, 20 Oct 2023 23:58:54 +0000 (+0000)
Subject: Merge tag '1.68.2+dfsg1-1' into trixie
X-Git-Tag: archive/raspbian/1.68.2+dfsg1-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d26c46ccbb6e0cc875f3ed85785b29544d2a0855;p=rustc.git

Merge tag '1.68.2+dfsg1-1' into trixie
---

d26c46ccbb6e0cc875f3ed85785b29544d2a0855
diff --cc debian/changelog
index 30b47fa564,6d8341f9fc..92ed56051a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,29 +1,47 @@@
- rustc (1.67.1+dfsg1-1+rpi1) trixie-staging; urgency=medium
++rustc (1.68.2+dfsg1-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 1.15.1+dfsg1-1~exp3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 15 Mar 2017 10:16:18 +0000]
 +  * Build for armv6.
 +  [changes introduced in 1.18.0+dfsg1-4+rpi1 by Peter Michael Green]
 +  * Disable testsuite.
 +  [changes introduced in 1.37.0+dfsg1-1+rpi1 by Peter Michael Green]
 +  * Set DEB_BUILD_RUST_TYPE based on the compiler that is actually installed.
 +  [changes introduced in 1.42.0+dfsg1-1+rpi1 by Peter Michael Green]
 +  * Use the compiler itself rather than dpkg to detect DEB_BUILD_RUST_TYPE
 +  [changes introduced in 1.57.0+dfsg1-1+rpi1 by Peter Michael Green]
 +  * Disable testsuite for arch all builds as well.
 +
 +  [changes introduced in 1.64.0+dfsg1-1+rpi1 by Peter Michael Green]
 +  * Remove upper limit from wasi-libc build-dependency.
 +
 + -- Peter Michael Green <plugwash@raspbian.org>  Thu, 12 Oct 2023 16:02:06 +0000
 +
+ rustc (1.68.2+dfsg1-1) unstable; urgency=medium
+ 
+   * Upload to unstable
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Sun, 10 Sep 2023 19:22:53 +0200
+ 
+ rustc (1.68.2+dfsg1-1~exp1) experimental; urgency=medium
+ 
+   [ Eric Long ]
+   * New upstream version 1.68.2+dfsg1
+   * Update patches to adapt to upstream test path change
+ 
+   [ Fabian Grünbichler ]
+   * Update wasi-libc to 4362b18
+   * Update doc path to fix linkcheck
+   * Update d/copyright
+   * Update lintian overrides
+   * Update privacy breach removal (github badge)
+   * Bump Standards-Version to 4.6.2
+ 
+   [Helmut Grohne]
+   * Fix FTCBFS: Do not pass host CFLAGS to the build compiler
+     (Closes: #1050975)
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Wed, 02 Aug 2023 13:17:47 +0200
+ 
  rustc (1.67.1+dfsg1-1) unstable; urgency=medium
  
    * Upload to unstable
diff --cc debian/control
index c709d50a50,206abda48a..1c6e530ba6
--- a/debian/control
+++ b/debian/control
@@@ -39,10 -39,11 +39,10 @@@ Build-Depends
   curl <pkg.rustc.dlstage0>,
   ca-certificates <pkg.rustc.dlstage0>,
  Build-Depends-Indep:
-  wasi-libc (>= 0.0~git20221206.8b7148f~~) <!nowasm>,
+  wasi-libc (>= 0.0~git20230113.4362b18~~) <!nowasm>,
 - wasi-libc (<= 0.0~git20230113.4362b18++) <!nowasm>,
   clang-15:native,
  Build-Conflicts: gdb-minimal <!nocheck>
- Standards-Version: 4.2.1
+ 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