Merge version 1.48.0+dfsg1-1+rpi1 and 1.48.0+dfsg1-2 to produce 1.48.0+dfsg1-2+rpi1

diff --cc debian/changelog
index 5a6027a9fbfd1fa8ce8519bc0dc768a88930c6f9,8c133fdb469018fdff204b0e6871c3f1da2ad497..57393cfbe43a4c3748e0a47ca1427b5563dcd2d1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,8 +1,21 @@@
- rustc (1.48.0+dfsg1-1+rpi1) bullseye-staging; urgency=medium
++rustc (1.48.0+dfsg1-2+rpi1) bullseye-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
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 10 Dec 2020 15:09:59 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 02 Aug 2024 01:09:56 +0000
++
+ rustc (1.48.0+dfsg1-2) unstable; urgency=medium
+ 
+   * Enable +xgot on mips64*, see upstream #52108 for details.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Sun, 20 Dec 2020 18:52:10 +0000
  
  rustc (1.48.0+dfsg1-1) unstable; urgency=medium