- Don't apply g++-multiarch-incdir.diff for pre-multiarch builds

git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.7@6323 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca

6 files changed, 344 insertions, 286 deletions

diff --git a/debian/changelog b/debian/changelog
index af839af..3bb3b49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
-gcc-4.7 (4.7.2-12) UNRELEASED; urgency=low
+gcc-4.7 (4.7.2-11lucid1) lucid; urgency=low
 
-  * Fix x32 multiarch name (x86_64-linux-gnux32).
+  * Build for lucid.
 
- -- Matthias Klose <doko@debian.org>  Sat, 24 Nov 2012 18:08:24 +0100
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 24 Nov 2012 19:13:03 +0100
+
+gcc-4.7 (4.7.2-11ubuntu1) raring; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Build from upstream source.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 24 Nov 2012 06:09:46 +0100
 
 gcc-4.7 (4.7.2-11) experimental; urgency=low
 
@@ -92,6 +99,131 @@ gcc-4.7 (4.7.2-10) experimental; urgency=low
 
  -- Matthias Klose <doko@debian.org>  Sun, 18 Nov 2012 17:54:15 +0100
 
+gcc-4.7 (4.7.2-5ubuntu7) raring; urgency=low
+
+  * Fix thinko in the gcc-multiarch patch; the multiarch related
+    macros have to be defined in the Makefile before including the
+    host fragment files.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 14 Nov 2012 19:24:11 +0100
+
+gcc-4.7 (4.7.2-5ubuntu6) raring; urgency=low
+
+  * Update to SVN 20121113 (r193472) from the gcc-4_7-branch.
+  * Use /usr/include/<multiarch>/c++/4.x as the include directory
+    for host dependent c++ header files.
+  * Split out lib*stdc++-dev packages.
+  * Update to the Linaro 4.7-2012.11 release.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 14 Nov 2012 10:34:27 +0100
+
+gcc-4.7 (4.7.2-5ubuntu5) raring; urgency=low
+
+  * Update to SVN 20121105 (r193152) from the gcc-4_7-branch.
+  * Fix typo in control file for arm multilib packages.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 05 Nov 2012 14:46:59 +0100
+
+gcc-4.7 (4.7.2-5ubuntu4) raring; urgency=low
+
+  * Update to SVN 20121027 (r192873) from the gcc-4_7-branch.
+  * Build x32 multilibs on amd64 and i386.
+  * Don't run the libstdc++ tests on armel, timeouts on the buildds.
+  * lib*-dev packages for cross builds are not Multi-Arch: same. LP: #1070694.
+  * Turn on -D_FORTIFY_SOURCE=2 by default for C, C++, ObjC, ObjC++,
+    only if the optimization level is > 0.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 27 Oct 2012 14:03:30 +0200
+
+gcc-4.7 (4.7.2-5ubuntu3) raring; urgency=low
+
+  * Fix hjl-x32-gcc-4_7-branch.diff.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 25 Oct 2012 13:45:40 +0200
+
+gcc-4.7 (4.7.2-5ubuntu2) raring; urgency=low
+
+  * Merge with Debian.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 25 Oct 2012 13:31:07 +0200
+
+gcc-4.7 (4.7.2-5) UNRELEASED; urgency=low
+
+  * Update to SVN 20121118 (r193598) from the gcc-4_7-branch.
+    - Fix PR target/54892 (ARM, LP: #1065122), PR rtl-optimization/54870,
+      PR rtl-optimization/53701, PR target/53975 (ia64),
+      PR tree-optimization/54902 (LP: #1065559), PR middle-end/54945,
+      PR target/55019 (ARM), PR c++/54984, PR target/55175,
+      PR tree-optimization/53708, PR tree-optimization/54985,
+      PR libstdc++/55169, PR libstdc++/55047, PR libstdc++/55123,
+      PR libstdc++/54075, PR libstdc++/28811, PR libstdc++/54482,
+      PR libstdc++/55028, PR libstdc++/55215, PR middle-end/55219,
+      PR tree-optimization/54986, PR target/55204, PR debug/54828,
+      PR tree-optimization/54877, PR c++/54988, PR other/52438,
+      PR fortran/54917, PR libstdc++/55320, PR libstdc++/53841.
+
+  [ Matthias Klose ]
+  * Update the Linaro support to the 4.7-2012.11 release.
+  * Define MULTIARCH_DIRNAME for arm64 (Wookey).
+  * Let the lib*objc-dev packages depend on the lib*gcc-dev packages.
+  * Let the libstdc++-dev package depend on the libgcc-dev package.
+  * Drop the dependency of the libstdc++-dev package on g++, make
+    libstdc++-dev and libstdc++-pic Multi-Arch: same. Closes: #678623.
+  * Install override files before calling dh_fixperms.
+  * Backport the libffi arm64 port.
+  * Build libx32gcc-dev, libx32objc-dev and libx32gfortran-dev packages.
+  * Allow conditional building of the x32 multilibs.
+  * Fix libmudflap build failure for x32 multilibs.
+  * Fix dependency on glibc for triarch builds.
+  * Add build-{arch,indep} targets.
+  * Fix libquadmath x32 multilib builds on kernels which don't support x32.
+  * Fix location of x32 specific C++ header files.
+  * Turn on -D_FORTIFY_SOURCE=2 by default for C, C++, ObjC, ObjC++,
+    only if the optimization level is > 0.
+  * Keep the host alias when building multilib libraries which need to
+    be cross-built on some architectures/buildds.
+  * Update arm64 from the aarch64 branch 20121105.
+  * Fix PR other/54411, libiberty: objalloc_alloc integer overflows
+    (CVE-2012-3509).
+  * Use /usr/include/<multiarch>/c++/4.x as the include directory
+    for host dependent c++ header files.
+  * Add alternative libelf-dev build dependency. Closes: #690952.
+  * Always build the aarch64-linux-gnu target from the Linaro branch.
+  * Add __gnu_* symbols to the libgcc1 symbols file for armel and armhf.
+  * For powerpcspe prevent floating point register handling when there
+    are none available (Roland Stigge). Closes: #693328.
+  * Don't apply hurd-pthread.diff for trunk builds, integrated
+    upstream (Samuel Thibault). Addresses: #692538.
+  * Again, suggest graphite runtime dependencies.
+  * Clean up libstdc++ man pages. Closes: #692445.
+  * Update build-indep dependencies for building the libstdc++ docs.
+  * Drop the gcc-no-add-needed patch, depend on binutils 2.22 instead.
+  * Pass --hash-style=gnu instead of --hash-style=both.
+  * Link using --hash-style=gnu on arm64 by default.
+
+  [ Thibaut Girka ]
+  * Split out lib*gcc-dev packages.
+  * Split out lib*objc-dev packages.
+  * Split out lib*gfortran-dev packages.
+
+  [ Daniel Schepler ]
+  * Add support for x32. Closes: #667005.
+  * New patch hjl-x32-gcc-4_7-branch.diff to incorporate changes from
+    that branch, including --with-abi=mx32 option.
+  * Split out lib*stdc++-dev packages.
+
+  [ Marcin Juszkiewicz ]
+  * lib*-dev packages for cross builds are not Multi-Arch: same. LP: #1070694.
+  * Remove conflicts for armhf/armel cross packages.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 18 Nov 2012 17:54:15 +0100
+
+gcc-4.7 (4.7.2-4ubuntu1) quantal; urgency=low
+
+  * Merge with Debian.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 10 Oct 2012 01:16:02 +0200
+
 gcc-4.7 (4.7.2-4) unstable; urgency=low
 
   * Fix PR c++/54858 (ice on valid), taken from the branch.
@@ -125,12 +257,17 @@ gcc-4.7 (4.7.2-3) unstable; urgency=low
 
  -- Matthias Klose <doko@debian.org>  Fri, 05 Oct 2012 20:00:30 +0200
 
+gcc-4.7 (4.7.2-2ubuntu1) quantal; urgency=low
+
+  * Merge with Debian.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 21 Sep 2012 17:08:03 +0200
+
 gcc-4.7 (4.7.2-2) unstable; urgency=low
 
-  * Fix PR tree-optimization/54563 (ice on valid), PR target/54564 (fma builtin
-    fix), PR c/54552 (ice on valid), PR lto/54312 (memory hog), PR c/54103 (ice
-    on valid), PR middle-end/54638 (memory corruption), taken from the 4.7
-    branch.
+  * Fix PR tree-optimization/54563 (), PR target/54564 (fma builtin fix),
+    PR c/54552 (ice on valid), PR lto/54312 (memory hog), PR c/54103 (ice on
+    valid), PR middle-end/54638 (memory corruption), taken from the 4.7 branch.
   * Go fixes, taken from the 4.7 branch.
   * On ARM, don't warn anymore that 4.4 has changed the `va_list' mangling,
     taken from the trunk.
@@ -138,15 +275,35 @@ gcc-4.7 (4.7.2-2) unstable; urgency=low
 
  -- Matthias Klose <doko@debian.org>  Fri, 21 Sep 2012 11:58:10 +0200
 
+gcc-4.7 (4.7.2-1ubuntu1) quantal; urgency=low
+
+  * Include (but do not apply) the aarch64 backport to the 4.7 branch.
+  * Don't run the testsuite on armel, timeouts on the buildds.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 20 Sep 2012 13:14:47 +0200
+
 gcc-4.7 (4.7.2-1) unstable; urgency=low
 
   * GCC 4.7.2 release.
   * Issues addressed after the release candidate:
     - PR c++/53661 (wrong warning), LTO backport from trunk, documentation fix.
-  * Update NEWS files.
 
  -- Matthias Klose <doko@debian.org>  Thu, 20 Sep 2012 12:19:07 +0200
 
+gcc-4.7 (4.7.1-9ubuntu2) quantal; urgency=low
+
+  * No change re-upload, with the testsuite disabled to get the
+    package into the archive on armel (failed three times to build
+    on the buildds without leaving an error log).
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 17 Sep 2012 11:58:54 +0200
+
+gcc-4.7 (4.7.1-9ubuntu1) quantal; urgency=low
+
+  * Merge with Debian.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 13 Sep 2012 13:40:27 +0200
+
 gcc-4.7 (4.7.1-9) unstable; urgency=low
 
   * GCC 4.7.2 release candidate 1.
@@ -165,6 +322,12 @@ gcc-4.7 (4.7.1-9) unstable; urgency=low
 
  -- Matthias Klose <doko@debian.org>  Fri, 14 Sep 2012 19:12:47 +0200
 
+gcc-4.7 (4.7.1-8ubuntu1) quantal; urgency=low
+
+  * Merge with Debian.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 07 Sep 2012 13:50:37 +0200
+
 gcc-4.7 (4.7.1-8) unstable; urgency=low
 
   * Update to SVN 20120908 (r191092) from the gcc-4_7-branch.
@@ -175,7 +338,7 @@ gcc-4.7 (4.7.1-8) unstable; urgency=low
       PR rtl-optimization/54455 (ice on valid), PR driver/54335 (docs),
       PR tree-optimization/54498 (wrong code), PR target/45070 (wrong code),
       PR tree-optimization/54494 (wrong code), PR target/54436 (x86),
-      PR c/54428 (ice on valid), PR c/54363 (ice on valid, closes: #684635),
+      PR c/54428 (ice on valid), PR c/54363 (ice on valid),
       PR rtl-optimization/54369 (mips, sparc, wrong code), PR middle-end/54146,
       PR target/46254 (ice on valid), PR rtl-optimization/54088 (ice on valid),
       PR target/54212 (ARM, wrong code), PR c++/54197 (wrong code),
@@ -191,6 +354,12 @@ gcc-4.7 (4.7.1-8) unstable; urgency=low
 
  -- Matthias Klose <doko@debian.org>  Fri, 07 Sep 2012 22:16:55 +0200
 
+gcc-4.7 (4.7.1-7ubuntu1) quantal; urgency=low
+
+  * Merge with Debian.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 15 Aug 2012 16:55:52 +0200
+
 gcc-4.7 (4.7.1-7) unstable; urgency=low
 
   * Update to SVN 20120814 (r190380) from the gcc-4_7-branch.
@@ -216,6 +385,12 @@ gcc-4.7 (4.7.1-7) unstable; urgency=low
 
  -- Matthias Klose <doko@debian.org>  Tue, 14 Aug 2012 13:58:03 +0200
 
+gcc-4.7 (4.7.1-6ubuntu1) quantal; urgency=low
+
+  * Merge with Debian.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 02 Aug 2012 00:48:37 +0200
+
 gcc-4.7 (4.7.1-6) unstable; urgency=low
 
   * Update to SVN 20120731 (r190015) from the gcc-4_7-branch.
@@ -228,6 +403,12 @@ gcc-4.7 (4.7.1-6) unstable; urgency=low
 
  -- Matthias Klose <doko@debian.org>  Tue, 31 Jul 2012 20:00:56 +0200
 
+gcc-4.7 (4.7.1-5ubuntu1) quantal; urgency=low
+
+  * Merge with Debian.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 14 Jul 2012 01:12:20 +0200
+
 gcc-4.7 (4.7.1-5) unstable; urgency=high
 
   * Update to SVN 20120713 (r189464) from the gcc-4_7-branch.
@@ -249,6 +430,19 @@ gcc-4.7 (4.7.1-4) unstable; urgency=medium
 
  -- Matthias Klose <doko@debian.org>  Mon, 09 Jul 2012 18:58:47 +0200
 
+gcc-4.7 (4.7.1-3ubuntu1) quantal; urgency=low
+
+  * Update to SVN 20120707 (r189352) from the gcc-4_7-branch.
+    - Fix PR libstdc++/53872, PR libstdc++/53830, PR bootstrap/52947,
+      PR middle-end/52786, PR middle-end/50708, PR tree-optimization/53693,
+      PR middle-end/52621, PR middle-end/53433, PR fortran/53732,
+      PR libstdc++/53578.
+  * Update the Linaro support to the 4.7-2012.07 release.
+  * Fix build on pre-multiarch releases (based on patch from Chip Salzenberg).
+    Closes: #680590.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 08 Jul 2012 01:01:30 +0200
+
 gcc-4.7 (4.7.1-3) unstable; urgency=low
 
   * Update to SVN 20120703 (r189219) from the gcc-4_7-branch.
@@ -263,13 +457,19 @@ gcc-4.7 (4.7.1-3) unstable; urgency=low
 
  -- Matthias Klose <doko@debian.org>  Tue, 03 Jul 2012 15:07:14 +0200
 
+gcc-4.7 (4.7.1-2ubuntu1) quantal; urgency=low
+
+  * Update the Linaro support to the 4.7-2012.06 release.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 23 Jun 2012 13:26:03 +0200
+
 gcc-4.7 (4.7.1-2) unstable; urgency=medium
 
   * Update to SVN 20120623 (r188906) from the gcc-4_7-branch.
-    - Fix PR rtl-optimization/53700 (closes: #677678), PR target/52908,
+    - Fix PR rtl-optimization/53700, PR target/52908, PR ada/53592,
       PR libstdc++/53270, PR libstdc++/53678, PR gcov-profile/53744,
       PR c++/52637, PR middle-end/53470, PR c++/53651, PR c++/53137,
-      PR c++/53599, PR fortran/53691, PR fortran/53685, PR ada/53592.
+      PR c++/53599, PR fortran/53691, PR fortran/53685.
   * Update NEWS files for 4.7.1.
   * Bump gcc/FULL-VERSION to 4.7.1.
   * Update the Linaro support to the 4.7-2012.06 release.
@@ -291,6 +491,12 @@ gcc-4.7 (4.7.1-1) unstable; urgency=low
 
  -- Matthias Klose <doko@debian.org>  Fri, 15 Jun 2012 00:38:27 +0200
 
+gcc-4.7 (4.7.0-13ubuntu1) quantal; urgency=low
+
+  * Regenerate the control file.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 12 Jun 2012 17:54:25 +0200
+
 gcc-4.7 (4.7.0-13) unstable; urgency=low
 
   * Update to SVN 20120612 (r188457) from the gcc-4_7-branch.
@@ -307,6 +513,12 @@ gcc-4.7 (4.7.0-13) unstable; urgency=low
 
  -- Matthias Klose <doko@debian.org>  Tue, 12 Jun 2012 15:47:57 +0200
 
+gcc-4.7 (4.7.0-12ubuntu1) quantal; urgency=low
+
+  * Regenerate the control file.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 06 Jun 2012 13:46:57 +0200
+
 gcc-4.7 (4.7.0-12) unstable; urgency=low
 
   * Update to SVN 20120606 (r188261) from the gcc-4_7-branch (release
@@ -325,6 +537,18 @@ gcc-4.7 (4.7.0-12) unstable; urgency=low
 
  -- Matthias Klose <doko@debian.org>  Wed, 06 Jun 2012 13:22:27 +0200
 
+gcc-4.7 (4.7.0-11ubuntu2) quantal; urgency=low
+
+  * Fix build failure in libgo with hardening defaults.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 31 May 2012 10:24:37 +0800
+
+gcc-4.7 (4.7.0-11ubuntu1) quantal; urgency=low
+
+  * Regenerate the control file.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 31 May 2012 08:54:04 +0800
+
 gcc-4.7 (4.7.0-11) unstable; urgency=low
 
   * Update to SVN 20120530 (r188035) from the gcc-4_7-branch.
@@ -380,6 +604,12 @@ gcc-4.7 (4.7.0-8) unstable; urgency=low
 
  -- Matthias Klose <doko@debian.org>  Mon, 07 May 2012 21:56:42 +0200
 
+gcc-4.7 (4.7.0-7ubuntu3) quantal; urgency=low
+
+  * Regenerate the control file.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 02 May 2012 13:18:23 +0200
+
 gcc-4.7 (4.7.0-7) unstable; urgency=low
 
   * Update to SVN 20120502 (r187039) from the gcc-4_7-branch.
@@ -404,6 +634,12 @@ gcc-4.7 (4.7.0-6) unstable; urgency=low
 
  -- Matthias Klose <doko@debian.org>  Mon, 30 Apr 2012 13:06:21 +0200
 
+gcc-4.7 (4.7.0-5ubuntu1) quantal; urgency=low
+
+  * Re-enable multilib builds on armel and armhf.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 28 Apr 2012 12:19:11 +0200
+
 gcc-4.7 (4.7.0-5) unstable; urgency=medium
 
   * Update to SVN 20120428 (r186932) from the gcc-4_7-branch.
@@ -419,10 +655,22 @@ gcc-4.7 (4.7.0-5) unstable; urgency=medium
   [ Aurelien Jarno ]
   * Reenable parallel builds on GNU/kFreeBSD.
   * Fix libgcc building on MIPS N32/64. Closes: #669858.
-  * Add libn32gcc1 and lib64gcc1 symbols files on mips and mipsel.
 
  -- Matthias Klose <doko@debian.org>  Sat, 28 Apr 2012 11:59:36 +0200
 
+gcc-4.7 (4.7.0-4ubuntu2) quantal; urgency=low
+
+  * Default to armv5t, soft float on armel.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 25 Apr 2012 11:42:06 +0200
+
+gcc-4.7 (4.7.0-4ubuntu1) quantal; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Build from the upstream source.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 24 Apr 2012 09:18:11 +0200
+
 gcc-4.7 (4.7.0-4) unstable; urgency=low
 
   * Update to SVN 20120424 (r186746) from the gcc-4_7-branch.
@@ -452,6 +700,14 @@ gcc-4.7 (4.7.0-4) unstable; urgency=low
 
  -- Matthias Klose <doko@debian.org>  Tue, 24 Apr 2012 08:44:15 +0200
 
+gcc-4.7 (4.7.0-3ubuntu1) precise; urgency=low
+
+  * Update to SVN 20120412 (r186372) from the gcc-4_7-branch.
+    - Fix PR libstdc++/52924, PR libstdc++/52591, PR middle-end/52894.
+  * Update the Linaro support to the 4.7-2012.04 release.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 12 Apr 2012 12:07:02 +0200
+
 gcc-4.7 (4.7.0-3) unstable; urgency=low
 
   * Update to SVN 20120409 (r186249) from the gcc-4_7-branch.
@@ -461,7 +717,7 @@ gcc-4.7 (4.7.0-3) unstable; urgency=low
 
   [ Matthias Klose ]
   * Re-add missing dependency on libgcc in gcc-multilib. Closes: #667519.
-  * Add support for GNU locales for GNU/Hurd (Svante Signell).
+  * Add support for GNU locales for GNU/Hurd (Svante Signell). 
     Closes: #667662.
   * Reenable the spu build on ppc64. Closes: #664617.
   * Apply proposed patch for PR52894, stage1 bootstrap failure on hppa
@@ -526,6 +782,13 @@ gcc-4.7 (4.7.0~rc2-1) experimental; urgency=low
 
  -- Matthias Klose <doko@debian.org>  Wed, 14 Mar 2012 15:49:39 +0100
 
+gcc-4.7 (4.7.0~rc1-2ubuntu1) precise; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Build from the upstream tarball.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 11 Mar 2012 20:31:13 +0100
+
 gcc-4.7 (4.7.0~rc1-2) experimental; urgency=low
 
   * Update to SVN 20120310 (r185183) from the gcc-4_6-branch.
@@ -534,7 +797,14 @@ gcc-4.7 (4.7.0~rc1-2) experimental; urgency=low
 
  -- Matthias Klose <doko@debian.org>  Sat, 10 Mar 2012 23:29:45 +0100
 
-gcc-4.7 (4.7.0~rc1-1) experimental; urgency=low
+gcc-4.7 (4.7.0~rc1-1ubuntu1) precise; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Build from the upstream tarball.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 02 Mar 2012 18:42:32 +0100
+
+gcc-4.7 (4.7-4.7.0~rc1-1) experimental; urgency=low
 
   * GCC-4.7 release candidate 1 (r184777).
 
@@ -564,7 +834,13 @@ gcc-4.7 (4.7.0~rc1-1) experimental; urgency=low
 
  -- Matthias Klose <doko@debian.org>  Fri, 02 Mar 2012 18:42:56 +0100
 
-gcc-4.7 (4.7-20120210-1) experimental; urgency=low
+gcc-4.7 (4.7-2012024-0ubuntu1) precise; urgency=low
+
+  * GCC-4.7 snapshot build, taken from the trunk 20120224 (r184508).
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 24 Feb 2012 14:02:55 +0100
+
+gcc-4.7 (4.7-20120210-1) precise; urgency=low
 
   * GCC-4.7 snapshot build, taken from the trunk 20120210 (r184114).
   * kbsd-gnu.diff: Remove, integrated upstream.
diff --git a/debian/control b/debian/control
index 279317b..b8ece38 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,11 @@
 Source: gcc-4.7
 Section: devel
 Priority: optional
-Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
+Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
 Uploaders: Matthias Klose <doko@debian.org>
 Standards-Version: 3.9.3
-Build-Depends: dpkg-dev (>= 1.16.0~ubuntu4), debhelper (>= 5.0.62), g++-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc x32], libc6.1-dev (>= 2.13-5) [alpha ia64] | libc0.3-dev (>= 2.13-5) [hurd-i386] | libc0.1-dev (>= 2.13-5) [kfreebsd-i386 kfreebsd-amd64] | libc6-dev (>= 2.13-5), libc6-dev (>= 2.13-31) [armel armhf], libc6-dev-amd64 [i386 x32], libc6-dev-sparc64 [sparc], libc6-dev-s390 [s390x], libc6-dev-s390x [s390], libc6-dev-i386 [amd64 x32], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64 s390x x32], lib64gcc1 [i386 powerpc sparc s390 x32], libc6-dev-mips64 [mips mipsel], libc6-dev-mipsn32 [mips mipsel], libc6-dev-x32 [amd64 i386], libx32gcc1 [amd64 i386], m4, libtool, autoconf2.64, automake (>= 1:1.11), automake (<< 1:1.12), libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], zlib1g-dev, gawk, lzma, xz-utils, patchutils, binutils (>= 2.22) | binutils-multiarch (>= 2.22), binutils-hppa64 (>= 2.22) [hppa], gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, texinfo (>= 4.3), locales, procps, sharutils, netbase, binutils-spu (>= 2.22) [powerpc ppc64], newlib-spu (>= 1.16.0) [powerpc ppc64], libcloog-ppl-dev (>= 0.15.9-2~), libmpc-dev, libmpfr-dev (>= 3.0.0-9~), libgmp-dev (>= 2:5.0.1~), libelfg0-dev (>= 0.8.12) | libelf-dev, dejagnu [!m68k !hurd-i386 !hurd-alpha], autogen, realpath (>= 1.9.12), chrpath, lsb-release, make (>= 3.81), quilt
+Build-Depends: dpkg-dev (>= 1.14.15), debhelper (>= 5.0.62), g++-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc x32], libc6.1-dev (>= 2.11) [alpha ia64] | libc0.3-dev (>= 2.11) [hurd-i386] | libc0.1-dev (>= 2.11) [kfreebsd-i386 kfreebsd-amd64] | libc6-dev (>= 2.11), libc6-dev-amd64 [i386 x32], libc6-dev-sparc64 [sparc], libc6-dev-s390 [s390x], libc6-dev-s390x [s390], libc6-dev-i386 [amd64 x32], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64 s390x x32], lib64gcc1 [i386 powerpc sparc s390 x32], libc6-dev-mips64 [mips mipsel], libc6-dev-mipsn32 [mips mipsel], m4, libtool, autoconf2.64, libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], zlib1g-dev, gawk, lzma, xz-utils, patchutils, binutils (>= 2.22) | binutils-multiarch (>= 2.22), binutils-hppa64 (>= 2.22) [hppa], gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, texinfo (>= 4.3), locales, procps, sharutils, netbase, binutils-spu (>= 2.22) [powerpc ppc64], newlib-spu (>= 1.16.0) [powerpc ppc64], libcloog-ppl-dev (>= 0.15.9-2~), libmpc-dev, libmpfr-dev, libgmp3-dev | libgmp-dev (>= 2:5.0.1~), libelf-dev | libelfg0-dev (>= 0.8.12), dejagnu [!m68k !hurd-i386 !hurd-alpha], autogen, realpath (>= 1.9.12), chrpath, lsb-release, make (>= 3.81), quilt
 Build-Depends-Indep: doxygen (>= 1.7.2), graphviz (>= 2.2), ghostscript, texlive-latex-base, xsltproc, libxml2-utils, docbook-xsl-ns, 
 Build-Conflicts: binutils-gold
 Homepage: http://gcc.gnu.org/
@@ -13,7 +14,6 @@ XS-Vcs-Svn: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.7
 
 Package: gcc-4.7-base
 Architecture: any
-Multi-Arch: same
 Section: libs
 Priority: required
 Depends: ${misc:Depends}
@@ -28,9 +28,6 @@ Architecture: any
 Section: libs
 Priority: required
 Depends: gcc-4.7-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-Multi-Arch: same
-Pre-Depends: multiarch-support
-Breaks: ${multiarch:breaks}
 Provides: libgcc1-armel [armel], libgcc1-armhf [armhf]
 Description: GCC support library
  Shared version of the support library, a library of internal subroutines
@@ -44,7 +41,6 @@ Priority: optional
 Recommends: ${dep:libcdev}
 Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libgcc}, ${dep:libssp}, ${dep:libgomp}, ${dep:libitm}, ${dep:libqmath}, ${dep:libunwinddev}, ${shlibs:Depends}, ${misc:Depends}
 Replaces: gcc-4.7 (<< ${gcc:SplitVersion})
-Multi-Arch: same
 Description: GCC support library (development files)
  This package contains the headers and static library files necessary for
  building C programs which use libgcc, libgomp, libquadmath, libssp or libitm.
@@ -54,7 +50,6 @@ Architecture: any
 Section: debug
 Priority: extra
 Depends: gcc-4.7-base (= ${gcc:Version}), libgcc1 (= ${gcc:EpochVersion}), ${misc:Depends}
-Multi-Arch: same
 Provides: libgcc1-dbg-armel [armel], libgcc1-dbg-armhf [armhf]
 Description: GCC support library (debug symbols)
  Debug symbols for the GCC support library.
@@ -64,9 +59,6 @@ Architecture: m68k
 Section: libs
 Priority: required
 Depends: gcc-4.7-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-Multi-Arch: same
-Pre-Depends: multiarch-support
-Breaks: ${multiarch:breaks}
 Description: GCC support library
  Shared version of the support library, a library of internal subroutines
  that GCC uses to overcome shortcomings of particular machines, or
@@ -77,15 +69,11 @@ Architecture: m68k
 Section: debug
 Priority: extra
 Depends: gcc-4.7-base (= ${gcc:Version}), libgcc2 (= ${gcc:Version}), ${misc:Depends}
-Multi-Arch: same
 Description: GCC support library (debug symbols)
  Debug symbols for the GCC support library.
 
 Package: libgcc4
 Architecture: hppa
-Multi-Arch: same
-Pre-Depends: multiarch-support
-Breaks: ${multiarch:breaks}
 Section: libs
 Priority: required
 Depends: gcc-4.7-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -96,7 +84,6 @@ Description: GCC support library
 
 Package: libgcc4-dbg
 Architecture: hppa
