* Set the 'Multi-Arch: same' attribute for packages, cross built with

    with_deps_on_target_arch_pkgs=yes (Helmit Grohne). Closes: #744782.


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

3 files changed, 127 insertions, 89 deletions

diff --git a/debian/changelog b/debian/changelog
index 8cbaaf7..1a41ead 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ gcc-4.8 (4.8.2-22) UNRELEASED; urgency=medium
   * Fix java.security symlink in libgcj14. Closes: #746786.
   * Move the libstdc++ gdb pretty printers into libstdc++6, install the
     -gdb.py files into /usr/share/gdb/auto-load.
+  * Set the 'Multi-Arch: same' attribute for packages, cross built with
+    with_deps_on_target_arch_pkgs=yes (Helmit Grohne). Closes: #744782.
 
  -- Matthias Klose <doko@debian.org>  Mon, 05 May 2014 20:29:25 +0200
 
diff --git a/debian/control b/debian/control
index ba77b69..88a27f4 100644
--- a/debian/control
+++ b/debian/control
@@ -179,9 +179,9 @@ Description: GNU C++ compiler (multilib files)
 Package: libasan0
 Section: libs
 Architecture: any
+Provides: libasan0-armel [armel], libasan0-armhf [armhf]
 Multi-Arch: same
 Pre-Depends: multiarch-support
-Provides: libasan0-armel [armel], libasan0-armhf [armhf]
 Priority: optional
 Depends: gcc-4.8-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: AddressSanitizer -- a fast memory error detector
@@ -193,8 +193,8 @@ Architecture: any
 Section: debug
 Priority: extra
 Depends: gcc-4.8-base (= ${gcc:Version}), libasan0 (= ${gcc:Version}), ${misc:Depends}
-Multi-Arch: same
 Provides: libasan0-dbg-armel [armel], libasan0-dbg-armhf [armhf]
+Multi-Arch: same
 Description: AddressSanitizer -- a fast memory error detector (debug symbols)
  AddressSanitizer (ASan) is a fast memory error detector.  It finds
  use-after-free and {heap,stack,global}-buffer overflow bugs in C/C++ programs.
