diff -pruN 1.226/debian/README.Debian 1.226ubuntu2/debian/README.Debian
--- 1.226/debian/README.Debian	2025-05-03 11:05:15.000000000 +0000
+++ 1.226ubuntu2/debian/README.Debian	2025-09-03 16:58:33.000000000 +0000
@@ -62,8 +62,9 @@ The default compiler versions for Debian
 	gcobol		: gcobol-15
 	ga68		: ga68-15
 
-Most of the documentation for GCC including the manual pages is
-licensed under the GFDL and therefore not included in the main section.
+Documentation for the default compilers can be found in
+
+	/usr/share/doc/<compiler>-<package version>.
 
 Thanks to gcc-defaults, each architecture can choose its own preferred
 compiler for each language, and that preference can change without
diff -pruN 1.226/debian/changelog 1.226ubuntu2/debian/changelog
--- 1.226/debian/changelog	2025-09-03 23:22:32.000000000 +0000
+++ 1.226ubuntu2/debian/changelog	2025-09-03 16:58:33.000000000 +0000
@@ -1,4 +1,12 @@
-gcc-defaults (1.226) unstable; urgency=medium
+gcc-defaults (1.226ubuntu2) questing; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+    - Stop building multilib packages on s390x.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 03 Sep 2025 18:58:33 +0200
+
+gcc-defaults (1.226) UNRELEASED; urgency=medium
 
   * Fix some man page issues (Bjarni Ingi Gislason). Closes: #1099449.
   * Fix mod-version computation (Helmut Grohne). Closes: #1107486.
@@ -6,31 +14,19 @@ gcc-defaults (1.226) unstable; urgency=m
   * Build libgphobos-dev on ppc64el.
   * Bump versions to 15.2 and 14.3.
 
- -- Matthias Klose <doko@debian.org>  Thu, 04 Sep 2025 01:22:32 +0200
-
-gcc-defaults (1.225) experimental; urgency=medium
-
-  * Fix ga68 cross dependencies.
+ -- Matthias Klose <doko@debian.org>  Sun, 31 Aug 2025 17:53:03 +0200
 
- -- Matthias Klose <doko@debian.org>  Sat, 03 May 2025 22:55:23 +0200
+gcc-defaults (1.222ubuntu1) questing; urgency=medium
 
-gcc-defaults (1.224) experimental; urgency=medium
-
-  * Build the gcc-offload-nvptx package also on arm64.
-  * Bump version to 15.1.
-  * Build-depend on gfortran-N and use dpkg-query to access the
-    Fortran module version. Closes: #1104504.
-  * Add packages for gcobol and ga68.
-  * Remove packages for kfreebsd, ia64 and or1k.
-  * Bump standards version.
+  * Default to GCC 15.
 
- -- Matthias Klose <doko@debian.org>  Sat, 03 May 2025 16:05:03 +0200
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 27 Jul 2025 20:50:26 +0200
 
-gcc-defaults (1.223) experimental; urgency=medium
+gcc-defaults (1.222) UNRELEASED; urgency=medium
 
   * Default to GCC 15.
 
- -- Matthias Klose <doko@debian.org>  Mon, 10 Feb 2025 14:20:40 +0100
+ -- Matthias Klose <doko@debian.org>  Wed, 18 Dec 2024 12:11:44 +0100
 
 gcc-defaults (1.220) unstable; urgency=medium
 
@@ -40,19 +36,40 @@ gcc-defaults (1.220) unstable; urgency=m
 
  -- Matthias Klose <doko@debian.org>  Thu, 10 Oct 2024 09:53:47 +0200
 
+gcc-defaults (1.219ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+    - Stop building multilib packages on s390x.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 23 Jul 2024 11:00:56 +0200
+
 gcc-defaults (1.219) unstable; urgency=medium
 
   * Build gdc and gm2 packages for loong64. Closes: #1069714,
   * Bump versions to 14.1 and 13.3.
   * Bump standards version.
 
- -- Matthias Klose <doko@debian.org>  Tue, 23 Jul 2024 11:22:47 +0200
+ -- Matthias Klose <doko@debian.org>  Tue, 23 Jul 2024 10:47:56 +0200
 
-gcc-defaults (1.217) experimental; urgency=medium
+gcc-defaults (1.215ubuntu2) oracular; urgency=medium
 
-  * Default to GCC 14.
+  * Stop building multilib packages on s390x.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 30 Jun 2024 09:17:02 +0200
+
+gcc-defaults (1.215ubuntu1) oracular; urgency=medium
+
+  * Bump version to 13.3.0.
 
- -- Matthias Klose <doko@debian.org>  Wed, 31 Jan 2024 14:17:32 +0100
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 27 Jun 2024 12:03:28 +0200
+
+gcc-defaults (1.214ubuntu1) noble; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 31 Jan 2024 14:09:40 +0100
 
 gcc-defaults (1.214) unstable; urgency=medium
 
@@ -60,6 +77,13 @@ gcc-defaults (1.214) unstable; urgency=m
 
  -- Matthias Klose <doko@debian.org>  Wed, 31 Jan 2024 14:01:22 +0100
 
+gcc-defaults (1.211ubuntu2) noble; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 27 Jan 2024 19:23:00 +0100
+
 gcc-defaults (1.211) unstable; urgency=medium
 
   * For *-for-{build,host} add dependencies on *-N-for-{build,host}.
@@ -76,7 +100,7 @@ gcc-defaults (1.210) unstable; urgency=m
   * Fix and add dependencies for -for-build and -for-host packages.
   * Fix build on architectures without having gdc.
 
- -- Matthias Klose <doko@debian.org>  Sat, 27 Jan 2024 08:45:57 +0100
+ -- Matthias Klose <doko@debian.org>  Sat, 27 Jan 2024 15:19:17 +0100
 
 gcc-defaults (1.212) experimental; urgency=medium
 
@@ -100,6 +124,13 @@ gcc-defaults (1.212) experimental; urgen
 
  -- Matthias Klose <doko@debian.org>  Tue, 23 Jan 2024 09:39:10 +0100
 
+gcc-defaults (1.209ubuntu1) noble; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 26 Nov 2023 13:46:22 +0100
+
 gcc-defaults (1.209) unstable; urgency=medium
 
   * Build armel packages from the ports package.
@@ -107,6 +138,13 @@ gcc-defaults (1.209) unstable; urgency=m
 
  -- Matthias Klose <doko@debian.org>  Sun, 26 Nov 2023 13:39:10 +0100
 
+gcc-defaults (1.208ubuntu1) mantic; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 11 Aug 2023 20:28:15 +0200
+
 gcc-defaults (1.208) unstable; urgency=medium
 
   * Bump GCC 13 version to 13.2.0.
@@ -115,6 +153,13 @@ gcc-defaults (1.208) unstable; urgency=m
 
  -- Matthias Klose <doko@debian.org>  Fri, 11 Aug 2023 20:13:58 +0200
 
+gcc-defaults (1.207ubuntu2) mantic; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 13 Jul 2023 14:38:31 +0200
+
 gcc-defaults (1.207) unstable; urgency=medium
 
   * Upload to unstable, defaulting to GCC 13.
@@ -159,6 +204,13 @@ gcc-defaults (1.201) unstable; urgency=m
 
  -- Matthias Klose <doko@debian.org>  Wed, 31 Aug 2022 10:25:04 +0200
 
+gcc-defaults (1.200ubuntu1) kinetic; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 22 Jul 2022 17:55:20 +0200
+
 gcc-defaults (1.200) unstable; urgency=medium
 
   * Stop building gccbrig, removed in GCC 12.
@@ -179,6 +231,15 @@ gcc-defaults (1.198) unstable; urgency=h
 
  -- Matthias Klose <doko@debian.org>  Fri, 22 Jul 2022 11:23:31 +0200
 
+gcc-defaults (1.197ubuntu2) jammy; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build -multilib packages on armel and armhf (except for gccgo).
+    - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers.
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 05 Aug 2021 09:36:11 +0200
+
 gcc-defaults (1.197) experimental; urgency=medium
 
   * Default to GCC 12.
@@ -191,6 +252,15 @@ gcc-defaults (1.194) unstable; urgency=m
 
  -- Matthias Klose <doko@debian.org>  Sun, 10 Oct 2021 18:42:59 +0200
 
+gcc-defaults (1.193ubuntu1) impish; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build -multilib packages on armel and armhf (except for gccgo).
+    - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers.
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 05 Aug 2021 09:36:11 +0200
+
 gcc-defaults (1.193) experimental; urgency=medium
 
   * Bump GCC 10 version to 10.3.0.
@@ -203,12 +273,30 @@ gcc-defaults (1.193) experimental; urgen
 
  -- Matthias Klose <doko@debian.org>  Thu, 05 Aug 2021 09:21:17 +0200
 
+gcc-defaults (1.192ubuntu1) impish; urgency=medium
+
+  * Default to GCC 11.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 05 Aug 2021 09:16:43 +0200
+
 gcc-defaults (1.192) experimental; urgency=medium
 
   * Default to GCC 11.
 
  -- Matthias Klose <doko@debian.org>  Sat, 23 Jan 2021 12:25:44 +0100
 
+gcc-defaults (1.190ubuntu3) impish; urgency=medium
+
+  * Drop the multilib packages for armhf.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 24 Apr 2021 07:22:42 +0200
+
+gcc-defaults (1.190ubuntu1) hirsute; urgency=medium
+
+  * Bump GCC 10 version to 10.3.0.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 12 Apr 2021 09:19:34 +0200
+
 gcc-defaults (1.190) unstable; urgency=medium
 
   * Bump GCC 10 version to 10.2.1.
@@ -217,6 +305,22 @@ gcc-defaults (1.190) unstable; urgency=m
 
  -- Matthias Klose <doko@debian.org>  Mon, 11 Jan 2021 22:22:42 +0100
 
+gcc-defaults (1.189ubuntu2) hirsute; urgency=medium
+
+  * Also don't build the gccgo-doc package when not building gccgo.
+    LP: #1562598.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 09 Mar 2021 16:23:26 +0100
+
+gcc-defaults (1.189ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build -multilib packages on armel and armhf (except for gccgo).
+    - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers.
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 18 Sep 2020 11:51:09 +0200
+
 gcc-defaults (1.189) unstable; urgency=medium
 
   * Bump GCC 10 version to 10.2.0.
@@ -225,6 +329,15 @@ gcc-defaults (1.189) unstable; urgency=m
 
  -- Matthias Klose <doko@debian.org>  Thu, 17 Sep 2020 15:46:09 +0200
 
+gcc-defaults (1.188ubuntu1) groovy; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build -multilib packages on armel and armhf (except for gccgo).
+    - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers.
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 24 Jul 2020 13:46:22 +0200
+
 gcc-defaults (1.188) unstable; urgency=medium
 
   * Bump GCC 10 version to 10.1.0.
@@ -243,6 +356,22 @@ gcc-defaults (1.187) experimental; urgen
 
  -- Matthias Klose <doko@debian.org>  Tue, 10 Dec 2019 14:15:02 +0100
 
+gcc-defaults (1.185.1ubuntu2) focal; urgency=medium
+
+  * Bump GCC 9 version to 9.3.0.
+  * Default gccgo, gdc, gm2 to GCC 10.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 20 Mar 2020 14:52:47 +0100
+
+gcc-defaults (1.185.1ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build -multilib packages on armel and armhf (except for gccgo).
+    - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers.
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 10 Sep 2019 13:24:41 +0200
+
 gcc-defaults (1.185.1) unstable; urgency=medium
 
   * Build the mipsel and mips64el cross packages from the
@@ -257,6 +386,21 @@ gcc-defaults (1.185) unstable; urgency=m
 
  -- Matthias Klose <doko@debian.org>  Fri, 23 Aug 2019 21:25:50 +0200
 
+gcc-defaults (1.184ubuntu2) eoan; urgency=medium
+
+  * Avoid building some cross gm2 dependency packages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 23 Aug 2019 15:24:16 +0200
+
+gcc-defaults (1.184ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build -multilib packages on armel and armhf (except for gccgo).
+    - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers.
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 23 Aug 2019 08:42:43 +0200
+
 gcc-defaults (1.184) unstable; urgency=medium
 
   * Build gm2 packages.
@@ -277,15 +421,32 @@ gcc-defaults (1.183) unstable; urgency=m
 
  -- Matthias Klose <doko@debian.org>  Wed, 14 Aug 2019 01:23:25 +0200
 
-gcc-defaults (1.182) experimental; urgency=medium
+gcc-defaults (1.182ubuntu4) eoan; urgency=medium
 
   * Default to GCC 9.
+  * Bump GCC 9 version to 9.1.0.
+  * Bump GCC 8 version to 8.3.0.
   * Remove the gij/gcj packaging.
-  * 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>  Wed, 27 Mar 2019 22:51:47 +0100
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 07 Jul 2019 11:24:45 +0200
+
+gcc-defaults (1.181ubuntu3) disco; urgency=medium
+
+  * Build ppc64el packages on arm64.
+  * Build s390x packages on arm64 and ppc64el.
+  * Build riscv64 packages on arm64 and ppc64el.
+  * Stop building the mips64 and powerpcspe packages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 04 Apr 2019 06:23:53 +0200
+
+gcc-defaults (1.180ubuntu2) disco; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build -multilib packages on armel and armhf (except for gccgo).
+    - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers.
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 30 Oct 2018 14:22:18 +0100
 
 gcc-defaults (1.180) unstable; urgency=medium
 
@@ -295,6 +456,15 @@ gcc-defaults (1.180) unstable; urgency=m
 
  -- Matthias Klose <doko@debian.org>  Tue, 30 Oct 2018 14:14:38 +0100
 
+gcc-defaults (1.179ubuntu1) cosmic; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build -multilib packages on armel and armhf (except for gccgo).
+    - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers.
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 16 Aug 2018 12:55:38 +0200
+
 gcc-defaults (1.179) unstable; urgency=medium
 
   * Bump GCC 8 version to 8.2.0.
@@ -302,6 +472,15 @@ gcc-defaults (1.179) unstable; urgency=m
 
  -- Matthias Klose <doko@debian.org>  Thu, 16 Aug 2018 12:44:12 +0200
 
+gcc-defaults (1.178ubuntu1) cosmic; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build -multilib packages on armel and armhf (except for gccgo).
+    - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers.
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 21 Jul 2018 09:14:35 +0200
+
 gcc-defaults (1.178) unstable; urgency=medium
 
   * gcc, g++: Provide gcc-<triplet>, g++-<triplet>.
@@ -332,13 +511,14 @@ gcc-defaults (1.175) unstable; urgency=m
 
  -- Matthias Klose <doko@debian.org>  Fri, 23 Mar 2018 11:44:07 +0800
 
-gcc-defaults (1.174) unstable; urgency=medium
+gcc-defaults (1.173ubuntu1) artful; urgency=medium
 
-  * Bump GCC 7 version to 7.3.0.
-  * Stop building the gcj packages. Closes: #892536.
-  * Fix build with recent debhelper. Closes: #878338.
+  * Merge with Debian; remaining changes:
+    - Build -multilib packages on armel and armhf (except for gccgo).
+    - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers.
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
 
- -- Matthias Klose <doko@debian.org>  Thu, 15 Mar 2018 15:22:14 +0100
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 18 Sep 2017 16:11:26 +0200
 
 gcc-defaults (1.173d1) unstable; urgency=medium
 
@@ -362,6 +542,21 @@ gcc-defaults (1.172) unstable; urgency=m
 
  -- Matthias Klose <doko@debian.org>  Tue, 08 Aug 2017 11:56:36 -0400
 
+gcc-defaults (1.171ubuntu3) artful; urgency=medium
+
+  * Build gccbrig on x86 linux architectures only.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 05 Aug 2017 06:31:04 -0400
+
+gcc-defaults (1.171ubuntu1) artful; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build -multilib packages on armel and armhf (except for gccgo).
+    - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers.
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 04 Aug 2017 13:03:59 -0400
+
 gcc-defaults (1.171) unstable; urgency=medium
 
   * Provide liblto_plugin.so symlink in /usr/lib/bfd-plugins. Closes: #865690.
@@ -387,13 +582,11 @@ gcc-defaults (1.169) experimental; urgen
 
  -- Matthias Klose <doko@debian.org>  Sun, 27 Nov 2016 16:37:59 +0100
 
-gcc-defaults (1.168d1) unstable; urgency=medium
+gcc-defaults (1.168ubuntu2) zesty; urgency=medium
 
-  * Provide liblto_plugin.so symlink in /usr/lib/bfd-plugins. Closes: #865690.
-  * dh_nativejava: Don't use deprecated POSIX::tmpnam(). Closes: #866315.
-  * Fix README.Bugs symlinks for cross compilers. Closes: #858112.
+  * Default to GCC 7, except for gij/gcj.
 
- -- Matthias Klose <doko@debian.org>  Mon, 03 Jul 2017 17:21:10 +0200
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 26 Nov 2016 18:42:06 +0100
 
 gcc-defaults (1.168) experimental; urgency=medium
 
@@ -401,33 +594,38 @@ gcc-defaults (1.168) experimental; urgen
 
  -- Matthias Klose <doko@debian.org>  Sat, 26 Nov 2016 17:14:56 +0100
 
-gcc-defaults (1.164) unstable; urgency=medium
+gcc-defaults (1.164ubuntu1) zesty; urgency=medium
 
-  * Bump GCC 6 version to 6.2.1.
-  * Bump GCC 5 version to 5.4.1.
-  * Rename libphobos-dev to libgphobos-dev.
-  * Mark libgphobos-dev as Multi-Arch: same.
+  * Merge with Debian; remaining changes:
+    - Build -multilib packages on armel and armhf (except for gccgo).
+    - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers.
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
 
- -- Matthias Klose <doko@debian.org>  Fri, 18 Nov 2016 14:33:45 +0100
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 25 Nov 2016 11:36:51 +0100
 
-gcc-defaults (1.166) unstable; urgency=medium
+gcc-defaults (1.164ubuntu1) zesty; urgency=medium
 
-  * gcc: Install gcov-dump symlinks.
+  * Merge with Debian; remaining changes:
+    - Build -multilib packages on armel and armhf (except for gccgo).
+    - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers.
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
 
- -- Matthias Klose <doko@debian.org>  Thu, 16 Mar 2017 15:08:32 +0100
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 25 Nov 2016 11:36:51 +0100
 
-gcc-defaults (1.165) unstable; urgency=medium
+gcc-defaults (1.163ubuntu2) yakkety; urgency=medium
 
-  * Bump GCC 6 version to 6.3.0.
-  * Stop building powerpc cross packages from this source.
-  * Build mips64el packages from this source.
-  * gcc-multilib: Add conflicts with GCC 7 cross compiler packages.
-  * Mark all cross compiler packages excluding the -multilib packages
-    as M-A: foreign.
-  * Re-add mips64el as a gcj architecture. Closes: #851391.
-  * Bump libgcj-bc version number. Closes: #851775.
+  * Work around cacerts generation, not enough memory on the buildds.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 03 Aug 2016 20:30:34 +0200
 
- -- Matthias Klose <doko@debian.org>  Wed, 18 Jan 2017 17:11:46 +0100
+gcc-defaults (1.163ubuntu1) yakkety; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build -multilib packages on armel and armhf (except for gccgo).
+    - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers.
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 03 Aug 2016 20:03:28 +0200
 
 gcc-defaults (1.163) unstable; urgency=medium
 
@@ -448,6 +646,18 @@ gcc-defaults (1.161) experimental; urgen
 
  -- Matthias Klose <doko@debian.org>  Sat, 09 Jan 2016 12:35:14 +0100
 
+gcc-defaults (1.160ubuntu8) yakkety; urgency=medium
+
+  * Bump the libgcj soversion.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 08 Jan 2016 10:38:28 +0100
+
+gcc-defaults (1.160ubuntu2) xenial; urgency=medium
+
+  * Default to GCC 6.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 02 Jan 2016 13:54:29 +0100
+
 gcc-defaults (1.160) experimental; urgency=medium
 
   * Default to GCC 6.
@@ -468,6 +678,16 @@ gcc-defaults (1.151) unstable; urgency=m
 
  -- Matthias Klose <doko@debian.org>  Mon, 02 May 2016 18:23:12 +0200
 
+gcc-defaults (1.150ubuntu1) xenial; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build -multilib packages on armel and armhf (except for gccgo).
+    - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers.
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+    - Provide i686-linux-gnu prefixed symlinks on i386.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 02 Jan 2016 11:10:14 +0100
+
 gcc-defaults (1.150) unstable; urgency=medium
 
   * Bump GCC 5 version to 5.3.1.
@@ -476,6 +696,16 @@ gcc-defaults (1.150) unstable; urgency=m
 
  -- Matthias Klose <doko@debian.org>  Sun, 13 Dec 2015 16:14:05 +0100
 
+gcc-defaults (1.149ubuntu2) xenial; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build -multilib packages on armel and armhf (except for gccgo).
+    - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers.
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+    - Provide i686-linux-gnu prefixed symlinks on i386.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 02 Dec 2015 01:51:32 +0100
+
 gcc-defaults (1.149) unstable; urgency=medium
 
   * Enable gccgo on sparc and sparc64.
@@ -496,6 +726,16 @@ gcc-defaults (1.147) unstable; urgency=m
 
  -- Matthias Klose <doko@debian.org>  Wed, 25 Nov 2015 20:46:31 +0100
 
+gcc-defaults (1.146ubuntu8) xenial; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build -multilib packages on armel and armhf (except for gccgo).
+    - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers.
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+    - Provide i686-linux-gnu prefixed symlinks on i386.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 25 Nov 2015 13:10:00 +0100
+
 gcc-defaults (1.146) unstable; urgency=medium
 
   * Build defaults packages for Debian cross architectures, including
@@ -510,12 +750,32 @@ gcc-defaults (1.145) unstable; urgency=m
 
  -- Matthias Klose <doko@debian.org>  Mon, 03 Aug 2015 10:33:23 +0200
 
+gcc-defaults (1.144ubuntu1) wily; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build -multilib packages on armel and armhf (except for gccgo).
+    - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers.
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+    - Provide i686-linux-gnu prefixed symlinks on i386.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 01 Aug 2015 21:16:09 +0200
+
 gcc-defaults (1.144) unstable; urgency=medium
 
   * Build gdc with an epoch. Closes: #794329.
 
  -- Matthias Klose <doko@debian.org>  Sat, 01 Aug 2015 20:45:36 +0200
 
+gcc-defaults (1.143ubuntu1) wily; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build -multilib packages on armel and armhf (except for gccgo).
+    - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers.
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+    - Provide i686-linux-gnu prefixed symlinks on i386.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 31 Jul 2015 18:24:54 +0200
+
 gcc-defaults (1.143) unstable; urgency=high
 
   * Upload to unstable.
@@ -556,12 +816,61 @@ gcc-defaults (1.139) experimental; urgen
 
  -- Matthias Klose <doko@debian.org>  Wed, 28 Jan 2015 23:50:29 +0100
 
+gcc-defaults (1.138ubuntu9) vivid; urgency=medium
+
+  * gcc-multilib: Add breaks to gcc-5 cross compilers.
+  * Build multilib and gccgo packages for mips64* (James Cowgill).
+    Closes: #773177.
+  * gcc-multilib: Break gcc-4.9-mips-linux-gnu.
+  * gcj-jdk: Fix libgcj.pc symlink (Victor Seva). Closes: #778376.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 25 Feb 2015 14:14:12 +0100
+
+gcc-defaults (1.138ubuntu8) vivid; urgency=medium
+
+  * Provide the gcc-ar, gcc-nm and gcc-ranlib symlinks again.
+  * Provide a gcov-tool symlink.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 13 Feb 2015 03:08:52 +0100
+
+gcc-defaults (1.138ubuntu7) vivid; urgency=medium
+
+  * Build gdc-multilib on armel and armhf.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 29 Jan 2015 01:59:05 +0100
+
+gcc-defaults (1.138ubuntu3) vivid; urgency=medium
+
+  * Build a gdc-multilib package.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 28 Jan 2015 23:54:55 +0100
+
+gcc-defaults (1.138ubuntu2) vivid; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build -multilib packages on armel and armhf (except for gccgo).
+    - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers.
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+    - Provide i686-linux-gnu prefixed symlinks on i386.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 28 Jan 2015 14:21:20 +0100
+
 gcc-defaults (1.138) experimental; urgency=medium
 
   * Bump GCC version to 5.
 
  -- Matthias Klose <doko@debian.org>  Tue, 27 Jan 2015 21:18:46 +0100
 
+gcc-defaults (1.135ubuntu1) vivid; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build -multilib packages on armel and armhf (except for gccgo).
+    - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers.
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+    - Provide i686-linux-gnu prefixed symlinks on i386.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 04 Nov 2014 16:58:20 +0100
+
 gcc-defaults (1.135) unstable; urgency=medium
 
   * Bump GCC 4.9 version to 4.9.2.
@@ -572,7 +881,7 @@ gcc-defaults (1.135) unstable; urgency=m
 gcc-defaults (1.134) unstable; urgency=medium
 
   [ Aurelien Jarno ]
-  * Don't build libphobos-dev on kfreebsd-amd64 and kfreebsd-i386 as
+  * Don't build libphobos-dev on kfreebsd-amd64 and kfreebsd-i386 as 
     libphobos-4.9-dev is not built on these architectures. Closes: #761277.
 
   [ Matthias Klose ]
@@ -580,6 +889,22 @@ gcc-defaults (1.134) unstable; urgency=m
 
  -- Aurelien Jarno <aurel32@debian.org>  Sat, 18 Oct 2014 10:57:13 +0200
 
+gcc-defaults (1.133ubuntu2) utopic; urgency=medium
+
+  * Re-add armel and armhf as multilib architectures.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 05 Sep 2014 00:21:49 +0200
+
+gcc-defaults (1.133ubuntu1) utopic; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build -multilib packages on armel and armhf (except for gccgo).
+    - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers.
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+    - Provide i686-linux-gnu prefixed symlinks on i386.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 04 Sep 2014 23:43:02 +0200
+
 gcc-defaults (1.133) unstable; urgency=medium
 
   * Build a libphobos-dev package (more than one package is providing
@@ -600,6 +925,16 @@ gcc-defaults (1.131) unstable; urgency=m
 
  -- Matthias Klose <doko@debian.org>  Sun, 17 Aug 2014 15:34:11 +0200
 
+gcc-defaults (1.130ubuntu1) utopic; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build -multilib packages on armel and armhf (except for gccgo).
+    - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers.
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+    - Provide i686-linux-gnu prefixed symlinks on i386.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 29 Jul 2014 08:14:27 +0200
+
 gcc-defaults (1.130) unstable; urgency=medium
 
   * Bump GCC 4.9 versions to 4.9.1.
@@ -617,6 +952,50 @@ gcc-defaults (1.129) unstable; urgency=m
 
  -- Matthias Klose <doko@debian.org>  Fri, 27 Jun 2014 16:13:12 +0200
 
+gcc-defaults (1.128ubuntu6) utopic; urgency=medium
+
+  * Default cpp, gcc and g++ to 4.9 again.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 13 Jun 2014 15:44:10 +0200
+
+gcc-defaults (1.128ubuntu5) utopic; urgency=medium
+
+  * Revert the previous change and just change the dependencies for cpp,
+    gcc and g++ to depend on the 4.8 packages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 12 Jun 2014 01:48:23 +0200
+
+gcc-defaults (1.128ubuntu4) utopic; urgency=medium
+
+  * Revert default to 4.8, due to as-yet-undiagnosed C++ ABI breakage
+    (LP: #1329089).
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 11 Jun 2014 23:31:26 +0000
+
+gcc-defaults (1.128ubuntu3) utopic; urgency=medium
+
+  * Ship empty prerm maintainer scripts for the -doc packages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 11 Jun 2014 20:37:37 +0200
+
+gcc-defaults (1.128ubuntu2) utopic; urgency=medium
+
+  * Remove maintainer scripts for the -doc packages. LP: #1328638, #1328639.
+  * Build a gccgo-doc package.
+  * Provide gcc-{ar,nm,ranlib} man pages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 11 Jun 2014 13:06:07 +0200
+
+gcc-defaults (1.128ubuntu1) utopic; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build -multilib packages on armel and armhf (except for gccgo).
+    - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers.
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+    - Provide i686-linux-gnu prefixed symlinks on i386.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 10 Jun 2014 15:54:32 +0200
+
 gcc-defaults (1.128) unstable; urgency=medium
 
   * Default to GCC 4.9 for all architectures except m68k, or1k, powerpcspe,
@@ -635,6 +1014,16 @@ gcc-defaults (1.127exp2) experimental; u
 
  -- Matthias Klose <doko@debian.org>  Sat, 03 May 2014 19:57:42 +0200
 
+gcc-defaults (1.127ubuntu1) utopic; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build -multilib packages on armel and armhf (except for gccgo).
+    - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers.
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+  * Provide i686-linux-gnu prefixed symlinks on i386.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 04 May 2014 03:37:45 +0200
+
 gcc-defaults (1.127) unstable; urgency=medium
 
   * Default gij/gcj to 4.9 for every architecture with a successful build.
@@ -648,18 +1037,13 @@ gcc-defaults (1.127) unstable; urgency=m
 
  -- Matthias Klose <doko@debian.org>  Sat, 03 May 2014 19:41:43 +0200
 
-gcc-defaults (1.126exp1) experimental; urgency=medium
+gcc-defaults (1.126) unstable; urgency=medium
 
   * Provide the gcc-{ar,nm,ranlib} symlinks again.
+  * Default to 4.8 for OpenRISC (or1k) (Christian Svensson). Closes: #742236.
 
  -- Matthias Klose <doko@debian.org>  Fri, 04 Apr 2014 14:28:44 +0200
 
-gcc-defaults (1.125exp1) experimental; urgency=medium
-
-  * Default to 4.9 on all architectures for which 4.9 doesn't fail to build.
-
- -- Matthias Klose <doko@debian.org>  Fri, 17 Jan 2014 10:42:36 +0100
-
 gcc-defaults (1.125) unstable; urgency=low
 
   * Build gccgo for arm64 and ppc64el.
@@ -670,6 +1054,48 @@ gcc-defaults (1.125) unstable; urgency=l
 
  -- Matthias Klose <doko@debian.org>  Fri, 17 Jan 2014 10:15:40 +0100
 
+gcc-defaults (1.124ubuntu6) trusty; urgency=medium
+
+  * Provide the gnu triplet prefixed gcov symlink.
+  * Add ppc64el as a native gcj architecture.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 07 Apr 2014 23:39:54 +0200
+
+gcc-defaults (1.124ubuntu5) trusty; urgency=medium
+
+  * Provide the gcc-{ar,nm,ranlib} symlinks again.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 04 Apr 2014 13:59:08 +0200
+
+gcc-defaults (1.124ubuntu4) trusty; urgency=medium
+
+  * Default gccgo to 4.9.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 14 Feb 2014 18:52:08 +0100
+
+gcc-defaults (1.124ubuntu3) trusty; urgency=medium
+
+  * Build gccgo for ppc64el.
+  * Build the gcj database for gcj-4.9.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 15 Jan 2014 20:33:25 +0100
+
+gcc-defaults (1.124ubuntu2) trusty; urgency=low
+
+  * Fix merge error.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 13 Dec 2013 10:12:56 +0100
+
+gcc-defaults (1.124ubuntu1) trusty; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Build -multilib packages on armel and armhf (except for gccgo).
+    - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers.
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+  * Build Go for AArch64.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 13 Dec 2013 09:43:48 +0100
+
 gcc-defaults (1.124) unstable; urgency=low
 
   [ Matthias Klose ]
@@ -701,6 +1127,28 @@ gcc-defaults (1.123) unstable; urgency=l
 
  -- Matthias Klose <doko@debian.org>  Sun, 11 Aug 2013 16:54:31 +0200
 
+gcc-defaults (1.122ubuntu3) saucy; urgency=low
+
+  * Build ObjC, Obj-C++ and Go for AArch64.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 12 Oct 2013 04:34:16 +0200
+
+gcc-defaults (1.122ubuntu2) saucy; urgency=low
+
+  * Fix libgcj-common version.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 01 Jul 2013 17:42:08 +0200
+
+gcc-defaults (1.122ubuntu1) saucy; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Build -multilib packages on armel and armhf (except for gccgo).
+    - Adjust off-by-one offset for 4.6.x and 4.7.x release numbers.
+    - Stop building the -spu packages on powerpc.
+    - Include the fsf-funding.7, gfdl.7 and gpl.7 man pages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 01 Jul 2013 17:00:57 +0200
+
 gcc-defaults (1.122) unstable; urgency=low
 
   [ Matthias Klose ]
@@ -731,6 +1179,67 @@ gcc-defaults (1.121) unstable; urgency=l
 
  -- Matthias Klose <doko@debian.org>  Wed, 12 Jun 2013 23:11:47 +0200
 
+gcc-defaults (1.120ubuntu13) saucy; urgency=low
+
+  * Stop building the -spu packages on powerpc.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 26 Apr 2013 15:21:07 +0200
+
+gcc-defaults (1.120ubuntu12) saucy; urgency=low
+
+  * Fix -multilib dependencies.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 26 Apr 2013 14:25:43 +0200
+
+gcc-defaults (1.120ubuntu11) saucy; urgency=low
+
+  * Default to GCC 4.8 for gcc, g++, gfortran, gobjc, gobjc++, gcj
+    on all architectures.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 25 Apr 2013 18:27:27 +0200
+
+gcc-defaults (1.120ubuntu9) raring; urgency=low
+
+  * Bump versions to 4.7.3 and 4.6.4.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 15 Apr 2013 23:21:36 +0200
+
+gcc-defaults (1.120ubuntu8) raring; urgency=low
+
+  * Update the /usr/lib/jvm symlink to include the architecture.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 19 Dec 2012 03:09:53 +0100
+
+gcc-defaults (1.120ubuntu7) raring; urgency=low
+
+  * Build the cert database file again.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 17 Nov 2012 13:49:24 +0100
+
+gcc-defaults (1.120ubuntu6) raring; urgency=low
+
+  * Temporary upload, don't build the cert database.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 17 Nov 2012 03:09:13 +0100
+
+gcc-defaults (1.120ubuntu5) raring; urgency=low
+
+  * Remove gcj-4.7-base build dependency for this upload.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 17 Nov 2012 02:27:39 +0100
+
+gcc-defaults (1.120ubuntu4) raring; urgency=low
+
+  * Fix libgcj soname for 4.7.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 17 Nov 2012 02:16:05 +0100
+
+gcc-defaults (1.120ubuntu3) raring; urgency=low
+
+  * Merge with Debian.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 14 Nov 2012 14:27:37 +0100
+
 gcc-defaults (1.120) unstable; urgency=low
 
   * Bump GCC 4.7 versions to 4.7.2.
@@ -758,6 +1267,24 @@ gcc-defaults (1.118) unstable; urgency=l
 
  -- Matthias Klose <doko@debian.org>  Mon, 07 May 2012 17:30:36 +0200
 
+gcc-defaults (1.117ubuntu2) quantal-proposed; urgency=low
+
+  * Bump versions to 4.7.2.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 21 Sep 2012 17:35:36 +0200
+
+gcc-defaults (1.117ubuntu1) quantal; urgency=low
+
+  * Default to GCC 4.7 for all architectures.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 25 Apr 2012 14:43:17 +0200
+
+gcc-defaults (1.117exp1) experimental; urgency=low
+
+  * Default to GCC-4.7.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 16 Apr 2012 19:19:42 +0200
+
 gcc-defaults (1.117) unstable; urgency=low
 
   [ Samuel Thibault ]
@@ -765,11 +1292,8 @@ gcc-defaults (1.117) unstable; urgency=l
 
   [ Matthias Klose ]
   * Default the spu cross compilers to 4.7.
-  * Check for gcj-4.7 in rebuild-gcj-db.
-  * Build gccgo on armel, armhf, mips, mipsel, build gccgo-multilib
-    on mips, mipsel.
 
- -- Matthias Klose <doko@debian.org>  Wed, 02 May 2012 19:26:49 +0200
+ -- Matthias Klose <doko@debian.org>  Mon, 16 Apr 2012 07:48:52 +0200
 
 gcc-defaults (1.116) unstable; urgency=low
 
@@ -799,6 +1323,34 @@ gcc-defaults (1.113) unstable; urgency=l
 
  -- Matthias Klose <doko@debian.org>  Tue, 27 Mar 2012 23:10:01 +0200
 
+gcc-defaults (1.112ubuntu5) precise; urgency=low
+
+  * Don't build gccgo-multilib on ARM.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 13 Mar 2012 20:52:19 +0100
+
+gcc-defaults (1.112ubuntu4) precise; urgency=low
+
+  * Build gccgo for armel, armhf, powerpc.
+  * build gccgo-multilib for powerpc.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 12 Mar 2012 17:36:59 +0100
+
+gcc-defaults (1.112ubuntu2) precise; urgency=low
+
+  * Bump GCC 4.6 versions to 4.6.3.
+  * Default gccgo to 4.7.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 11 Mar 2012 22:24:11 +0100
+
+gcc-defaults (1.112ubuntu1) precise; urgency=low
+
+  * Merge with Debian, remaining changes:
+    - Build -doc packages and include GFDL licensed files.
+    - Build multilib packages for armel and armhf.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 08 Jan 2012 08:33:40 +0100
+
 gcc-defaults (1.112) unstable; urgency=low
 
   * gdc-v1: Fix gdmd-v1 symlinks.
@@ -811,6 +1363,14 @@ gcc-defaults (1.111) unstable; urgency=l
 
  -- Matthias Klose <doko@debian.org>  Tue, 03 Jan 2012 07:25:30 +0100
 
+gcc-defaults (1.110ubuntu1) precise; urgency=low
+
+  * Merge with Debian, remaining changes:
+    - Build -doc packages and include GFDL licensed files.
+    - Build multilib packages for armel and armhf.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 13 Dec 2011 00:46:11 +0100
+
 gcc-defaults (1.110) unstable; urgency=low
 
   * Default to 4.6 for alpha (Michael Cree). Closes: #649922.
@@ -819,6 +1379,14 @@ gcc-defaults (1.110) unstable; urgency=l
 
  -- Matthias Klose <doko@debian.org>  Sat, 10 Dec 2011 21:26:12 +0100
 
+gcc-defaults (1.109ubuntu1) precise; urgency=low
+
+  * Merge with Debian.
+    - Build -doc packages and include GFDL licensed files.
+    - Build multilib packages for armel and armhf.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 24 Nov 2011 14:16:14 +0100
+
 gcc-defaults (1.109) unstable; urgency=low
 
   * Bump GCC 4.6 versions to 4.6.2.
@@ -832,12 +1400,43 @@ gcc-defaults (1.108) unstable; urgency=l
   * debian/rules: Remove duplicate code.
   * Fix libgcj.pc symlink for multiarch builds.
   * Fix upgrade path (/usr/include/asm must be a symlink). Closes: #638418.
-
+  
   [ Aurelien Jarno ]
   * Add support for s390x.
 
  -- Matthias Klose <doko@debian.org>  Sat, 24 Sep 2011 16:55:44 +0200
 
+gcc-defaults (1.107ubuntu5) oneiric; urgency=low
+
+  * Revert last change.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 13 Aug 2011 09:16:22 +0200
+
+gcc-defaults (1.107ubuntu4) oneiric; urgency=low
+
+  * Move the asm symlink from gcc-multilib to gcc for one build.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 13 Aug 2011 08:47:53 +0200
+
+gcc-defaults (1.107ubuntu3) oneiric; urgency=low
+
+  * Build the -multilib packages for armel/armhf. LP: #810360.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 20 Jul 2011 09:38:27 +0200
+
+gcc-defaults (1.107ubuntu2) oneiric; urgency=low
+
+  * Bump versions for the -spu packages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 15 Jul 2011 11:15:51 +0200
+
+gcc-defaults (1.107ubuntu1) oneiric; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Build -doc packages and include GFDL licensed files.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 15 Jul 2011 10:26:24 +0200
+
 gcc-defaults (1.107) unstable; urgency=low
 
   * Enable multiarch build for libgcj-bc. Closes: #633359.
@@ -866,6 +1465,25 @@ gcc-defaults (1.105) unstable; urgency=l
 
  -- Matthias Klose <doko@debian.org>  Thu, 16 Jun 2011 23:47:48 +0200
 
+gcc-defaults (1.104ubuntu3) oneiric; urgency=low
+
+  * And fix libgcj-bc release number.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 04 May 2011 13:20:42 +0200
+
+gcc-defaults (1.104ubuntu2) oneiric; urgency=low
+
+  * Bump libgcj-common version to 4.6.0.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 04 May 2011 12:33:43 +0200
+
+gcc-defaults (1.104ubuntu1) oneiric; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Build -doc packages and include GFDL licensed files.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 26 Apr 2011 17:31:23 +0200
+
 gcc-defaults (1.104) unstable; urgency=low
 
   * Bump libgcj version for gcj-4.6. Closes: #624632.
@@ -886,6 +1504,14 @@ gcc-defaults (1.103) unstable; urgency=l
 
  -- Matthias Klose <doko@debian.org>  Fri, 29 Apr 2011 17:38:51 +0200
 
+gcc-defaults (1.102ubuntu1) oneiric; urgency=low
+
+  * Default to 4.6 for x86, armel, hppa, powerpc and s390.
+  * Don't build gccgo on armel and armhf. Closes: #622095.
+  * Add dependency on gcc-multilib to the other -multilib packages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 26 Apr 2011 17:31:23 +0200
+
 gcc-defaults (1.102) unstable; urgency=medium
 
   * Fix typos. Closes: #620275, #620190.
@@ -1052,7 +1678,7 @@ gcc-defaults (1.84) unstable; urgency=lo
     gcj-4.1. Closes: #396583.
   * Update Debian README. Closes: #498950.
 
- -- Matthias Klose <doko@debian.org>  Mon, 18 May 2009 22:12:18 +0200
+ -- Matthias Klose <doko@debian.org>  Sun, 18 May 2009 22:12:18 +0200
 
 gcc-defaults (1.83) unstable; urgency=low
 
@@ -1149,7 +1775,7 @@ gcc-defaults (1.71) unstable; urgency=hi
   * Remove jv-scan symlink. Closes: #477548.
   * Make ObjC, Obj-C++ 4.3 the default on armel.
   * Use /emul/... for amd64 biarch only.
-
+ 
  -- Matthias Klose <doko@debian.org>  Fri, 09 May 2008 00:39:11 +0200
 
 gcc-defaults (1.70) unstable; urgency=low
@@ -1472,7 +2098,7 @@ gcc-defaults (1.37) unstable; urgency=me
   * gcj: Add a /usr/share/java/libgcj.jar symlink.
 
  -- Matthias Klose <doko@debian.org>  Tue,  4 Jul 2006 23:52:43 +0200
-
+	
 gcc-defaults (1.36) unstable; urgency=medium
 
   * Make gcc-4.1 the default C compiler, g++-4.1 the default C++ compiler,
@@ -1869,7 +2495,7 @@ gcc-defaults (0.11) unstable; urgency=lo
 
   * Rebuild with current version of dpkg-dev (closes #102528).
 
- -- Matthias Klose <doko@debian.org>  Thu, 28 Jun 2001 22:01:41 +0200
+ -- Matthias Klose <doko@gate.local>  Thu, 28 Jun 2001 22:01:41 +0200
 
 gcc-defaults (0.10) unstable; urgency=low
 
diff -pruN 1.226/debian/control 1.226ubuntu2/debian/control
--- 1.226/debian/control	2025-08-31 15:58:32.000000000 +0000
+++ 1.226ubuntu2/debian/control	2025-09-03 16:58:33.000000000 +0000
@@ -103,7 +103,7 @@ Description: GNU C compiler for the buil
 
 Package: gcc-multilib
 Priority: optional
-Architecture: amd64 i386 mips mips64 mips64el mips64r6 mips64r6el mipsel mipsn32 mipsn32el mipsn32r6 mipsn32r6el mipsr6 mipsr6el powerpc ppc64 s390 s390x sparc sparc64 x32
+Architecture: amd64 i386 mips mips64 mips64el mips64r6 mips64r6el mipsel mipsn32 mipsn32el mipsn32r6 mipsn32r6el mipsr6 mipsr6el powerpc ppc64 sparc sparc64 x32
 Depends: cpp (= ${version:cpp}), cpp${native:suffix} (= ${version:cpp}), gcc (= ${version:gcc}), gcc-${pv:gcc}-multilib ${reqv:gcc}, ${misc:Depends}, linux-libc-dev [linux-any]
 Conflicts: gcc-4.9-alpha-linux-gnu,
   gcc-4.9-aarch64-linux-gnu,
@@ -443,7 +443,7 @@ Description: GNU C++ compiler for the bu
 
 Package: g++-multilib
 Priority: optional
-Architecture: amd64 i386 mips mips64 mips64el mips64r6 mips64r6el mipsel mipsn32 mipsn32el mipsn32r6 mipsn32r6el mipsr6 mipsr6el powerpc ppc64 s390 s390x sparc sparc64 x32
+Architecture: amd64 i386 mips mips64 mips64el mips64r6 mips64r6el mipsel mipsn32 mipsn32el mipsn32r6 mipsn32r6el mipsr6 mipsr6el powerpc ppc64 sparc sparc64 x32
 Depends: cpp (= ${version:cpp}), cpp${native:suffix} (= ${version:cpp}), gcc-multilib (= ${version:cpp}), g++ (= ${version:cpp}), g++-${pv:gpp}-multilib ${reqv:gpp}, ${misc:Depends}
 Description: GNU C++ compiler (multilib files)
  This is the GNU C++ compiler, a fairly portable optimizing compiler for C++.
@@ -499,7 +499,7 @@ Description: GNU Objective-C compiler fo
 
 Package: gobjc-multilib
 Priority: optional
-Architecture: amd64 i386 mips mips64 mips64el mips64r6 mips64r6el mipsel mipsn32 mipsn32el mipsn32r6 mipsn32r6el mipsr6 mipsr6el powerpc ppc64 s390 s390x sparc sparc64 x32
+Architecture: amd64 i386 mips mips64 mips64el mips64r6 mips64r6el mipsel mipsn32 mipsn32el mipsn32r6 mipsn32r6el mipsr6 mipsr6el powerpc ppc64 sparc sparc64 x32
 Depends: cpp (>= ${version:cpp}), cpp${native:suffix} (= ${version:cpp}), gcc-multilib (>= ${version:cpp}), gobjc (>= ${version:gcc}), gobjc-${pv:gobjc}-multilib ${reqv:gobjc}, ${misc:Depends}
 Description: GNU Objective-C compiler (multilib files)
  This is the GNU Objective-C compiler, which compiles Objective-C on
@@ -558,7 +558,7 @@ Description: GNU Objective-C++ compiler
 
 Package: gobjc++-multilib
 Priority: optional
-Architecture: amd64 i386 mips mips64 mips64el mips64r6 mips64r6el mipsel mipsn32 mipsn32el mipsn32r6 mipsn32r6el mipsr6 mipsr6el powerpc ppc64 s390 s390x sparc sparc64 x32
+Architecture: amd64 i386 mips mips64 mips64el mips64r6 mips64r6el mipsel mipsn32 mipsn32el mipsn32r6 mipsn32r6el mipsr6 mipsr6el powerpc ppc64 sparc sparc64 x32
 Depends: cpp (>= ${version:cpp}), cpp${native:suffix} (= ${version:cpp}), gobjc-multilib (>= ${version:cpp}), gobjc++ (>= ${version:gcc}), gobjc++-${pv:gobjcxx}-multilib ${reqv:gobjcxx}, ${misc:Depends}
 Description: GNU Objective-C++ compiler (multilib files)
  This is the GNU Objective-C++ compiler, which compiles Objective-C++ on
@@ -614,7 +614,7 @@ Description: GNU Fortran 95 compiler for
 
 Package: gfortran-multilib
 Priority: optional
-Architecture: amd64 i386 mips mips64 mips64el mips64r6 mips64r6el mipsel mipsn32 mipsn32el mipsn32r6 mipsn32r6el mipsr6 mipsr6el powerpc ppc64 s390 s390x sparc sparc64 x32
+Architecture: amd64 i386 mips mips64 mips64el mips64r6 mips64r6el mipsel mipsn32 mipsn32el mipsn32r6 mipsn32r6el mipsr6 mipsr6el powerpc ppc64 sparc sparc64 x32
 Depends: cpp (= ${version:cpp}), cpp${native:suffix} (= ${version:cpp}), gcc-multilib (= ${version:cpp}), gfortran (= ${version:gcc}), gfortran-${pv:gfort}-multilib ${reqv:gfort}, ${misc:Depends}
 Description: GNU Fortran 95 compiler (multilib files)
  This is the GNU Fortran compiler, which compiles Fortran 95 on platforms
@@ -667,7 +667,7 @@ Description: Go compiler, based on the G
 
 Package: gccgo-multilib
 Priority: optional
-Architecture: amd64 i386 mips mips64 mips64el mips64r6 mips64r6el mipsel mipsn32 mipsn32el mipsn32r6 mipsn32r6el mipsr6 mipsr6el powerpc ppc64 s390 s390x sparc sparc64 x32
+Architecture: amd64 i386 mips mips64 mips64el mips64r6 mips64r6el mipsel mipsn32 mipsn32el mipsn32r6 mipsn32r6el mipsr6 mipsr6el powerpc ppc64 sparc sparc64 x32
 Depends: cpp (>= ${version:cpp}), cpp${native:suffix} (= ${version:cpp}), gcc-multilib (>= ${version:cpp}), gccgo (>= ${version:ggo}), gccgo-${pv:ggo}-multilib ${reqv:ggo}, ${misc:Depends}
 Description: Go compiler, based on the GCC backend (multilib files)
  This is the GNU Go compiler, which compiles Go on platforms supported by
@@ -721,7 +721,7 @@ Description: GNU D compiler (language ve
 
 Package: gdc-multilib
 Priority: optional
-Architecture: amd64 i386 mips mips64 mips64el mips64r6 mips64r6el mipsel mipsn32 mipsn32el mipsn32r6 mipsn32r6el mipsr6 mipsr6el powerpc ppc64 s390x x32
+Architecture: amd64 i386 mips mips64 mips64el mips64r6 mips64r6el mipsel mipsn32 mipsn32el mipsn32r6 mipsn32r6el mipsr6 mipsr6el powerpc ppc64 x32
 Depends: cpp (>= ${version:cpp}), cpp${native:suffix} (= ${version:cpp}), gcc-multilib (>= ${version:cpp}), gdc (>= ${version:gcc}), gdc-${pv:gdc}-multilib ${reqv:gdc}, ${misc:Depends}
 Description: D compiler (language version 2) (multilib files)
  This compiler supports D language version 2.
@@ -2768,7 +2768,7 @@ Description: GNU Algol-68 compiler (base
 
 Package: cpp-powerpc-linux-gnu
 Priority: optional
-Architecture: powerpc
+Architecture: powerpc amd64 arm64 i386 x32 ppc64el s390x
 Multi-Arch: foreign
 Section: interpreters
 Depends: cpp-${pv:cpp}-powerpc-linux-gnu ${reqv:cpp}, ${misc:Depends}
@@ -2787,7 +2787,7 @@ Description: GNU C preprocessor (cpp) fo
 
 Package: gcc-powerpc-linux-gnu
 Priority: optional
-Architecture: powerpc
+Architecture: powerpc amd64 arm64 i386 x32 ppc64el s390x
 Multi-Arch: foreign
 Depends: cpp-powerpc-linux-gnu (= ${version:cpp}),
   gcc-${pv:gcc}-powerpc-linux-gnu ${reqv:gcc},
@@ -2804,7 +2804,7 @@ Description: GNU C compiler for the powe
 
 Package: g++-powerpc-linux-gnu
 Priority: optional
-Architecture: powerpc
+Architecture: powerpc amd64 arm64 i386 x32 ppc64el s390x
 Multi-Arch: foreign
 Depends: cpp-powerpc-linux-gnu (= ${version:cpp}),
   gcc-powerpc-linux-gnu (= ${version:cpp}),
@@ -2820,7 +2820,7 @@ Description: GNU C++ compiler for the po
 
 Package: gobjc-powerpc-linux-gnu
 Priority: optional
-Architecture: powerpc
+Architecture: powerpc amd64 arm64 i386 x32 ppc64el s390x
 Multi-Arch: foreign
 Depends: cpp-powerpc-linux-gnu (>= ${version:cpp}),
   gcc-powerpc-linux-gnu (>= ${version:cpp}),
@@ -2838,7 +2838,7 @@ Description: GNU Objective-C compiler fo
 
 Package: gobjc++-powerpc-linux-gnu
 Priority: optional
-Architecture: powerpc
+Architecture: powerpc amd64 arm64 i386 x32 ppc64el s390x
 Multi-Arch: foreign
 Depends: cpp-powerpc-linux-gnu (>= ${version:cpp}),
   gcc-powerpc-linux-gnu (>= ${version:cpp}),
@@ -2857,7 +2857,7 @@ Description: GNU Objective-C++ compiler
 
 Package: gfortran-powerpc-linux-gnu
 Priority: optional
-Architecture: powerpc
+Architecture: powerpc amd64 arm64 i386 x32 ppc64el s390x
 Multi-Arch: foreign
 Depends: cpp-powerpc-linux-gnu (= ${version:cpp}),
   gcc-powerpc-linux-gnu (= ${version:gcc}),
@@ -2876,7 +2876,7 @@ Description: GNU Fortran 95 compiler for
 
 Package: gccgo-powerpc-linux-gnu
 Priority: optional
-Architecture: powerpc
+Architecture: powerpc amd64 arm64 i386 x32 ppc64el s390x
 Multi-Arch: foreign
 Depends: cpp-powerpc-linux-gnu (>= ${version:cpp}),
   g++-powerpc-linux-gnu (>= ${version:gcc}),
@@ -2894,7 +2894,7 @@ Description: Go compiler (based on GCC)
 
 Package: gdc-powerpc-linux-gnu
 Priority: optional
-Architecture: powerpc
+Architecture: powerpc amd64 arm64 i386 x32 ppc64el s390x
 Multi-Arch: foreign
 Depends: cpp-powerpc-linux-gnu (>= ${version:cpp}),
   gdc-${pv:gdc}-powerpc-linux-gnu ${reqv:gdc},
@@ -2910,7 +2910,7 @@ Description: GNU D compiler (based on GC
 
 Package: ga68-powerpc-linux-gnu
 Priority: optional
-Architecture: powerpc
+Architecture: powerpc amd64 arm64 i386 x32 ppc64el s390x
 Multi-Arch: foreign
 Depends: cpp-powerpc-linux-gnu (= ${version:cpp}),
   ga68-${pv:ga68}-powerpc-linux-gnu ${reqv:ga68},
@@ -2923,6 +2923,116 @@ Description: GNU Algol-68 compiler (base
  This is a dependency package providing the default GNU Algol-68 cross-compiler
  for the powerpc architecture.
 
+Package: gcc-multilib-powerpc-linux-gnu
+Priority: optional
+Architecture: amd64 arm64 i386 x32 ppc64el s390x
+Depends: cpp-powerpc-linux-gnu (= ${version:cpp}),
+  gcc-powerpc-linux-gnu (= ${version:gcc}),
+  gcc-${pv:gcc}-multilib-powerpc-linux-gnu ${reqv:gcc},
+  ${misc:Depends}
+Recommends: libc6-dev-powerpc-cross | libc-dev-powerpc-cross
+Suggests: make, manpages-dev, autoconf, automake, libtool, flex, bison, gdb-powerpc-linux-gnu, gcc-doc
+Description: GNU C compiler for the powerpc architecture
+ This is the GNU C compiler, a fairly portable optimizing compiler for C.
+ .
+ This is a dependency package providing the default GNU C cross-compiler
+ for the powerpc architecture.
+
+Package: g++-multilib-powerpc-linux-gnu
+Priority: optional
+Architecture: amd64 arm64 i386 x32 ppc64el s390x
+Depends: cpp-powerpc-linux-gnu (= ${version:cpp}),
+  g++-powerpc-linux-gnu (= ${version:gpp}),
+  gcc-multilib-powerpc-linux-gnu (= ${version:gcc}),
+  g++-${pv:gpp}-multilib-powerpc-linux-gnu ${reqv:gpp},
+  ${misc:Depends}
+Description: GNU C++ compiler for the powerpc architecture
+ This is the GNU C++ compiler, a fairly portable optimizing compiler for C++.
+ .
+ This is a dependency package providing the default GNU C++
+ cross-compiler for the powerpc architecture.
+
+Package: gobjc-multilib-powerpc-linux-gnu
+Priority: optional
+Architecture: amd64 arm64 i386 x32 ppc64el s390x
+Depends: cpp-powerpc-linux-gnu (>= ${version:cpp}),
+  gobjc-powerpc-linux-gnu (>= ${version:gobjc}),
+  gcc-multilib-powerpc-linux-gnu (>= ${version:cpp}),
+  gobjc-${pv:gobjc}-multilib-powerpc-linux-gnu ${reqv:gobjc},
+  ${misc:Depends}
+Description: GNU Objective-C compiler for the powerpc architecture
+ This is the GNU Objective-C compiler, which compiles Objective-C on platforms
+ supported by the gcc compiler. It uses the gcc backend to generate optimized
+ code.
+ .
+ This is a dependency package providing the default GNU Objective-C
+ cross-compiler for the powerpc architecture.
+
+Package: gobjc++-multilib-powerpc-linux-gnu
+Priority: optional
+Architecture: amd64 arm64 i386 x32 ppc64el s390x
+Depends: cpp-powerpc-linux-gnu (>= ${version:cpp}),
+  gcc-multilib-powerpc-linux-gnu (>= ${version:cpp}),
+  gobjc++-powerpc-linux-gnu (>= ${version:gobjcxx}),
+  gobjc++-${pv:gobjcxx}-multilib-powerpc-linux-gnu ${reqv:gobjcxx},
+  ${misc:Depends}
+Recommends: g++-powerpc-linux-gnu (>= ${version:cpp}),
+  gobjc-powerpc-linux-gnu (>= ${version:cpp})
+Description: GNU Objective-C++ compiler for the powerpc architecture
+ This is the GNU Objective-C++ compiler, which compiles
+ Objective-C++ on platforms supported by the gcc compiler. It uses the
+ gcc backend to generate optimized code.
+ .
+ This is a dependency package providing the default GNU Objective-C++
+ cross-compiler for the powerpc architecture.
+
+Package: gfortran-multilib-powerpc-linux-gnu
+Priority: optional
+Architecture: amd64 arm64 i386 x32 ppc64el s390x
+Depends: cpp-powerpc-linux-gnu (= ${version:cpp}),
+  gcc-multilib-powerpc-linux-gnu (= ${version:gcc}),
+  gfortran-powerpc-linux-gnu (= ${version:gfort}),
+  gfortran-${pv:gfort}-multilib-powerpc-linux-gnu ${reqv:gfort},
+  ${misc:Depends}
+Suggests: gfortran-doc
+Description: GNU Fortran 95 compiler for the powerpc architecture
+ This is the GNU Fortran 95 compiler, which compiles Fortran 95 on platforms
+ supported by the gcc compiler. It uses the gcc backend to generate optimized
+ code.
+ .
+ This is a dependency package providing the default GNU Fortran 95
+ cross-compiler for the powerpc architecture.
+
+Package: gccgo-multilib-powerpc-linux-gnu
+Priority: optional
+Architecture: amd64 arm64 i386 x32 ppc64el s390x
+Depends: cpp-powerpc-linux-gnu (>= ${version:cpp}),
+  g++-multilib-powerpc-linux-gnu (>= ${version:gcc}),
+  gccgo-powerpc-linux-gnu (>= ${version:ggo}),
+  gccgo-${pv:ggo}-multilib-powerpc-linux-gnu ${reqv:ggo},
+  ${misc:Depends}
+Suggests: gccgo-doc
+Description: Go compiler (based on GCC) for the powerpc architecture
+ This is the GNU Go compiler, which compiles Go on platforms supported by
+ the gcc compiler. It uses the gcc backend to generate optimized code.
+ .
+ This is a dependency package providing the default GNU Go cross-compiler
+ for the powerpc architecture.
+
+Package: gdc-multilib-powerpc-linux-gnu
+Priority: optional
+Architecture: amd64 arm64 i386 x32 ppc64el s390x
+Depends: cpp-powerpc-linux-gnu (>= ${version:cpp}),
+  gdc-${pv:gdc}-multilib-powerpc-linux-gnu ${reqv:gdc},
+  gdc-powerpc-linux-gnu (>= ${version:gdc}),
+  ${misc:Depends}
+Description: GNU D compiler (based on GCC) for the powerpc architecture
+ This is the GNU D compiler, which compiles D on platforms supported by
+ the gcc compiler. It uses the gcc backend to generate optimized code.
+ .
+ This is a dependency package providing the default GNU D cross-compiler
+ for the powerpc architecture.
+
 Package: cpp-powerpc64-linux-gnu
 Priority: optional
 Architecture: ppc64
@@ -3806,116 +3916,6 @@ Description: GNU Algol-68 compiler (base
  This is a dependency package providing the default GNU Algol-68 cross-compiler
  for the s390x architecture.
 
-Package: gcc-multilib-s390x-linux-gnu
-Priority: optional
-Architecture: amd64 i386 x32 arm64 ppc64el
-Depends: cpp-s390x-linux-gnu (= ${version:cpp}),
-  gcc-s390x-linux-gnu (= ${version:gcc}),
-  gcc-${pv:gcc}-multilib-s390x-linux-gnu ${reqv:gcc},
-  ${misc:Depends}
-Recommends: libc6-dev-s390x-cross | libc-dev-s390x-cross
-Suggests: make, manpages-dev, autoconf, automake, libtool, flex, bison, gdb-s390x-linux-gnu, gcc-doc
-Description: GNU C compiler for the s390x architecture
- This is the GNU C compiler, a fairly portable optimizing compiler for C.
- .
- This is a dependency package providing the default GNU C cross-compiler
- for the s390x architecture.
-
-Package: g++-multilib-s390x-linux-gnu
-Priority: optional
-Architecture: amd64 i386 x32 arm64 ppc64el
-Depends: cpp-s390x-linux-gnu (= ${version:cpp}),
-  g++-s390x-linux-gnu (= ${version:gpp}),
-  gcc-multilib-s390x-linux-gnu (= ${version:gcc}),
-  g++-${pv:gpp}-multilib-s390x-linux-gnu ${reqv:gpp},
-  ${misc:Depends}
-Description: GNU C++ compiler for the s390x architecture
- This is the GNU C++ compiler, a fairly portable optimizing compiler for C++.
- .
- This is a dependency package providing the default GNU C++
- cross-compiler for the s390x architecture.
-
-Package: gobjc-multilib-s390x-linux-gnu
-Priority: optional
-Architecture: amd64 i386 x32 arm64 ppc64el
-Depends: cpp-s390x-linux-gnu (>= ${version:cpp}),
-  gobjc-s390x-linux-gnu (>= ${version:gobjc}),
-  gcc-multilib-s390x-linux-gnu (>= ${version:cpp}),
-  gobjc-${pv:gobjc}-multilib-s390x-linux-gnu ${reqv:gobjc},
-  ${misc:Depends}
-Description: GNU Objective-C compiler for the s390x architecture
- This is the GNU Objective-C compiler, which compiles Objective-C on platforms
- supported by the gcc compiler. It uses the gcc backend to generate optimized
- code.
- .
- This is a dependency package providing the default GNU Objective-C
- cross-compiler for the s390x architecture.
-
-Package: gobjc++-multilib-s390x-linux-gnu
-Priority: optional
-Architecture: amd64 i386 x32 arm64 ppc64el
-Depends: cpp-s390x-linux-gnu (>= ${version:cpp}),
-  gcc-multilib-s390x-linux-gnu (>= ${version:cpp}),
-  gobjc++-s390x-linux-gnu (>= ${version:gobjcxx}),
-  gobjc++-${pv:gobjcxx}-multilib-s390x-linux-gnu ${reqv:gobjcxx},
-  ${misc:Depends}
-Recommends: g++-s390x-linux-gnu (>= ${version:cpp}),
-  gobjc-s390x-linux-gnu (>= ${version:cpp})
-Description: GNU Objective-C++ compiler for the s390x architecture
- This is the GNU Objective-C++ compiler, which compiles
- Objective-C++ on platforms supported by the gcc compiler. It uses the
- gcc backend to generate optimized code.
- .
- This is a dependency package providing the default GNU Objective-C++
- cross-compiler for the s390x architecture.
-
-Package: gfortran-multilib-s390x-linux-gnu
-Priority: optional
-Architecture: amd64 i386 x32 arm64 ppc64el
-Depends: cpp-s390x-linux-gnu (= ${version:cpp}),
-  gcc-multilib-s390x-linux-gnu (= ${version:gcc}),
-  gfortran-s390x-linux-gnu (= ${version:gfort}),
-  gfortran-${pv:gfort}-multilib-s390x-linux-gnu ${reqv:gfort},
-  ${misc:Depends}
-Suggests: gfortran-doc
-Description: GNU Fortran 95 compiler for the s390x architecture
- This is the GNU Fortran 95 compiler, which compiles Fortran 95 on platforms
- supported by the gcc compiler. It uses the gcc backend to generate optimized
- code.
- .
- This is a dependency package providing the default GNU Fortran 95
- cross-compiler for the s390x architecture.
-
-Package: gccgo-multilib-s390x-linux-gnu
-Priority: optional
-Architecture: amd64 i386 x32 arm64 ppc64el
-Depends: cpp-s390x-linux-gnu (>= ${version:cpp}),
-  g++-multilib-s390x-linux-gnu (>= ${version:gcc}),
-  gccgo-s390x-linux-gnu (>= ${version:ggo}),
-  gccgo-${pv:ggo}-multilib-s390x-linux-gnu ${reqv:ggo},
-  ${misc:Depends}
-Suggests: gccgo-doc
-Description: Go compiler (based on GCC) for the s390x architecture
- This is the GNU Go compiler, which compiles Go on platforms supported by
- the gcc compiler. It uses the gcc backend to generate optimized code.
- .
- This is a dependency package providing the default GNU Go cross-compiler
- for the s390x architecture.
-
-Package: gdc-multilib-s390x-linux-gnu
-Priority: optional
-Architecture: amd64 i386 x32 arm64 ppc64el
-Depends: cpp-s390x-linux-gnu (>= ${version:cpp}),
-  gdc-${pv:gdc}-multilib-s390x-linux-gnu ${reqv:gdc},
-  gdc-s390x-linux-gnu (>= ${version:gdc}),
-  ${misc:Depends}
-Description: GNU D compiler (based on GCC) for the s390x architecture
- This is the GNU D compiler, which compiles D on platforms supported by
- the gcc compiler. It uses the gcc backend to generate optimized code.
- .
- This is a dependency package providing the default GNU D cross-compiler
- for the s390x architecture.
-
 Package: cpp-sh4-linux-gnu
 Priority: optional
 Architecture: sh4
@@ -6981,6 +6981,42 @@ Description: GNU Algol-68 compiler (base
  This is a dependency package providing the default GNU Algol-68 cross-compiler
  for the mips64r6el architecture.
 
+Package: cpp-doc
+Section: doc
+Architecture: any
+Priority: optional
+Depends: cpp-${pv:cpp}-doc ${reqv:cpp}, ${misc:Depends}
+Suggests: cpp (>= ${version:cpp})
+Description: Documentation for the GNU C preprocessor (cpp)
+ Documentation for the GNU C preprocessor in info format (dependency package).
+
+Package: gfortran-doc
+Section: doc
+Architecture: any
+Priority: optional
+Depends: gfortran-${pv:gfort}-doc ${reqv:gfort}, ${misc:Depends}
+Suggests: gfortran (>= ${version:gfort})
+Description: Documentation for the GNU Fortran compiler (gfortran)
+ Documentation for the GNU Fortran compiler in info format (dependency package).
+
+Package: gcc-doc
+Section: doc
+Architecture: any
+Priority: optional
+Depends: gcc-${pv:gcc}-doc ${reqv:gcc}, ${misc:Depends}
+Suggests: gcc (>= ${version:gcc})
+Description: Documentation for the GNU C compilers (gcc, gobjc, g++)
+ Documentation for the GNU compilers in info format (dependency package).
+
+Package: gccgo-doc
+Section: doc
+Architecture: any
+Priority: optional
+Depends: gccgo-${pv:ggo}-doc ${reqv:ggo}, ${misc:Depends}
+Suggests: gccgo (>= ${version:ggo})
+Description: Documentation for the GNU Go compiler
+ Documentation for the GNU Go compiler in info format (dependency package).
+
 Package: gm2-doc
 Section: doc
 Architecture: any
diff -pruN 1.226/fsf-funding.7 1.226ubuntu2/fsf-funding.7
--- 1.226/fsf-funding.7	1970-01-01 00:00:00.000000000 +0000
+++ 1.226ubuntu2/fsf-funding.7	2011-11-24 13:26:39.000000000 +0000
@@ -0,0 +1,185 @@
+.\" Automatically generated by Pod::Man v1.34, Pod::Parser v1.13
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sh \" Subsection heading
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  | will give a
+.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used to
+.\" do unbreakable dashes and therefore won't be available.  \*(C` and \*(C'
+.\" expand to `' in nroff, nothing in troff, for use with C<>.
+.tr \(*W-|\(bv\*(Tr
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+'br\}
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.if \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+..
+.    nr % 0
+.    rr F
+.\}
+.\"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.hy 0
+.if n .na
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "FSF-FUNDING 7"
+.TH FSF-FUNDING 7 "2003-03-01" "gcc-3.3" "GNU"
+.SH "NAME"
+fsf\-funding \- Funding Free Software
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+.Sh "Funding Free Software"
+.IX Subsection "Funding Free Software"
+If you want to have more free software a few years from now, it makes
+sense for you to help encourage people to contribute funds for its
+development.  The most effective approach known is to encourage
+commercial redistributors to donate.
+.PP
+Users of free software systems can boost the pace of development by
+encouraging for-a-fee distributors to donate part of their selling price
+to free software developers\-\-\-the Free Software Foundation, and others.
+.PP
+The way to convince distributors to do this is to demand it and expect
+it from them.  So when you compare distributors, judge them partly by
+how much they give to free software development.  Show distributors
+they must compete to be the one who gives the most.
+.PP
+To make this approach work, you must insist on numbers that you can
+compare, such as, ``We will donate ten dollars to the Frobnitz project
+for each disk sold.''  Don't be satisfied with a vague promise, such as
+``A portion of the profits are donated,'' since it doesn't give a basis
+for comparison.
+.PP
+Even a precise fraction ``of the profits from this disk'' is not very
+meaningful, since creative accounting and unrelated business decisions
+can greatly alter what fraction of the sales price counts as profit.
+If the price you pay is \f(CW$50\fR, ten percent of the profit is probably
+less than a dollar; it might be a few cents, or nothing at all.
+.PP
+Some redistributors do development work themselves.  This is useful too;
+but to keep everyone honest, you need to inquire how much they do, and
+what kind.  Some kinds of development make much more long-term
+difference than others.  For example, maintaining a separate version of
+a program contributes very little; maintaining the standard version of a
+program for the whole community contributes much.  Easy new ports
+contribute little, since someone else would surely do them; difficult
+ports such as adding a new \s-1CPU\s0 to the \s-1GNU\s0 Compiler Collection contribute more;
+major new features or packages contribute the most.
+.PP
+By establishing the idea that supporting further development is ``the
+proper thing to do'' when distributing free software for a fee, we can
+assure a steady flow of resources into making more free software.
+.SH "SEE ALSO"
+.IX Header "SEE ALSO"
+\&\fIgpl\fR\|(7), \fIgfdl\fR\|(7).
+.SH "COPYRIGHT"
+.IX Header "COPYRIGHT"
+Copyright (c) 1994 Free Software Foundation, Inc.
+Verbatim copying and redistribution of this section is permitted
+without royalty; alteration is not permitted.