-Multi-Arch: same
 Section: debug
 Priority: extra
 Depends: gcc-4.7-base (= ${gcc:Version}), libgcc4 (= ${gcc:Version}), ${misc:Depends}
@@ -193,35 +180,6 @@ Depends: gcc-4.7-base (= ${gcc:Version}), libn32gcc1 (= ${gcc:EpochVersion}), ${
 Description: GCC support library (debug symbols)
  Debug symbols for the GCC support library.
 
-Package: libx32gcc1
-Architecture: amd64 i386
-Section: libs
-Priority: optional
-Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${misc:Depends}
-Description: GCC support library (x32)
- Shared version of the support library, a library of internal subroutines
- that GCC uses to overcome shortcomings of particular machines, or
- special needs for some languages.
-
-Package: libx32gcc-4.7-dev
-Architecture: amd64 i386
-Section: libdevel
-Priority: optional
-Recommends: ${dep:libcdev}
-Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libgccbiarch}, ${dep:libsspbiarch}, ${dep:libgompbiarch}, ${dep:libitmbiarch}, ${dep:libqmathbiarch}, ${shlibs:Depends}, ${misc:Depends}
-Replaces: gcc-4.7-multilib (<< ${gcc:SplitVersion})
-Description: GCC support library (x32 development files)
- This package contains the headers and static library files necessary for
- building C programs which use libgcc, libgomp, libquadmath, libssp or libitm.
-
-Package: libx32gcc1-dbg
-Architecture: amd64 i386
-Section: debug
-Priority: extra
-Depends: gcc-4.7-base (= ${gcc:Version}), libx32gcc1 (= ${gcc:EpochVersion}), ${misc:Depends}
-Description: GCC support library (debug symbols)
- Debug symbols for the GCC support library.
-
 Package: gcc-4.7
 Architecture: any
 Section: devel
