Merge tag '1.85.0+dfsg2-2' into trixie-staging

Conflicts:
	debian/changelog

diff --cc debian/changelog
index 150338c0ec4ff9650087746f5d28d06fa0c5ba02,61d411f1e72c4a00b0229c716497380703e8796a..3b94abd96ae2049cf6325440017ce1556fd4b16b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,30 +1,45 @@@
- rustc (1.84.0+dfsg1-2+rpi1) trixie-staging; urgency=medium
++rustc (1.85.0+dfsg2-2+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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Wed, 05 Feb 2025 10:10:28 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Tue, 08 Apr 2025 21:31:21 +0000
++
+ rustc (1.85.0+dfsg2-2) unstable; urgency=medium
+ 
+   * Upload to unstable
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Fri, 04 Apr 2025 18:24:50 +0200
+ 
+ rustc (1.85.0+dfsg2-1) experimental; urgency=medium
+ 
+   * d/control: bump libgit2-dev version
+   * vendor git2, git2-curl and libgit2-sys bindings for libgit2 1.9
+   * cargo: bump git2* dependencies
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Mon, 17 Mar 2025 06:54:23 +0100
+ 
+ rustc (1.85.0+dfsg1-1) unstable; urgency=medium
+ 
+   * New (stable) upstream release.
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Thu, 20 Feb 2025 19:23:02 +0100
+ 
+ rustc (1.85.0~beta.9+dfsg1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release 1.85.0~beta999
+   * build docs with -j1 to make them reproducible
+   * build: make windows libstd build opt-in
+ 
+  -- Fabian Grünbichler <debian@fabian.gruenbichler.email>  Mon, 17 Feb 2025 13:24:42 +0100
  
  rustc (1.84.0+dfsg1-2) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge