From: Peter Michael Green <plugwash@raspbian.org>
Date: Sat, 21 Oct 2023 18:53:39 +0000 (+0000)
Subject: Merge tag '1.69.0+dfsg1-1' into trixie
X-Git-Tag: archive/raspbian/1.69.0+dfsg1-1+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1967b438cd22a6efe6ab158a3b79b302bd00dc60;p=rustc.git

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

5f17fa08105060bb32eb75f66b0f8c9aa8284f7f
diff --cc debian/changelog
index 92ed56051a,12e74af579..77e6c11518
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,29 +1,47 @@@
- rustc (1.68.2+dfsg1-1+rpi1) trixie-staging; urgency=medium
++rustc (1.69.0+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.69.0+dfsg1-1) unstable; urgency=medium
+ 
+   * Upload to unstable
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Wed, 13 Sep 2023 13:57:58 +0200
+ 
+ rustc (1.69.0+dfsg1-1~exp2) experimental; urgency=medium
+ 
+   * config: also enable rustdoc explicitly
+   * bump wasi-libc to revert stack protection (Closes: #1051815)
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Wed, 13 Sep 2023 08:02:53 +0200
+ 
+ rustc (1.69.0+dfsg1-1~exp1) experimental; urgency=medium
+ 
+   [ Eric Long ]
+   * New upstream release
+   * Manually include `rust-analyzer-proc-macro-srv` (again)
+ 
+   [ Fabian Grünbichler ]
+   * add libc with "extra_traits" to feature sync patch
+   * update d/copyright
+   * update lintian overrides
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Tue, 12 Sep 2023 10:17:15 +0200
+ 
  rustc (1.68.2+dfsg1-1) unstable; urgency=medium
  
    * Upload to unstable
diff --cc debian/control
index 1c6e530ba6,4beb71c2f7..2aab7f3da8
--- a/debian/control
+++ b/debian/control
@@@ -39,7 -39,8 +39,7 @@@ Build-Depends
   curl <pkg.rustc.dlstage0>,
   ca-certificates <pkg.rustc.dlstage0>,
  Build-Depends-Indep:
-  wasi-libc (>= 0.0~git20230113.4362b18~~) <!nowasm>,
+  wasi-libc (>= 0.0~git20230113.4362b18-2~) <!nowasm>,
 - wasi-libc (<= 0.0~git20230113.4362b18++) <!nowasm>,
   clang-15:native,
  Build-Conflicts: gdb-minimal <!nocheck>
  Standards-Version: 4.6.2