@@ -249,7 +207,7 @@ Package: gcc-4.7-plugin-dev
 Architecture: any
 Section: devel
 Priority: optional
-Depends: gcc-4.7-base (= ${gcc:Version}), gcc-4.7 (= ${gcc:Version}), libgmp-dev (>= 2:5.0.1~), ${shlibs:Depends}, ${misc:Depends}
+Depends: gcc-4.7-base (= ${gcc:Version}), gcc-4.7 (= ${gcc:Version}), libgmp3-dev | libgmp-dev (>= 2:5.0.1~), ${shlibs:Depends}, ${misc:Depends}
 Description: Files for GNU GCC plugin development.
  This package contains (header) files for GNU GCC plugin development. It
  is only used for the development of GCC plugins, but not needed to run
@@ -306,6 +264,14 @@ Description: GNU C preprocessor
  This package has been separated from gcc for the benefit of those who
  require the preprocessor but not the compiler.
 
+Package: cpp-4.7-doc
+Architecture: all
+Section: doc
+Priority: optional
+Depends: gcc-4.7-base (>= ${gcc:SoftVersion}), dpkg (>= 1.15.4) | install-info, ${misc:Depends}
+Description: Documentation for the GNU C preprocessor (cpp)
+ Documentation for the GNU C preprocessor in info format.
+
 Package: gcc-4.7-locales
 Architecture: all
 Section: devel
@@ -343,9 +309,6 @@ Description: GNU C++ compiler (multilib files)
 
 Package: libmudflap0
 Architecture: any
-Multi-Arch: same
-Pre-Depends: multiarch-support
-Breaks: ${multiarch:breaks}
 Provides: libmudflap0-armel [armel], libmudflap0-armhf [armhf]
 Section: libs
 Priority: optional
@@ -356,7 +319,6 @@ Description: GCC mudflap shared support libraries
 
 Package: libmudflap0-dbg
 Architecture: any
-Multi-Arch: same
 Provides: libmudflap0-dbg-armel [armel], libmudflap0-dbg-armhf [armhf]
 Section: debug
 Priority: extra
@@ -423,25 +385,6 @@ Description: GCC mudflap shared support libraries (n32 debug symbols)
  The libmudflap libraries are used by GCC for instrumenting pointer and array
  dereferencing operations.
 
-Package: libx32mudflap0
-Architecture: amd64 i386
-Section: libs
-Priority: optional
-Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
-Replaces: libmudflap0 (<< 4.1)
-Description: GCC mudflap shared support libraries (x32)
- The libmudflap libraries are used by GCC for instrumenting pointer and array
- dereferencing operations.
-
-Package: libx32mudflap0-dbg
-Architecture: amd64 i386
-Section: debug
-Priority: extra
-Depends: gcc-4.7-base (= ${gcc:Version}), libx32mudflap0 (= ${gcc:Version}), ${misc:Depends}
-Description: GCC mudflap shared support libraries (x32 debug symbols)
- The libmudflap libraries are used by GCC for instrumenting pointer and array
- dereferencing operations.
-
 Package: libmudflap0-4.7-dev
 Architecture: any
 Section: libdevel
@@ -458,9 +401,6 @@ Description: GCC mudflap support libraries (development files)
 Package: libgomp1
 Section: libs
 Architecture: any
-Multi-Arch: same
-Pre-Depends: multiarch-support
-Breaks: ${multiarch:breaks}
 Provides: libgomp1-armel [armel], libgomp1-armhf [armhf]
 Priority: optional
 Depends: gcc-4.7-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -473,7 +413,6 @@ Architecture: any
 Section: debug
 Priority: extra
 Depends: gcc-4.7-base (= ${gcc:Version}), libgomp1 (= ${gcc:Version}), ${misc:Depends}
-Multi-Arch: same
 Provides: libgomp1-dbg-armel [armel], libgomp1-dbg-armhf [armhf]
 Description: GCC OpenMP (GOMP) support library (debug symbols)
  GOMP is an implementation of OpenMP for the C, C++, and Fortran compilers
