Merge version 1.180+rpi1 and 1.181 to produce 1.181+rpi1

diff --cc debian/changelog
index 88c6688e7d3c519a80f705af7cde022a2af72577,3d7a660f8b5baa0c090720ffdfd120a831d6be35..77899fe5dfe24c5d28005f4c8e056217266c95e5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,18 @@@
- gcc-defaults (1.180+rpi1) buster-staging; urgency=medium
++gcc-defaults (1.181+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 1.176+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 07 Jun 2018 13:27:06 +0000]
 +  * Re-enable gcj packages for now.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 06 Nov 2018 03:57:19 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 11 Mar 2019 22:34:44 +0000
++
+ gcc-defaults (1.181) unstable; urgency=medium
+ 
+   * Bump GCC 8 version to 8.3.0.
+   * Fix docdir symlinks for x32 cross compilers. Addresses: #915678.
+   * Don't generate duplicate *-x86-64-linux-gnu packages in the control
+     file. Closes: #909128.
+ 
+  -- Matthias Klose <doko@debian.org>  Mon, 25 Feb 2019 09:48:12 +0100
  
  gcc-defaults (1.180) unstable; urgency=medium
  

diff --cc debian/control
index f1437b0f576f64f2c16a06025e922cbd4a07a336,1e747bc3175fee6bc6ec9cbe2223970251ba6315..18b0c5e7a5867c95fc08060d979e16617cf7b7a2
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -3,13 -3,12 +3,13 @@@ Section: deve
  Priority: standard
  Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
  Uploaders: Matthias Klose <doko@debian.org>
- Standards-Version: 4.2.1
+ Standards-Version: 4.3.0
  Build-Depends: m4, debhelper (>= 9),
    dpkg-dev (>= 1.17.11),
-   gcc-8-base (>= 8.2.0-8),
+   gcc-8-base (>= 8.3.0-2~),
    lsb-release
  #Build-Depends-Indep: ca-certificates, gcj-jdk, python
 +Build-Depends-Indep: ca-certificates, gcj-jdk, python
  Vcs-Browser: https://salsa.debian.org/toolchain-team/gcc-defaults
  Vcs-Git: https://salsa.debian.org/toolchain-team/gcc-defaults.git
  XS-Python-Version: all

diff --cc debian/control.source
index bda8af4fd93d7c0beb11366d2b0904e823672e25,d985744f63a6be6804fa9a3a2c95a6e52dbd2b92..27329ae534bf4c99d3d13ff04e45e55becb463a9
--- 1/debian/control.source
--- 2/debian/control.source
+++ b/debian/control.source
@@@ -3,13 -3,12 +3,13 @@@ Section: deve
  Priority: standard
  Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
  Uploaders: Matthias Klose <doko@debian.org>
- Standards-Version: 4.2.1
+ Standards-Version: 4.3.0
  Build-Depends: m4, debhelper (>= 9),
    dpkg-dev (>= 1.17.11),
-   gcc-8-base (>= 8.2.0-8),
+   gcc-8-base (>= 8.3.0-2~),
    lsb-release
  #Build-Depends-Indep: ca-certificates, gcj-jdk, python
 +Build-Depends-Indep: ca-certificates, gcj-jdk, python
  Vcs-Browser: https://salsa.debian.org/toolchain-team/gcc-defaults
  Vcs-Git: https://salsa.debian.org/toolchain-team/gcc-defaults.git
  XS-Python-Version: all

diff --cc debian/rules
Simple merge