From: Raspbian automatic forward porter <root@raspbian.org>
Date: Wed, 20 Jan 2021 00:20:31 +0000 (+0000)
Subject: Merge version 1.189+rpi1 and 1.190 to produce 1.190+rpi1
X-Git-Tag: archive/raspbian/1.190+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4cbf59b4497356644775d3fba19e50ce160bb558;p=gcc-defaults.git

Merge version 1.189+rpi1 and 1.190 to produce 1.190+rpi1
---

4cbf59b4497356644775d3fba19e50ce160bb558
diff --cc debian/changelog
index a679b3c,65fe20c..822c34a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,10 +1,21 @@@
- gcc-defaults (1.189+rpi1) bullseye-staging; urgency=medium
++gcc-defaults (1.190+rpi1) bullseye-staging; urgency=medium
 +
++  [changes brought forward from 1.189+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 26 Sep 2020 14:33:38 +0000]
 +  * Build enough cross-compiler packages on armhf
 +    to support u-boot build.
 +  * Add some debugging to the control file generation to see where
 +    duplicate package entries are coming from.
 +  * Prevent double generation of entries for amd64 cross-compilers.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sat, 26 Sep 2020 14:33:38 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 20 Jan 2021 00:20:31 +0000
++
+ gcc-defaults (1.190) unstable; urgency=medium
+ 
+   * Bump GCC 10 version to 10.2.1.
+   * Bump standards version.
+   * Add conflicts to GCC 12 cross packages.
+ 
+  -- Matthias Klose <doko@debian.org>  Mon, 11 Jan 2021 22:22:42 +0100
  
  gcc-defaults (1.189) unstable; urgency=medium