@@ -275,9 +275,9 @@ Description: AddressSanitizer -- a fast memory error detector (x32 debug symbols
 Package: libtsan0
 Section: libs
 Architecture: any
+Provides: libtsan0-armel [armel], libtsan0-armhf [armhf]
 Multi-Arch: same
 Pre-Depends: multiarch-support
-Provides: libtsan0-armel [armel], libtsan0-armhf [armhf]
 Priority: optional
 Depends: gcc-4.8-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: ThreadSanitizer -- a Valgrind-based detector of data races (runtime)
@@ -289,8 +289,8 @@ Architecture: any
 Section: debug
 Priority: extra
 Depends: gcc-4.8-base (= ${gcc:Version}), libtsan0 (= ${gcc:Version}), ${misc:Depends}
-Multi-Arch: same
 Provides: libtsan0-dbg-armel [armel], libtsan0-dbg-armhf [armhf]
+Multi-Arch: same
 Description: ThreadSanitizer -- a Valgrind-based detector of data races (debug symbols)
  ThreadSanitizer (Tsan) is a data race detector for C/C++ programs. 
  The Linux and Mac versions are based on Valgrind. 
@@ -482,9 +482,9 @@ Description: GNU Go compiler (multilib files)
 Package: libgo4
 Section: libs
 Architecture: any
+Provides: libgo4-armel [armel], libgo4-armhf [armhf]
 Multi-Arch: same
 Pre-Depends: multiarch-support
-Provides: libgo4-armel [armel], libgo4-armhf [armhf]
 Priority: optional
 Depends: gcc-4.8-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
 Replaces: libgo3
@@ -495,8 +495,8 @@ Description: Runtime library for GNU Go applications
 Package: libgo4-dbg
 Section: debug
 Architecture: any
-Multi-Arch: same
 Provides: libgo4-dbg-armel [armel], libgo4-dbg-armhf [armhf]
+Multi-Arch: same
 Priority: extra
 Depends: gcc-4.8-base (= ${gcc:Version}), libgo4 (= ${gcc:Version}), ${misc:Depends}
 Description: Runtime library for GNU Go applications (debug symbols)
@@ -766,8 +766,8 @@ Architecture: any
 Section: debug
 Priority: extra
 Depends: gcc-4.8-base (= ${gcc:Version}), libstdc++6 (>= ${gcc:Version}), libgcc1-dbg (>= ${libgcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-Multi-Arch: same
 Provides: libstdc++6-4.8-dbg-armel [armel], libstdc++6-4.8-dbg-armhf [armhf]
+Multi-Arch: same
 Recommends: libstdc++-4.8-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, libstdc++6-4.7-dbg
 Description: GNU Standard C++ Library v3 (debugging files)
diff --git a/debian/control.m4 b/debian/control.m4
index a9dad72..f0a96a0 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -21,6 +21,7 @@ define(`MAINTAINER', `Debian GCC Maintainers <debian-gcc@lists.debian.org>')
 define(`depifenabled', `ifelse(index(enabled_languages, `$1'), -1, `', `$2')')
 define(`ifenabled', `ifelse(index(enabled_languages, `$1'), -1, `dnl', `$2')')
 
+ifdef(`TARGET',`ifdef(`CROSS_ARCH',`',`undefine(`MULTIARCH')')')
 define(`CROSS_ARCH', ifdef(`CROSS_ARCH', CROSS_ARCH, `all'))
 define(`libdep', `lib$2$1`'LS`'AQ (ifelse(`$3',`',`>=',`$3') ifelse(`$4',`',`${gcc:Version}',`$4'))')
 define(`libdevdep', `lib$2$1`'LS`'AQ (ifelse(`$3',`',`=',`$3') ifelse(`$4',`',`${gcc:Version}',`$4'))')
@@ -224,11 +225,11 @@ Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
 Section: ifdef(`TARGET',`devel',`libs')
 Priority: ifdef(`TARGET',`extra',required)
 Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
-ifdef(`TARGET',`Provides: libgcc1-TARGET-dcv1',
+ifdef(`TARGET',`Provides: libgcc1-TARGET-dcv1',`Provides: libgcc1-armel [armel], libgcc1-armhf [armhf]')
 ifdef(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
 Breaks: ${multiarch:breaks}
-')`Provides: libgcc1-armel [armel], libgcc1-armhf [armhf]')
+')`'dnl
 BUILT_USING`'dnl
 Description: GCC support library`'ifdef(`TARGET)',` (TARGET)', `')
  Shared version of the support library, a library of internal subroutines
@@ -245,11 +246,10 @@ Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
 Section: debug
 Priority: extra
 Depends: BASEDEP, libdep(gcc1,,=,${gcc:EpochVersion}), ${misc:Depends}
-ifdef(`TARGET',`',`dnl
+ifdef(`TARGET',`',`Provides: libgcc1-dbg-armel [armel], libgcc1-dbg-armhf [armhf]
+')`'dnl
 ifdef(`MULTIARCH',`Multi-Arch: same
-')dnl
-Provides: libgcc1-dbg-armel [armel], libgcc1-dbg-armhf [armhf]
-')dnl
+')`'dnl
 BUILT_USING`'dnl
 Description: GCC support library (debug symbols)`'ifdef(`TARGET)',` (TARGET)', `')
  Debug symbols for the GCC support library.
@@ -265,10 +265,11 @@ Section: ifdef(`TARGET',`devel',`libs')
 Priority: ifdef(`TARGET',`extra',required)
 Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
 ifdef(`TARGET',`Provides: libgcc2-TARGET-dcv1
-',ifdef(`MULTIARCH', `Multi-Arch: same
+')`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
 Breaks: ${multiarch:breaks}
-'))`'dnl
+')`'dnl
 BUILT_USING`'dnl
 Description: GCC support library`'ifdef(`TARGET)',` (TARGET)', `')
  Shared version of the support library, a library of internal subroutines
@@ -285,8 +286,8 @@ Architecture: ifdef(`TARGET',`CROSS_ARCH',`m68k')
 Section: debug
 Priority: extra
 Depends: BASEDEP, libdep(gcc2,,=,${gcc:Version}), ${misc:Depends}
-ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same
-'))`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`'dnl
 BUILT_USING`'dnl
 Description: GCC support library (debug symbols)`'ifdef(`TARGET)',` (TARGET)', `')
  Debug symbols for the GCC support library.
@@ -304,8 +305,8 @@ Section: libdevel
 Priority: optional
 Recommends: ${dep:libcdev}
 Depends: BASEDEP, ${dep:libgcc}, ${dep:libssp}, ${dep:libgomp}, ${dep:libitm}, ${dep:libatomic}, ${dep:libbtrace}, ${dep:libasan}, ${dep:libtsan}, ${dep:libqmath}, ${dep:libunwinddev}, ${shlibs:Depends}, ${misc:Depends}
-ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same
-'))`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`'dnl
 BUILT_USING`'dnl
 Description: GCC support library (development files)
  This package contains the headers and static library files necessary for
@@ -315,10 +316,10 @@ Description: GCC support library (development files)
 ifenabled(`lib4gcc',`
 Package: libgcc4`'LS
 Architecture: ifdef(`TARGET',`CROSS_ARCH',`hppa')
-ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same
+ifdef(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
 Breaks: ${multiarch:breaks}
-'))`'dnl
+')`'dnl
 Section: ifdef(`TARGET',`devel',`libs')
 Priority: ifdef(`TARGET',`extra',required)
 Depends: ifdef(`STANDALONEJAVA',`gcj`'PV-base (>= ${gcj:Version})',`BASEDEP'), ${shlibs:Depends}, ${misc:Depends}
@@ -335,8 +336,8 @@ ifdef(`TARGET', `dnl
 
 Package: libgcc4-dbg`'LS
 Architecture: ifdef(`TARGET',`CROSS_ARCH',`hppa')
-ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same
-'))`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`'dnl
 Section: debug
 Priority: extra
 Depends: BASEDEP, libdep(gcc4,,=,${gcc:Version}), ${misc:Depends}
@@ -931,10 +932,12 @@ ifenabled(`libgomp',`
 Package: libgomp`'GOMP_SO`'LS
 Section: ifdef(`TARGET',`devel',`libs')
 Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
+ifdef(`TARGET',`',`Provides: libgomp'GOMP_SO`-armel [armel], libgomp'GOMP_SO`-armhf [armhf]
+')`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
 Breaks: ${multiarch:breaks}
-')`Provides: libgomp'GOMP_SO`-armel [armel], libgomp'GOMP_SO`-armhf [armhf]')
+')`'dnl
 Priority: ifdef(`TARGET',`extra',`PRI(optional)')
 Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
 BUILT_USING`'dnl
@@ -947,8 +950,10 @@ Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
 Section: debug
 Priority: extra
 Depends: BASEDEP, libdep(gomp`'GOMP_SO,,=), ${misc:Depends}
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
-')`Provides: libgomp'GOMP_SO`-dbg-armel [armel], libgomp'GOMP_SO`-dbg-armhf [armhf]')
+ifdef(`TARGET',`',`Provides: libgomp'GOMP_SO`-dbg-armel [armel], libgomp'GOMP_SO`-dbg-armhf [armhf]
+')`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`'dnl
 BUILT_USING`'dnl
 Description: GCC OpenMP (GOMP) support library (debug symbols)
  GOMP is an implementation of OpenMP for the C, C++, and Fortran compilers
@@ -1101,9 +1106,11 @@ ifenabled(`libitm',`
 Package: libitm`'ITM_SO`'LS
 Section: ifdef(`TARGET',`devel',`libs')
 Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
+ifdef(`TARGET',`',`Provides: libitm'ITM_SO`-armel [armel], libitm'ITM_SO`-armhf [armhf]
+')`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
-')`Provides: libitm'ITM_SO`-armel [armel], libitm'ITM_SO`-armhf [armhf]')
+')`'dnl
 Priority: ifdef(`TARGET',`extra',`PRI(optional)')
 Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
 BUILT_USING`'dnl
@@ -1117,8 +1124,10 @@ Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
 Section: debug
 Priority: extra
 Depends: BASEDEP, libdep(itm`'ITM_SO,,=), ${misc:Depends}
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
-')`Provides: libitm'ITM_SO`-dbg-armel [armel], libitm'ITM_SO`-dbg-armhf [armhf]')
+ifdef(`TARGET',`',`Provides: libitm'ITM_SO`-dbg-armel [armel], libitm'ITM_SO`-dbg-armhf [armhf]
+')`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`'dnl
 BUILT_USING`'dnl
 Description: GNU Transactional Memory Library (debug symbols)
  GNU Transactional Memory Library (libitm) provides transaction support for
@@ -1287,9 +1296,11 @@ ifenabled(`libatomic',`
 Package: libatomic`'ATOMIC_SO`'LS
 Section: ifdef(`TARGET',`devel',`libs')
 Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
+ifdef(`TARGET',`',`Provides: libatomic'ATOMIC_SO`-armel [armel], libatomic'ATOMIC_SO`-armhf [armhf]
+')`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
-')`Provides: libatomic'ATOMIC_SO`-armel [armel], libatomic'ATOMIC_SO`-armhf [armhf]')
+')`'dnl
 Priority: ifdef(`TARGET',`extra',`PRI(optional)')
 Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
 BUILT_USING`'dnl
@@ -1302,8 +1313,10 @@ Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
 Section: debug
 Priority: extra
 Depends: BASEDEP, libdep(atomic`'ATOMIC_SO,,=), ${misc:Depends}
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
-')`Provides: libatomic'ATOMIC_SO`-dbg-armel [armel], libatomic'ATOMIC_SO`-dbg-armhf [armhf]')
+ifdef(`TARGET',`',`Provides: libatomic'ATOMIC_SO`-dbg-armel [armel], libatomic'ATOMIC_SO`-dbg-armhf [armhf]
+')`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`'dnl
 BUILT_USING`'dnl
 Description: support library providing __atomic built-in functions (debug symbols)
  library providing __atomic built-in functions. When an atomic call cannot
@@ -1458,9 +1471,11 @@ ifenabled(`libasan',`
 Package: libasan`'ASAN_SO`'LS
 Section: ifdef(`TARGET',`devel',`libs')
 Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
+ifdef(`TARGET',`',`Provides: libasan'ASAN_SO`-armel [armel], libasan'ASAN_SO`-armhf [armhf]
+')`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
-')`Provides: libasan'ASAN_SO`-armel [armel], libasan'ASAN_SO`-armhf [armhf]')
+')`'dnl
 Priority: ifdef(`TARGET',`extra',`PRI(optional)')
 Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
 BUILT_USING`'dnl
@@ -1473,8 +1488,10 @@ Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
 Section: debug
 Priority: extra
 Depends: BASEDEP, libdep(asan`'ASAN_SO,,=), ${misc:Depends}
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
-')`Provides: libasan'ASAN_SO`-dbg-armel [armel], libasan'ASAN_SO`-dbg-armhf [armhf]')
+ifdef(`TARGET',`',`Provides: libasan'ASAN_SO`-dbg-armel [armel], libasan'ASAN_SO`-dbg-armhf [armhf]
+')`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`'dnl
 BUILT_USING`'dnl
 Description: AddressSanitizer -- a fast memory error detector (debug symbols)
  AddressSanitizer (ASan) is a fast memory error detector.  It finds
@@ -1629,9 +1646,11 @@ ifenabled(`libtsan',`
 Package: libtsan`'TSAN_SO`'LS
 Section: ifdef(`TARGET',`devel',`libs')
 Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
+ifdef(`TARGET',`',`Provides: libtsan'TSAN_SO`-armel [armel], libtsan'TSAN_SO`-armhf [armhf]
+')`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
-')`Provides: libtsan'TSAN_SO`-armel [armel], libtsan'TSAN_SO`-armhf [armhf]')
+')`'dnl
 Priority: ifdef(`TARGET',`extra',`PRI(optional)')
 Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
 BUILT_USING`'dnl
@@ -1644,8 +1663,10 @@ Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
 Section: debug
 Priority: extra
 Depends: BASEDEP, libdep(tsan`'TSAN_SO,,=), ${misc:Depends}
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
-')`Provides: libtsan'TSAN_SO`-dbg-armel [armel], libtsan'TSAN_SO`-dbg-armhf [armhf]')
+ifdef(`TARGET',`',`Provides: libtsan'TSAN_SO`-dbg-armel [armel], libtsan'TSAN_SO`-dbg-armhf [armhf]
+')`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`'dnl
 BUILT_USING`'dnl
 Description: ThreadSanitizer -- a Valgrind-based detector of data races (debug symbols)
  ThreadSanitizer (Tsan) is a data race detector for C/C++ programs. 
@@ -1804,9 +1825,11 @@ ifenabled(`libbacktrace',`
 Package: libbacktrace`'BTRACE_SO`'LS
 Section: ifdef(`TARGET',`devel',`libs')
 Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
+ifdef(`TARGET',`',`Provides: libbacktrace'BTRACE_SO`-armel [armel], libbacktrace'BTRACE_SO`-armhf [armhf]
+')`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
-')`Provides: libbacktrace'BTRACE_SO`-armel [armel], libbacktrace'BTRACE_SO`-armhf [armhf]')
+')`'dnl
 Priority: ifdef(`TARGET',`extra',`PRI(optional)')
 Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
 BUILT_USING`'dnl
@@ -1819,8 +1842,10 @@ Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
 Section: debug
 Priority: extra
 Depends: BASEDEP, libdep(backtrace`'BTRACE_SO,,=), ${misc:Depends}
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
-')`Provides: libbacktrace'BTRACE_SO`-dbg-armel [armel], libbacktrace'BTRACE_SO`-dbg-armhf [armhf]')
+ifdef(`TARGET',`',`Provides: libbacktrace'BTRACE_SO`-dbg-armel [armel], libbacktrace'BTRACE_SO`-dbg-armhf [armhf]
+')`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`'dnl
 BUILT_USING`'dnl
 Description: stack backtrace library (debug symbols)
  libbacktrace uses the GCC unwind interface to collect a stack trace,
@@ -1976,9 +2001,9 @@ ifenabled(`libqmath',`
 Package: libquadmath`'QMATH_SO`'LS
 Section: ifdef(`TARGET',`devel',`libs')
 Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
+ifdef(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
-'))`'dnl
+')`'dnl
 Priority: ifdef(`TARGET',`extra',`PRI(optional)')
 Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
 BUILT_USING`'dnl
@@ -1992,8 +2017,8 @@ Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
 Section: debug
 Priority: extra
 Depends: BASEDEP, libdep(quadmath`'QMATH_SO,,=), ${misc:Depends}
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
-'))`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`'dnl
 BUILT_USING`'dnl
 Description: GCC Quad-Precision Math Library (debug symbols)
  A library, which provides quad-precision mathematical functions on targets
@@ -2199,8 +2224,8 @@ Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
 Section: libdevel
 Priority: optional
 Depends: BASEDEP, libdevdep(gcc`'PV-dev,), libdep(objc`'OBJC_SO,), ${shlibs:Depends}, ${misc:Depends}
-ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same
-'))`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`'dnl
 BUILT_USING`'dnl
 Description: Runtime library for GNU Objective-C applications (development files)
  This package contains the headers and static library files needed to build
@@ -2277,10 +2302,12 @@ ifenabled(`libobjc',`
 Package: libobjc`'OBJC_SO`'LS
 Section: ifdef(`TARGET',`devel',`libs')
 Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
+ifdef(`TARGET',`',`Provides: libobjc'OBJC_SO`-armel [armel], libobjc'OBJC_SO`-armhf [armhf]
+')`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
 ifelse(OBJC_SO,`2',`Breaks: ${multiarch:breaks}
-',`')')`Provides: libobjc'OBJC_SO`-armel [armel], libobjc'OBJC_SO`-armhf [armhf]')
+',`')')`'dnl
 Priority: ifdef(`TARGET',`extra',`PRI(optional)')
 Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
 BUILT_USING`'dnl
@@ -2290,8 +2317,10 @@ Description: Runtime library for GNU Objective-C applications
 Package: libobjc`'OBJC_SO-dbg`'LS
 Section: debug
 Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
-')`Provides: libobjc'OBJC_SO`-dbg-armel [armel], libobjc'OBJC_SO`-dbg-armhf [armhf]')
+ifdef(`TARGET',`',`Provides: libobjc'OBJC_SO`-dbg-armel [armel], libobjc'OBJC_SO`-dbg-armhf [armhf]
+')`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`'dnl
 Priority: extra
 Depends: BASEDEP, libdep(objc`'OBJC_SO,,=), libdbgdep(gcc`'GCC_SO-dbg,,>=,${libgcc:Version}), ${misc:Depends}
 BUILT_USING`'dnl
@@ -2483,8 +2512,8 @@ Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
 Section: ifdef(`TARGET',`devel',`libdevel')
 Priority: optional
 Depends: BASEDEP, libdevdep(gcc`'PV-dev`',), libdep(gfortran`'FORTRAN_SO,), ${shlibs:Depends}, ${misc:Depends}
-ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same
-'))`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`'dnl
 BUILT_USING`'dnl
 Description: Runtime library for GNU Fortran applications (development files)
  This package contains the headers and static library files needed to build
@@ -2561,10 +2590,12 @@ ifenabled(`libgfortran',`
 Package: libgfortran`'FORTRAN_SO`'LS
 Section: ifdef(`TARGET',`devel',`libs')
 Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
+ifdef(`TARGET',`',`Provides: libgfortran'FORTRAN_SO`-armel [armel], libgfortran'FORTRAN_SO`-armhf [armhf]
+')`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
 Breaks: ${multiarch:breaks}
-')`Provides: libgfortran'FORTRAN_SO`-armel [armel], libgfortran'FORTRAN_SO`-armhf [armhf]')
+')`'dnl
 Priority: ifdef(`TARGET',`extra',PRI(optional))
 Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
 BUILT_USING`'dnl
@@ -2575,8 +2606,10 @@ Description: Runtime library for GNU Fortran applications
 Package: libgfortran`'FORTRAN_SO-dbg`'LS
 Section: debug
 Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
-')`Provides: libgfortran'FORTRAN_SO`-dbg-armel [armel], libgfortran'FORTRAN_SO`-dbg-armhf [armhf]')
+ifdef(`TARGET',`',`Provides: libgfortran'FORTRAN_SO`-dbg-armel [armel], libgfortran'FORTRAN_SO`-dbg-armhf [armhf]
+')`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`'dnl
 Priority: extra
 Depends: BASEDEP, libdep(gfortran`'FORTRAN_SO,,=), libdbgdep(gcc`'GCC_SO-dbg,,>=,${libgcc:Version}), ${misc:Depends}
 BUILT_USING`'dnl
@@ -2787,9 +2820,11 @@ ifenabled(`libggo',`
 Package: libgo`'GO_SO`'LS
 Section: ifdef(`TARGET',`devel',`libs')
 Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
+ifdef(`TARGET',`',`Provides: libgo'GO_SO`-armel [armel], libgo'GO_SO`-armhf [armhf]
+')`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
-')`Provides: libgo'GO_SO`-armel [armel], libgo'GO_SO`-armhf [armhf]')
+')`'dnl
 Priority: ifdef(`TARGET',`extra',PRI(optional))
 Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
 Replaces: libgo3`'LS
@@ -2801,8 +2836,10 @@ Description: Runtime library for GNU Go applications
 Package: libgo`'GO_SO-dbg`'LS
 Section: debug
 Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
-')`Provides: libgo'GO_SO`-dbg-armel [armel], libgo'GO_SO`-dbg-armhf [armhf]')
+ifdef(`TARGET',`',`Provides: libgo'GO_SO`-dbg-armel [armel], libgo'GO_SO`-dbg-armhf [armhf]
+')`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`'dnl
 Priority: extra
 Depends: BASEDEP, libdep(go`'GO_SO,,=), ${misc:Depends}
 BUILT_USING`'dnl
@@ -3152,11 +3189,11 @@ Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
 Section: ifdef(`TARGET',`devel',`libs')
 Priority: ifdef(`TARGET',`extra',PRI(important))
 Depends: BASEDEP, ${dep:libc}, ${shlibs:Depends}, ${misc:Depends}
-ifdef(`TARGET',`Provides: libstdc++CXX_SO-TARGET-dcv1',
+ifdef(`TARGET',`Provides: libstdc++CXX_SO-TARGET-dcv1',`Provides: libstdc++'CXX_SO`-armel [armel], libstdc++'CXX_SO`-armhf [armhf]')
 ifdef(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
 Breaks: ${multiarch:breaks}
-')`Provides: libstdc++'CXX_SO`-armel [armel], libstdc++'CXX_SO`-armhf [armhf]')
+')`'dnl
 Conflicts: scim (<< 1.4.2-1)
 Replaces: libstdc++CXX_SO`'PV-dbg`'LS (<< 4.8.2-22)
 BUILT_USING`'dnl
@@ -3329,8 +3366,8 @@ Description: GNU Standard C++ Library v3 [NEON version]
 ifenabled(`c++dev',`
 Package: libstdc++`'PV-dev`'LS
 Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same
-'))`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`'dnl
 Section: ifdef(`TARGET',`devel',`libdevel')
 Priority: ifdef(`TARGET',`extra',PRI(optional))
 Depends: BASEDEP, libdevdep(gcc`'PV-dev,,=), libdep(stdc++CXX_SO,,>=), ${dep:libcdev}, ${misc:Depends}
@@ -3355,8 +3392,8 @@ ifdef(`TARGET', `dnl
 
 Package: libstdc++`'PV-pic`'LS
 Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same
-'))`'dnl
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`'dnl
 Section: ifdef(`TARGET',`devel',`libdevel')
 Priority: extra
 Depends: BASEDEP, libdep(stdc++CXX_SO,), libdevdep(stdc++`'PV-dev,), ${misc:Depends}
@@ -3379,10 +3416,9 @@ Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
 Section: debug
 Priority: extra
 Depends: BASEDEP, libdep(stdc++CXX_SO,), libdbgdep(gcc`'GCC_SO-dbg,,>=,${libgcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-ifdef(`TARGET',`Provides: libstdc++CXX_SO-dbg-TARGET-dcv1',`dnl
-ifdef(`MULTIARCH', `Multi-Arch: same',`dnl')
-Provides: libstdc++'CXX_SO`'PV`-dbg-armel [armel], libstdc++'CXX_SO`'PV`-dbg-armhf [armhf]dnl
-')
+ifdef(`TARGET',`Provides: libstdc++CXX_SO-dbg-TARGET-dcv1',`Provides: libstdc++'CXX_SO`'PV`-dbg-armel [armel], libstdc++'CXX_SO`'PV`-dbg-armhf [armhf]')
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`'dnl
 Recommends: libdevdep(stdc++`'PV-dev,)
 Conflicts: libstdc++5-dbg`'LS, libstdc++5-3.3-dbg`'LS, libstdc++6-dbg`'LS, libstdc++6-4.0-dbg`'LS, libstdc++6-4.1-dbg`'LS, libstdc++6-4.2-dbg`'LS, libstdc++6-4.3-dbg`'LS, libstdc++6-4.4-dbg`'LS, libstdc++6-4.5-dbg`'LS, libstdc++6-4.6-dbg`'LS, libstdc++6-4.7-dbg`'LS
 BUILT_USING`'dnl
@@ -3679,9 +3715,9 @@ ifenabled(`libgnat',`
 Package: libgnat`'-GNAT_V`'LS
 Section: ifdef(`TARGET',`devel',`libs')
 Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
+ifdef(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
-'))`'dnl
+')`'dnl
 Priority: PRI(optional)
 Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
 BUILT_USING`'dnl
@@ -3697,9 +3733,9 @@ Description: runtime for applications compiled with GNAT (shared library)
 Package: libgnat`'-GNAT_V-dbg`'LS
 Section: debug
 Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
+ifdef(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
-'))`'dnl
+')`'dnl
 Priority: extra
 Depends: BASEDEP, libgnat`'-GNAT_V`'LS (= ${gnat:Version}), ${misc:Depends}
 BUILT_USING`'dnl
@@ -3732,9 +3768,9 @@ Description: GNU Ada compiler selected components (development files)
 
 Package: libgnatvsn`'GNAT_V`'LS
 Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
+ifdef(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
-'))`'dnl
+')`'dnl
 Priority: PRI(optional)
 Section: ifdef(`TARGET',`devel',`libs')
 Depends: BASEDEP, libgnat`'-GNAT_V`'LS (= ${gnat:Version}), ${misc:Depends}
@@ -3751,9 +3787,9 @@ Description: GNU Ada compiler selected components (shared library)
 
 Package: libgnatvsn`'GNAT_V-dbg`'LS
 Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
+ifdef(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
-'))`'dnl
+')`'dnl
 Priority: extra
 Section: debug
 Depends: BASEDEP, libgnatvsn`'GNAT_V`'LS (= ${gnat:Version}), ${misc:Depends}
@@ -3793,9 +3829,9 @@ Description: GNU Ada compiler Project Manager (development files)
 
 Package: libgnatprj`'GNAT_V`'LS
 Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
+ifdef(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
-'))`'dnl
+')`'dnl
 Priority: PRI(optional)
 Section: ifdef(`TARGET',`devel',`libs')
 Depends: BASEDEP, libgnat`'-GNAT_V`'LS (= ${gnat:Version}), libgnatvsn`'GNAT_V`'LS (= ${gnat:Version}), ${misc:Depends}
@@ -3815,9 +3851,9 @@ Description: GNU Ada compiler Project Manager (shared library)
 
 Package: libgnatprj`'GNAT_V-dbg`'LS
 Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
+ifdef(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
-'))`'dnl
+')`'dnl
 Priority: extra
 Section: debug
 Depends: BASEDEP, libgnatprj`'GNAT_V`'LS (= ${gnat:Version}), ${misc:Depends}