@@ -533,28 +472,9 @@ Depends: gcc-4.7-base (= ${gcc:Version}), libn32gomp1 (= ${gcc:Version}), ${misc
 Description: GCC OpenMP (GOMP) support library (n32 debug symbols)
  GOMP is an implementation of OpenMP for the C, C++, and Fortran compilers
 
-Package: libx32gomp1
-Section: libs
-Architecture: amd64 i386
-Priority: optional
-Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
-Description: GCC OpenMP (GOMP) support library (x32)
- GOMP is an implementation of OpenMP for the C, C++, and Fortran compilers
- in the GNU Compiler Collection.
-
-Package: libx32gomp1-dbg
-Architecture: amd64 i386
-Section: debug
-Priority: extra
-Depends: gcc-4.7-base (= ${gcc:Version}), libx32gomp1 (= ${gcc:Version}), ${misc:Depends}
-Description: GCC OpenMP (GOMP) support library (x32 debug symbols)
- GOMP is an implementation of OpenMP for the C, C++, and Fortran compilers
-
 Package: libitm1
 Section: libs
 Architecture: any
-Multi-Arch: same
-Pre-Depends: multiarch-support
 Provides: libitm1-armel [armel], libitm1-armhf [armhf]
 Priority: optional
 Depends: gcc-4.7-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -568,7 +488,6 @@ Architecture: any
 Section: debug
 Priority: extra
 Depends: gcc-4.7-base (= ${gcc:Version}), libitm1 (= ${gcc:Version}), ${misc:Depends}
-Multi-Arch: same
 Provides: libitm1-dbg-armel [armel], libitm1-dbg-armhf [armhf]
 Description: GNU Transactional Memory Library (debug symbols)
  GNU Transactional Memory Library (libitm) provides transaction support for
@@ -636,31 +555,9 @@ Description: GNU Transactional Memory Library (n32 debug symbols)
  accesses to the memory of a process, enabling easy-to-use synchronization of
  accesses to shared memory by several threads.
 
-Package: libx32itm1
-Section: libs
-Architecture: amd64 i386
-Priority: optional
-Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
-Description: GNU Transactional Memory Library (x32)
- This manual documents the usage and internals of libitm. It provides
- transaction support for accesses to the memory of a process, enabling
- easy-to-use synchronization of accesses to shared memory by several threads.
-
-Package: libx32itm1-dbg
-Architecture: amd64 i386
-Section: debug
-Priority: extra
-Depends: gcc-4.7-base (= ${gcc:Version}), libx32itm1 (= ${gcc:Version}), ${misc:Depends}
-Description: GNU Transactional Memory Library (x32 debug symbols)
- This manual documents the usage and internals of libitm. It provides
- transaction support for accesses to the memory of a process, enabling
- easy-to-use synchronization of accesses to shared memory by several threads.
-
 Package: libquadmath0
 Section: libs
 Architecture: any
-Multi-Arch: same
-Pre-Depends: multiarch-support
 Priority: optional
 Depends: gcc-4.7-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: GCC Quad-Precision Math Library
@@ -673,7 +570,6 @@ Architecture: any
 Section: debug
 Priority: extra
 Depends: gcc-4.7-base (= ${gcc:Version}), libquadmath0 (= ${gcc:Version}), ${misc:Depends}
-Multi-Arch: same
 Description: GCC Quad-Precision Math Library (debug symbols)
  A library, which provides quad-precision mathematical functions on targets
  supporting the __float128 datatype.
@@ -736,25 +632,6 @@ Description: GCC Quad-Precision Math Library (n32 debug symbols)
  A library, which provides quad-precision mathematical functions on targets
  supporting the __float128 datatype.
 
-Package: libx32quadmath0
-Section: libs
-Architecture: amd64 i386
-Priority: optional
-Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
-Description: GCC Quad-Precision Math Library (x32)
- A library, which provides quad-precision mathematical functions on targets
- supporting the __float128 datatype. The library is used to provide on such
- targets the REAL(16) type in the GNU Fortran compiler.
-
-Package: libx32quadmath0-dbg
-Architecture: amd64 i386
-Section: debug
-Priority: extra
-Depends: gcc-4.7-base (= ${gcc:Version}), libx32quadmath0 (= ${gcc:Version}), ${misc:Depends}
-Description: GCC Quad-Precision Math Library (x32 debug symbols)
- A library, which provides quad-precision mathematical functions on targets
- supporting the __float128 datatype.
-
 Package: gobjc++-4.7
 Architecture: any
 Priority: optional
@@ -804,8 +681,6 @@ Description: GNU Objective-C compiler (multilib files)
 Package: libobjc4
 Section: libs
 Architecture: any
-Multi-Arch: same
-Pre-Depends: multiarch-support
 Provides: libobjc4-armel [armel], libobjc4-armhf [armhf]
 Priority: optional
 Depends: gcc-4.7-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -818,7 +693,6 @@ Section: libdevel
 Priority: optional
 Depends: gcc-4.7-base (= ${gcc:Version}), libgcc-4.7-dev (= ${gcc:Version}), libobjc4 (>= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
 Replaces: gobjc-4.7 (<< ${gcc:SplitVersion})
-Multi-Arch: same
 Description: Runtime library for GNU Objective-C applications (development files)
  This package contains the headers and static library files needed to build
  GNU ObjC applications.
@@ -826,7 +700,6 @@ Description: Runtime library for GNU Objective-C applications (development files
 Package: libobjc4-dbg
 Section: debug
 Architecture: any
-Multi-Arch: same
 Provides: libobjc4-dbg-armel [armel], libobjc4-dbg-armhf [armhf]
 Priority: extra
 Depends: gcc-4.7-base (= ${gcc:Version}), libobjc4 (= ${gcc:Version}), libgcc1-dbg, ${misc:Depends}
@@ -912,32 +785,6 @@ Depends: gcc-4.7-base (= ${gcc:Version}), libn32objc4 (= ${gcc:Version}), libn32
 Description: Runtime library for GNU Objective-C applications (n32 debug symbols)
  Library needed for GNU ObjC applications linked against the shared library.
 
-Package: libx32objc4
-Section: libs
-Architecture: amd64 i386
-Priority: optional
-Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
-Description: Runtime library for GNU Objective-C applications (x32)
- Library needed for GNU ObjC applications linked against the shared library.
-
-Package: libx32objc-4.7-dev
-Architecture: amd64 i386
-Section: libdevel
-Priority: optional
-Depends: gcc-4.7-base (= ${gcc:Version}), libx32gcc-4.7-dev (= ${gcc:Version}), libx32objc4 (>= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-Replaces: gobjc-4.7-multilib (<< ${gcc:SplitVersion})
-Description: Runtime library for GNU Objective-C applications (x32 development files)
- This package contains the headers and static library files needed to build
- GNU ObjC applications.
-
-Package: libx32objc4-dbg
-Section: debug
-Architecture: amd64 i386
-Priority: extra
-Depends: gcc-4.7-base (= ${gcc:Version}), libx32objc4 (= ${gcc:Version}), libx32gcc1-dbg, ${misc:Depends}
-Description: Runtime library for GNU Objective-C applications (x32 debug symbols)
- Library needed for GNU ObjC applications linked against the shared library.
-
 Package: gfortran-4.7
 Architecture: any
 Priority: optional
@@ -961,12 +808,17 @@ Description: GNU Fortran compiler (multilib files)
  On architectures with multilib support, the package contains files
  and dependencies for the non-default multilib architecture(s).
 
+Package: gfortran-4.7-doc
+Architecture: all
+Section: doc
+Priority: optional
+Depends: gcc-4.7-base (>= ${gcc:SoftVersion}), dpkg (>= 1.15.4) | install-info, ${misc:Depends}
+Description: Documentation for the GNU Fortran compiler (gfortran)
+ Documentation for the GNU Fortran compiler in info format.
+
 Package: libgfortran3
 Section: libs
 Architecture: any
-Multi-Arch: same
-Pre-Depends: multiarch-support
-Breaks: ${multiarch:breaks}
 Provides: libgfortran3-armel [armel], libgfortran3-armhf [armhf]
 Priority: optional
 Depends: gcc-4.7-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -981,7 +833,6 @@ Priority: optional
 Depends: gcc-4.7-base (= ${gcc:Version}), libgfortran3, ${shlibs:Depends}, ${misc:Depends}
 Replaces: gfortran-4.7 (<< ${gcc:SplitVersion})
 Breaks: gfortran-4.7 (<< ${gcc:SplitVersion})
-Multi-Arch: same
 Description: Runtime library for GNU Fortran applications (development files)
  This package contains the headers and static library files needed to build
  GNU Fortran applications.
@@ -989,7 +840,6 @@ Description: Runtime library for GNU Fortran applications (development files)
 Package: libgfortran3-dbg
 Section: debug
 Architecture: any
-Multi-Arch: same
 Provides: libgfortran3-dbg-armel [armel], libgfortran3-dbg-armhf [armhf]
 Priority: extra
 Depends: gcc-4.7-base (= ${gcc:Version}), libgfortran3 (= ${gcc:Version}), ${misc:Depends}
@@ -1085,35 +935,6 @@ Description: Runtime library for GNU Fortran applications (n32 debug symbols)
  Library needed for GNU Fortran applications linked against the
  shared library.
 
-Package: libx32gfortran3
-Section: libs
-Architecture: amd64 i386
-Priority: optional
-Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
-Description: Runtime library for GNU Fortran applications (x32)
- Library needed for GNU Fortran applications linked against the
- shared library.
-
-Package: libx32gfortran-4.7-dev
-Architecture: amd64 i386
-Section: libdevel
-Priority: optional
-Depends: gcc-4.7-base (= ${gcc:Version}), libx32gfortran3 (>= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-Replaces: gfortran-4.7-multilib (<< ${gcc:SplitVersion})
-Breaks: gfortran-4.7-multilib (<< ${gcc:SplitVersion})
-Description: Runtime library for GNU Fortran applications (x32 development files)
- This package contains the headers and static library files needed to build
- GNU Fortran applications.
-
-Package: libx32gfortran3-dbg
-Section: debug
-Architecture: amd64 i386
-Priority: extra
-Depends: gcc-4.7-base (= ${gcc:Version}), libx32gfortran3 (= ${gcc:Version}), ${misc:Depends}
-Description: Runtime library for GNU Fortran applications (x32 debug symbols)
- Library needed for GNU Fortran applications linked against the
- shared library.
-
 Package: gccgo-4.7
 Architecture: any
 Priority: optional
@@ -1138,11 +959,17 @@ Description: GNU Go compiler (multilib files)
  On architectures with multilib support, the package contains files
  and dependencies for the non-default multilib architecture(s).
 
+Package: gccgo-4.7-doc
+Architecture: all
+Section: doc
+Priority: optional
+Depends: gcc-4.7-base (>= ${gcc:SoftVersion}), dpkg (>= 1.15.4) | install-info, ${misc:Depends}
+Description: Documentation for the GNU Go compiler (gccgo)
+ Documentation for the GNU Go compiler in info format.
+
 Package: libgo0
 Section: libs
 Architecture: any
-Multi-Arch: same
-Pre-Depends: multiarch-support
 Provides: libgo0-armel [armel], libgo0-armhf [armhf]
 Priority: optional
 Depends: gcc-4.7-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -1153,7 +980,6 @@ Description: Runtime library for GNU Go applications
 Package: libgo0-dbg
 Section: debug
 Architecture: any
-Multi-Arch: same
 Provides: libgo0-dbg-armel [armel], libgo0-dbg-armhf [armhf]
 Priority: extra
 Depends: gcc-4.7-base (= ${gcc:Version}), libgo0 (= ${gcc:Version}), ${misc:Depends}
@@ -1216,32 +1042,11 @@ Description: Runtime library for GNU Go applications (n32 debug symbols)
  Library needed for GNU Go applications linked against the
  shared library.
 
-Package: libx32go0
-Section: libs
-Architecture: amd64 i386
-Priority: optional
-Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}, ${misc:Depends}
-Description: Runtime library for GNU Go applications (x32)
- Library needed for GNU Go applications linked against the
- shared library.
-
-Package: libx32go0-dbg
-Section: debug
-Architecture: amd64 i386
-Priority: extra
-Depends: gcc-4.7-base (= ${gcc:Version}), libx32go0 (= ${gcc:Version}), ${misc:Depends}
-Description: Runtime library for GNU Go applications (x32 debug symbols)
- Library needed for GNU Go applications linked against the
- shared library.
-
 Package: libstdc++6
 Architecture: any
 Section: libs
 Priority: important
 Depends: gcc-4.7-base (= ${gcc:Version}), ${dep:libc}, ${shlibs:Depends}, ${misc:Depends}
-Multi-Arch: same
-Pre-Depends: multiarch-support
-Breaks: ${multiarch:breaks}
 Provides: libstdc++6-armel [armel], libstdc++6-armhf [armhf]
 Conflicts: scim (<< 1.4.2-1)
 Description: GNU Standard C++ Library v3
@@ -1288,22 +1093,8 @@ Description: GNU Standard C++ Library v3 (n32)
  was included up to g++-2.95. The first version of libstdc++-v3 appeared
  in g++-3.0.
 
-Package: libx32stdc++6
-Architecture: amd64 i386
-Section: libs
-Priority: optional
-Depends: gcc-4.7-base (= ${gcc:Version}), ${shlibs:Depends}, libx32gcc1, ${misc:Depends}
-Description: GNU Standard C++ Library v3 (x32)
- This package contains an additional runtime library for C++ programs
- built with the GNU compiler.
- .
- libstdc++-v3 is a complete rewrite from the previous libstdc++-v2, which
- was included up to g++-2.95. The first version of libstdc++-v3 appeared
- in g++-3.0.
-
 Package: libstdc++6-4.7-dev
 Architecture: any
-Multi-Arch: same
 Section: libdevel
 Priority: optional
 Depends: gcc-4.7-base (= ${gcc:Version}), libgcc-4.7-dev (= ${gcc:Version}), libstdc++6 (>= ${gcc:Version}), ${dep:libcdev}, ${misc:Depends}
@@ -1321,7 +1112,6 @@ Description: GNU Standard C++ Library v3 (development files)
 
 Package: libstdc++6-4.7-pic
 Architecture: any
-Multi-Arch: same
 Section: libdevel
 Priority: extra
 Depends: gcc-4.7-base (= ${gcc:Version}), libstdc++6 (>= ${gcc:Version}), libstdc++6-4.7-dev (= ${gcc:Version}), ${misc:Depends}
@@ -1336,7 +1126,6 @@ Architecture: any
 Section: debug
 Priority: extra
 Depends: gcc-4.7-base (= ${gcc:Version}), libstdc++6 (>= ${gcc:Version}), libgcc1-dbg, ${shlibs:Depends}, ${misc:Depends}
-Multi-Arch: same
 Provides: libstdc++6-4.7-dbg-armel [armel], libstdc++6-4.7-dbg-armhf [armhf]
 Recommends: libstdc++6-4.7-dev (= ${gcc:Version})
 Conflicts: libstdc++5-dbg, libstdc++5-3.3-dbg, libstdc++6-dbg, libstdc++6-4.0-dbg, libstdc++6-4.1-dbg, libstdc++6-4.2-dbg, libstdc++6-4.3-dbg, libstdc++6-4.4-dbg, libstdc++6-4.5-dbg, libstdc++6-4.6-dbg
@@ -1419,31 +1208,6 @@ Description: GNU Standard C++ Library v3 (debugging files)
  This package contains the shared library of libstdc++ compiled with
  debugging symbols.
 
-Package: libx32stdc++6-4.7-dev
-Architecture: amd64 i386
-Section: libdevel
-Priority: optional
-Depends: gcc-4.7-base (= ${gcc:Version}), libx32gcc-4.7-dev (= ${gcc:Version}), libx32stdc++6 (>= ${gcc:Version}), libstdc++6-4.7-dev (= ${gcc:Version}), ${misc:Depends}
-Replaces: libstdc++6-4.7-dev (<< ${gcc:SplitVersion}), g++-4.7-multilib (<< ${gcc:SplitVersion})
-Breaks: libstdc++6-4.7-dev (<< ${gcc:SplitVersion}), g++-4.7-multilib (<< ${gcc:SplitVersion})
-Description: GNU Standard C++ Library v3 (development files)
- This package contains the headers and static library files necessary for
- building C++ programs which use libstdc++.
- .
- libstdc++-v3 is a complete rewrite from the previous libstdc++-v2, which
- was included up to g++-2.95. The first version of libstdc++-v3 appeared
- in g++-3.0.
-
-Package: libx32stdc++6-4.7-dbg
-Architecture: amd64 i386
-Section: debug
-Priority: extra
-Depends: gcc-4.7-base (= ${gcc:Version}), libx32stdc++6 (>= ${gcc:Version}), libstdc++6-4.7-dev (= ${gcc:Version}), libx32gcc1-dbg, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: libx32stdc++6-dbg, libx32stdc++6-4.0-dbg, libx32stdc++6-4.1-dbg, libx32stdc++6-4.2-dbg, libx32stdc++6-4.3-dbg, libx32stdc++6-4.4-dbg, libx32stdc++6-4.5-dbg, libx32stdc++6-4.6-dbg
-Description: GNU Standard C++ Library v3 (debugging files)
- This package contains the shared library of libstdc++ compiled with
- debugging symbols.
-
 Package: libstdc++6-4.7-doc
 Architecture: all
 Section: doc
@@ -1481,6 +1245,16 @@ Description: Fix non-ANSI header files
  package is built, so we make fixincludes available at build time of other
  packages, such that checking tools like lintian can make use of it.
 
+Package: gcc-4.7-doc
+Architecture: all
+Section: doc
+Priority: optional
+Depends: gcc-4.7-base (>= ${gcc:SoftVersion}), dpkg (>= 1.15.4) | install-info, ${misc:Depends}
+Conflicts: gcc-docs (<< 2.95.2)
+Replaces: gcc (<=2.7.2.3-4.3), gcc-docs (<< 2.95.2)
+Description: Documentation for the GNU compilers (gcc, gobjc, g++)
+ Documentation for the GNU compilers in info format.
+
 Package: gcc-4.7-source
 Architecture: all
 Priority: optional
diff --git a/debian/rules.conf b/debian/rules.conf
index a37e430..1cd304c 100644
--- a/debian/rules.conf
+++ b/debian/rules.conf
@@ -329,7 +329,8 @@ ifneq (,$(findstring gcc,$(PKGSOURCE)))
 endif
 
 AUTO_BUILD_DEP := m4, libtool,
-AUTO_BUILD_DEP += autoconf2.64, automake (>= 1:1.11), automake (<< 1:1.12),
+#AUTO_BUILD_DEP += autoconf2.64, automake (>= 1:1.11), automake (<< 1:1.12),
+AUTO_BUILD_DEP += autoconf2.64,
 
 ifneq ($(DEB_CROSS),yes)
 JAVA_BUILD_DEP := libc6.1-dbg [alpha ia64] | libc0.3-dbg [hurd-i386] | libc0.1-dbg [kfreebsd-i386 kfreebsd-amd64] | libc6-dbg, zlib1g-dev, libantlr-java, python, libffi-dev,
diff --git a/debian/rules.d/binary-libstdcxx.mk b/debian/rules.d/binary-libstdcxx.mk
index 71aaa97..3d792ce 100644
--- a/debian/rules.d/binary-libstdcxx.mk
+++ b/debian/rules.d/binary-libstdcxx.mk
@@ -104,15 +104,20 @@ dirs_dev = \
 	$(docdir)/$(p_base)/C++ \
 	$(usr_lib) \
 	$(gcc_lib_dir)/include \
-	$(cxx_inc_dir) \
-	$(PF)/include/$(DEB_HOST_MULTIARCH)/c++/$(BASE_VERSION)
+	$(cxx_inc_dir)
 
 files_dev = \
 	$(cxx_inc_dir)/ \
-	$(PF)/include/$(DEB_HOST_MULTIARCH)/c++/$(BASE_VERSION)/bits \
 	$(gcc_lib_dir)/libstdc++.{a,so} \
 	$(gcc_lib_dir)/libsupc++.a
 
+ifeq ($(with_multiarch_lib),yes)
+  dirs_dev += \
+	$(PF)/include/$(DEB_HOST_MULTIARCH)/c++/$(BASE_VERSION)
+  files_dev += \
+	$(PF)/include/$(DEB_HOST_MULTIARCH)/c++/$(BASE_VERSION)/bits
+endif
+
 dirs_dbg = \
 	$(docdir) \
 	$(PF)/lib/debug/$(usr_lib) \
@@ -268,7 +273,7 @@ define __do_libstdcxx_dev
 	DH_COMPAT=2 dh_movefiles -p$(p_l) \
 		$(gcc_lib_dir$(2))/libstdc++.a \
 		$(gcc_lib_dir$(2))/libsupc++.a \
-		$(PF)/include/$(DEB_HOST_MULTIARCH)/c++/$(BASE_VERSION)/$(2)
+		$(if $(with_multiarch_lib),$(PF)/include/$(DEB_HOST_MULTIARCH)/c++/$(BASE_VERSION)/$(2))
 	$(call install_gcc_lib,libstdc++,$(CXX_SONAME),$(2),$(p_l))
 
 	debian/dh_doclink -p$(p_l) $(p_base)
diff --git a/debian/rules.defs b/debian/rules.defs
index 513e95a..25cbc9b 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -1063,7 +1063,7 @@ endif
 ifneq ($(findstring nocheck, $(DEB_BUILD_OPTIONS)),)
   with_check := disabled by DEB_BUILD_OPTIONS
 endif
-with_check := disabled for this build
+#with_check := disabled for this build
 
 # not a dependency on all archs, but if available, use it for the testsuite
 ifneq (,$(wildcard /usr/bin/localedef))
diff --git a/debian/rules.patch b/debian/rules.patch
index 7170e25..03a8f76 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -277,7 +277,9 @@ endif
 debian_patches += libjava-nobiarch-check
 debian_patches += config-ml
 ifneq ($(single_package),yes)
-  debian_patches += g++-multiarch-incdir
+  ifeq ($(with_multiarch_lib),yes)
+    debian_patches += g++-multiarch-incdir
+  endif
 endif
 ifeq ($(biarch64),yes)
   ifeq ($(DEB_CROSS),yes)