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

diff --cc debian/changelog
index 067a7b9af6c1f0fd08e2fe12ea625c4ce24261ad,6f74a5310a047792cdf124dd4e9b1a7618f2315b..88c6688e7d3c519a80f705af7cde022a2af72577
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,17 +1,24 @@@
- gcc-defaults (1.178+rpi1) buster-staging; urgency=medium
++gcc-defaults (1.180+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>  Sat, 28 Jul 2018 11:25:06 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 06 Nov 2018 03:57:19 +0000
++
+ gcc-defaults (1.180) unstable; urgency=medium
+ 
+   * Fix README.Bugs symlink. Closes: #909614.
+   * Update VCS attributes in the control file.
+   * Bump standards version.
+ 
+  -- Matthias Klose <doko@debian.org>  Tue, 30 Oct 2018 14:14:38 +0100
+ 
+ gcc-defaults (1.179) unstable; urgency=medium
+ 
+   * Bump GCC 8 version to 8.2.0.
+   * Build arm64, armel and armhf cross compilers on ppc64el.
+ 
+  -- Matthias Klose <doko@debian.org>  Thu, 16 Aug 2018 12:44:12 +0200
  
  gcc-defaults (1.178) unstable; urgency=medium
  

diff --cc debian/control
index c63cd35da900403b6ea39105061b493be15a4ff6,e3af6a5af0c853dc72dc4f6eee5d7dbbfbad8552..f1437b0f576f64f2c16a06025e922cbd4a07a336
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -3,14 -3,14 +3,15 @@@ Section: deve
  Priority: standard
  Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
  Uploaders: Matthias Klose <doko@debian.org>
- Standards-Version: 4.1.5
+ Standards-Version: 4.2.1
  Build-Depends: m4, debhelper (>= 9),
    dpkg-dev (>= 1.17.11),
-   gcc-8-base (>= 8.1.0-4),
+   gcc-8-base (>= 8.2.0-8),
    lsb-release
- Vcs-Svn: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-defaults
- Vcs-Browser: http://svn.debian.org/viewsvn/gcccvs/branches/sid/gcc-defaults
+ #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
  
  Package: cpp

diff --cc debian/control.source
index 1e6b72fa09ef6fc03f41c949cb114f03e9868edc,1ec7bea2120e0a02c72d60b7a079c0aaa9fa5cad..bda8af4fd93d7c0beb11366d2b0904e823672e25
--- 1/debian/control.source
--- 2/debian/control.source
+++ b/debian/control.source
@@@ -3,12 -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.1.5
+ Standards-Version: 4.2.1
  Build-Depends: m4, debhelper (>= 9),
    dpkg-dev (>= 1.17.11),
-   gcc-8-base (>= 8.1.0-4),
+   gcc-8-base (>= 8.2.0-8),
    lsb-release
- Vcs-Svn: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-defaults
- Vcs-Browser: http://svn.debian.org/viewsvn/gcccvs/branches/sid/gcc-defaults
+ #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