Merge version 2.33.1-6+rpi1 and 2.33.90.20200122-2 to produce 2.33.90.20200122-2...

diff --cc debian/changelog
index 10ee33a38261ffbfb9170f3d738033f9bdb4c668,857fe11c2e9fb8793cf94439d0060bc37211e237..557d899b4119131e4a9ccbdfbf2a1a89178d04e1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,90 +1,97 @@@
- binutils (2.33.1-6+rpi1) bullseye-staging; urgency=medium
++binutils (2.33.90.20200122-2+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from 2.29-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 17 Aug 2017 15:41:49 +0000]
 +  * Disable testsuite, it fails on our lxc based autobuilders.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 16 Dec 2019 22:48:55 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 31 Jan 2020 19:01:44 +0000
++
+ binutils (2.33.90.20200122-2) unstable; urgency=medium
+ 
+   * libctf-nobfd0: Add Breaks/Replaces to libbinutils. Closes: #949454.
+ 
+  -- Matthias Klose <doko@debian.org>  Wed, 22 Jan 2020 07:49:18 +0100
+ 
+ binutils (2.33.90.20200122-1) unstable; urgency=medium
+ 
+   * New upstream snapshot, taken from the 2.34 release branch.
+ 
+  -- Matthias Klose <doko@debian.org>  Wed, 22 Jan 2020 06:18:41 +0100
+ 
+ binutils (2.33.50.20200115-2) unstable; urgency=high
+ 
+   [YunQiang Su]
+   * refresh and re-enable: mips64-default-n64.diff
+ 
+  -- YunQiang Su <syq@debian.org>  Thu, 16 Jan 2020 23:35:11 +0800
+ 
+ binutils (2.33.50.20200115-1) unstable; urgency=medium
+ 
+   * New upstream snapshot.
+   * Tighten the build dependency to 2.33.50.20200114-1 for this upload.
+ 
+  -- Matthias Klose <doko@debian.org>  Wed, 15 Jan 2020 21:18:18 +0100
+ 
+ binutils (2.33.50.20200114-1) unstable; urgency=medium
+ 
+   * New upstream snapshot.
+   * Build on testing for arm64, and upload the binaries.
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 14 Jan 2020 14:19:00 +0100
+ 
+ binutils (2.33.50.20200111-1) unstable; urgency=medium
+ 
+   * New upstream snapshot.
+   * Make autopkgtests cross-test-friendly (Steve Langasek).
+ 
+  -- Matthias Klose <doko@debian.org>  Sat, 11 Jan 2020 14:24:29 +0100
+ 
+ binutils (2.33.50.20200107-1) unstable; urgency=medium
+ 
+   * New upstream snapshot.
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 07 Jan 2020 23:19:25 +0100
+ 
+ binutils (2.33.50.20200105-2) experimental; urgency=medium
+ 
+   * New upstream snapshot.
+ 
+  -- Matthias Klose <doko@debian.org>  Sun, 05 Jan 2020 11:33:49 +0100
+ 
+ binutils (2.33.50.20191212-1) experimental; urgency=medium
+ 
+   * New upstream snapshot.
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 12 Dec 2019 16:16:13 +0100
+ 
+ binutils (2.33.50.20191205-1) experimental; urgency=medium
+ 
+   * New upstream snapshot.
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 05 Dec 2019 21:22:15 +0100
+ 
+ binutils (2.33.50.20191128-1) experimental; urgency=medium
+ 
+   * New upstream snapshot.
+   * Split out libctf packages.
+   * Save dejagnu log and sum files in binutils-dev.
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 28 Nov 2019 09:57:31 +0100
+ 
+ binutils (2.33.50.20191121-2) experimental; urgency=medium
+ 
+   * Fix packaging cross targets.
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 21 Nov 2019 23:08:45 +0100
+ 
+ binutils (2.33.50.20191121-1) experimental; urgency=medium
+ 
+   * New upstream snapshot.
+   * Remove the 012_check_ldrunpath_length patch.
+   * Don't apply the mips64-default-n64 patch.
+   * Refresh patches.
+   * Put libctf libctf libraries in libbinutils and binutils-dev for now.
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 21 Nov 2019 18:50:25 +0100
  
  binutils (2.33.1-6) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge