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

diff --cc debian/changelog
index a4ea0cb23da6d32831cccd87330c3b32ef8f79ac,c00f75be924008c6864ed4643d30cb1b0a18b3b8..5a6027a9fbfd1fa8ce8519bc0dc768a88930c6f9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,27 +1,40 @@@
- rustc (1.47.0+dfsg1-1+rpi1) bullseye-staging; urgency=medium
++rustc (1.48.0+dfsg1-1+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>  Tue, 17 Nov 2020 19:31:32 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 10 Dec 2020 15:09:59 +0000
++
+ rustc (1.48.0+dfsg1-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Tue, 01 Dec 2020 19:57:48 +0000
+ 
+ rustc (1.48.0~beta.8+dfsg1-1~exp3) experimental; urgency=medium
+ 
+   * Update u-update-version-check.patch
+ 
+  -- Ximin Luo <infinity0@debian.org>  Fri, 13 Nov 2020 01:36:31 +0000
+ 
+ rustc (1.48.0~beta.8+dfsg1-1~exp2) experimental; urgency=medium
+ 
+   * Disable copy_file_range optimisation for now, see upstream #78979.
+   * Ignore some other minor tests, bugs have been filed upstream.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Thu, 12 Nov 2020 23:51:53 +0000
+ 
+ rustc (1.48.0~beta.8+dfsg1-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Ximin Luo <infinity0@debian.org>  Wed, 11 Nov 2020 12:31:18 +0000
  
  rustc (1.47.0+dfsg1-1) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge