[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#742616: Mark libraries packages as multi arch when with_multiarch_lib=yes



Package: gcc-4.9

This the the same with the 4.8 one.
I refreshed it with gcc-4.9.

In this patch, I also enable gcc-4.9-base and mark it as Mulit-Arch: same.

If you do not like it, ignore it please.
I think that this may be very useful for people working on cross complier with
multiarch support, especially for unofficial architectures.

-- 
Yunqiang Su
--- gcc-4.9-4.9-20140322/debian/control.m4	2014-03-25 12:55:13.000000000 +0000
+++ gcc-4.9-4.9-20140322-new/debian/control.m4	2014-03-25 13:50:54.769849629 +0000
@@ -125,7 +125,6 @@
 define(`SOFTBASEDEP', `gnat`'PV-base (>= ${gnat:SoftVersion})')
 ')
 
-ifdef(`TARGET', `', `
 ifenabled(`gccbase',`
 
 Package: gcc`'PV-base
@@ -147,7 +146,6 @@
  Please use the compilers from the gcc-snapshot package for testing.
 ')`'dnl
 ')`'dnl
-')`'dnl native
 
 ifenabled(`gccxbase',`
 dnl override default base package dependencies to cross version
@@ -224,11 +222,10 @@
 Section: ifdef(`TARGET',`devel',`libs')
 Priority: ifdef(`TARGET',`extra',required)
 Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
-ifdef(`TARGET',`Provides: libgcc1-TARGET-dcv1',
 ifdef(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
 Breaks: ${multiarch:breaks}
-')`Provides: libgcc1-armel [armel], libgcc1-armhf [armhf]')
+')`Provides: libgcc1-armel [armel], libgcc1-armhf [armhf]' ifdef(`TARGET',`, libgcc1-TARGET-dcv1')
 BUILT_USING`'dnl
 Description: GCC support library`'ifdef(`TARGET)',` (TARGET)', `')
  Shared version of the support library, a library of internal subroutines
@@ -245,11 +242,9 @@
 Section: debug
 Priority: extra
 Depends: BASEDEP, libdep(gcc1,,=,${gcc:EpochVersion}), ${misc:Depends}
-ifdef(`TARGET',`',`dnl
 ifdef(`MULTIARCH',`Multi-Arch: same
 ')dnl
 Provides: libgcc1-dbg-armel [armel], libgcc1-dbg-armhf [armhf]
-')dnl
 BUILT_USING`'dnl
 Description: GCC support library (debug symbols)`'ifdef(`TARGET)',` (TARGET)', `')
  Debug symbols for the GCC support library.
@@ -264,11 +259,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
+ifdef(`TARGET',`Provides: libgcc2-TARGET-dcv1')
+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 +280,8 @@
 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.
@@ -307,8 +302,8 @@
  ${dep:libatomic}, ${dep:libbtrace}, ${dep:libasan}, ${dep:liblsan},
  ${dep:libtsan}, ${dep:libubsan}, ${dep:libcilkrts}, ${dep:libvtv},
  ${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
@@ -318,10 +313,10 @@
 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}
@@ -338,8 +333,8 @@
 
 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}
@@ -694,7 +689,6 @@
 ')`'dnl x32dev
 ')`'dnl cdev
 
-ifdef(`TARGET', `', `
 ifenabled(`libgmath',`
 Package: libgccmath`'GCCMATH_SO`'LS
 Architecture: i386
@@ -726,7 +720,6 @@
 Description: GCC math support library (64bit)
  Support library for GCC.
 ')`'dnl
-')`'dnl native
 
 ifenabled(`cdev',`
 Package: gcc`'PV`'TS
@@ -883,7 +876,6 @@
 ')`'dnl c++dev
 ')`'dnl c++
 
-ifdef(`TARGET', `', `
 ifenabled(`ssp',`
 Package: libssp`'SSP_SO`'LS
 Architecture: any
@@ -970,16 +962,15 @@
  The protection is realized by buffer overflow detection and reordering of
  stack variables to avoid pointer corruption.
 ')`'dnl
-')`'dnl native
 
 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(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
 Breaks: ${multiarch:breaks}
-')`Provides: libgomp'GOMP_SO`-armel [armel], libgomp'GOMP_SO`-armhf [armhf]')
+')`Provides: libgomp'GOMP_SO`-armel [armel], libgomp'GOMP_SO`-armhf [armhf]'
 Priority: ifdef(`TARGET',`extra',`PRI(optional)')
 Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
 BUILT_USING`'dnl
@@ -992,8 +983,8 @@
 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(`MULTIARCH', `Multi-Arch: same
+')`Provides: libgomp'GOMP_SO`-dbg-armel [armel], libgomp'GOMP_SO`-dbg-armhf [armhf]'
 BUILT_USING`'dnl
 Description: GCC OpenMP (GOMP) support library (debug symbols)
  GOMP is an implementation of OpenMP for the C, C++, and Fortran compilers
@@ -1146,9 +1137,9 @@
 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(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
-')`Provides: libitm'ITM_SO`-armel [armel], libitm'ITM_SO`-armhf [armhf]')
+')`Provides: libitm'ITM_SO`-armel [armel], libitm'ITM_SO`-armhf [armhf]'
 Priority: ifdef(`TARGET',`extra',`PRI(optional)')
 Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
 BUILT_USING`'dnl
@@ -1162,8 +1153,8 @@
 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(`MULTIARCH', `Multi-Arch: same
+')`Provides: libitm'ITM_SO`-dbg-armel [armel], libitm'ITM_SO`-dbg-armhf [armhf]'
 BUILT_USING`'dnl
 Description: GNU Transactional Memory Library (debug symbols)
  GNU Transactional Memory Library (libitm) provides transaction support for
@@ -1332,9 +1323,9 @@
 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(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
-')`Provides: libatomic'ATOMIC_SO`-armel [armel], libatomic'ATOMIC_SO`-armhf [armhf]')
+')`Provides: libatomic'ATOMIC_SO`-armel [armel], libatomic'ATOMIC_SO`-armhf [armhf]'
 Priority: ifdef(`TARGET',`extra',`PRI(optional)')
 Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
 BUILT_USING`'dnl
@@ -1347,8 +1338,8 @@
 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(`MULTIARCH', `Multi-Arch: same
+')`Provides: libatomic'ATOMIC_SO`-dbg-armel [armel], libatomic'ATOMIC_SO`-dbg-armhf [armhf]'
 BUILT_USING`'dnl
 Description: support library providing __atomic built-in functions (debug symbols)
  library providing __atomic built-in functions. When an atomic call cannot
@@ -1503,9 +1494,9 @@
 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(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
-')`Provides: libasan'ASAN_SO`-armel [armel], libasan'ASAN_SO`-armhf [armhf]')
+')`Provides: libasan'ASAN_SO`-armel [armel], libasan'ASAN_SO`-armhf [armhf]'
 Priority: ifdef(`TARGET',`extra',`PRI(optional)')
 Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
 BUILT_USING`'dnl
@@ -1518,8 +1509,8 @@
 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(`MULTIARCH', `Multi-Arch: same
+')`Provides: libasan'ASAN_SO`-dbg-armel [armel], libasan'ASAN_SO`-dbg-armhf [armhf]'
 BUILT_USING`'dnl
 Description: AddressSanitizer -- a fast memory error detector (debug symbols)
  AddressSanitizer (ASan) is a fast memory error detector.  It finds
@@ -1674,9 +1665,9 @@
 Package: liblsan`'LSAN_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
-')`Provides: liblsan'LSAN_SO`-armel [armel], liblsan'LSAN_SO`-armhf [armhf]')
+')`Provides: liblsan'LSAN_SO`-armel [armel], liblsan'LSAN_SO`-armhf [armhf]'
 Priority: ifdef(`TARGET',`extra',`PRI(optional)')
 Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
 BUILT_USING`'dnl
@@ -1689,8 +1680,8 @@
 Section: debug
 Priority: extra
 Depends: BASEDEP, libdep(lsan`'LSAN_SO,,=), ${misc:Depends}
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
-')`Provides: liblsan'LSAN_SO`-dbg-armel [armel], liblsan'LSAN_SO`-dbg-armhf [armhf]')
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`Provides: liblsan'LSAN_SO`-dbg-armel [armel], liblsan'LSAN_SO`-dbg-armhf [armhf]'
 BUILT_USING`'dnl
 Description: LeakSanitizer -- a memory leak detector (debug symbols)
  LeakSanitizer (Lsan) is a memory leak detector which is integrated
@@ -1851,9 +1842,9 @@
 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(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
-')`Provides: libtsan'TSAN_SO`-armel [armel], libtsan'TSAN_SO`-armhf [armhf]')
+')`Provides: libtsan'TSAN_SO`-armel [armel], libtsan'TSAN_SO`-armhf [armhf]'
 Priority: ifdef(`TARGET',`extra',`PRI(optional)')
 Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
 BUILT_USING`'dnl
@@ -1866,8 +1857,8 @@
 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(`MULTIARCH', `Multi-Arch: same
+')`Provides: libtsan'TSAN_SO`-dbg-armel [armel], libtsan'TSAN_SO`-dbg-armhf [armhf]'
 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. 
@@ -2026,9 +2017,9 @@
 Package: libubsan`'UBSAN_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
-')`Provides: libubsan'UBSAN_SO`-armel [armel], libubsan'UBSAN_SO`-armhf [armhf]')
+')`Provides: libubsan'UBSAN_SO`-armel [armel], libubsan'UBSAN_SO`-armhf [armhf]'
 Priority: ifdef(`TARGET',`extra',`PRI(optional)')
 Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
 BUILT_USING`'dnl
@@ -2042,8 +2033,8 @@
 Section: debug
 Priority: extra
 Depends: BASEDEP, libdep(ubsan`'UBSAN_SO,,=), ${misc:Depends}
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
-')`Provides: libubsan'UBSAN_SO`-dbg-armel [armel], libubsan'UBSAN_SO`-dbg-armhf [armhf]')
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`Provides: libubsan'UBSAN_SO`-dbg-armel [armel], libubsan'UBSAN_SO`-dbg-armhf [armhf]'
 BUILT_USING`'dnl
 Description: UBSan -- undefined behaviour sanitizer (debug symbols)
  UndefinedBehaviorSanitizer can be enabled via -fsanitize=undefined.
@@ -2218,9 +2209,9 @@
 Package: libvtv`'VTV_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
-')`Provides: libvtv'VTV_SO`-armel [armel], libvtv'VTV_SO`-armhf [armhf]')
+')`Provides: libvtv'VTV_SO`-armel [armel], libvtv'VTV_SO`-armhf [armhf]'
 Priority: ifdef(`TARGET',`extra',`PRI(optional)')
 Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
 BUILT_USING`'dnl
@@ -2235,8 +2226,8 @@
 Section: debug
 Priority: extra
 Depends: BASEDEP, libdep(vtv`'VTV_SO,,=), ${misc:Depends}
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
-')`Provides: libvtv'VTV_SO`-dbg-armel [armel], libvtv'VTV_SO`-dbg-armhf [armhf]')
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`Provides: libvtv'VTV_SO`-dbg-armel [armel], libvtv'VTV_SO`-dbg-armhf [armhf]'
 BUILT_USING`'dnl
 Description: GNU vtable verification library (debug symbols)
  Vtable verification is a new security hardening feature for GCC that
@@ -2425,9 +2416,9 @@
 Package: libcilkrts`'CILKRTS_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
-')`Provides: libcilkrts'CILKRTS_SO`-armel [armel], libcilkrts'CILKRTS_SO`-armhf [armhf]')
+')`Provides: libcilkrts'CILKRTS_SO`-armel [armel], libcilkrts'CILKRTS_SO`-armhf [armhf]'
 Priority: ifdef(`TARGET',`extra',`PRI(optional)')
 Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
 BUILT_USING`'dnl
@@ -2440,8 +2431,8 @@
 Section: debug
 Priority: extra
 Depends: BASEDEP, libdep(cilkrts`'CILKRTS_SO,,=), ${misc:Depends}
-ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same
-')`Provides: libcilkrts'CILKRTS_SO`-dbg-armel [armel], libcilkrts'CILKRTS_SO`-dbg-armhf [armhf]')
+ifdef(`MULTIARCH', `Multi-Arch: same
+')`Provides: libcilkrts'CILKRTS_SO`-dbg-armel [armel], libcilkrts'CILKRTS_SO`-dbg-armhf [armhf]'
 BUILT_USING`'dnl
 Description: Intel Cilk Plus language extensions (debug symbols)
  Intel Cilk Plus is an extension to the C and C++ languages to support
@@ -2602,9 +2593,9 @@
 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(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
-')`Provides: libbacktrace'BTRACE_SO`-armel [armel], libbacktrace'BTRACE_SO`-armhf [armhf]')
+')`Provides: libbacktrace'BTRACE_SO`-armel [armel], libbacktrace'BTRACE_SO`-armhf [armhf]'
 Priority: ifdef(`TARGET',`extra',`PRI(optional)')
 Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
 BUILT_USING`'dnl
@@ -2617,8 +2608,8 @@
 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(`MULTIARCH', `Multi-Arch: same
+')`Provides: libbacktrace'BTRACE_SO`-dbg-armel [armel], libbacktrace'BTRACE_SO`-dbg-armhf [armhf]'
 BUILT_USING`'dnl
 Description: stack backtrace library (debug symbols)
  libbacktrace uses the GCC unwind interface to collect a stack trace,
@@ -2774,9 +2765,9 @@
 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
@@ -2790,8 +2781,8 @@
 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
@@ -2997,8 +2988,8 @@
 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
@@ -3075,10 +3066,10 @@
 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(`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]')
+',`')')`Provides: libobjc'OBJC_SO`-armel [armel], libobjc'OBJC_SO`-armhf [armhf]'
 Priority: ifdef(`TARGET',`extra',`PRI(optional)')
 Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
 BUILT_USING`'dnl
@@ -3088,8 +3079,8 @@
 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(`MULTIARCH', `Multi-Arch: same
+')`Provides: libobjc'OBJC_SO`-dbg-armel [armel], libobjc'OBJC_SO`-dbg-armhf [armhf]'
 Priority: extra
 Depends: BASEDEP, libdep(objc`'OBJC_SO,,=), libdbgdep(gcc`'GCC_SO-dbg,,>=,${libgcc:Version}), ${misc:Depends}
 BUILT_USING`'dnl
@@ -3281,8 +3272,8 @@
 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
@@ -3359,10 +3350,10 @@
 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(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
 Breaks: ${multiarch:breaks}
-')`Provides: libgfortran'FORTRAN_SO`-armel [armel], libgfortran'FORTRAN_SO`-armhf [armhf]')
+')`Provides: libgfortran'FORTRAN_SO`-armel [armel], libgfortran'FORTRAN_SO`-armhf [armhf]'
 Priority: ifdef(`TARGET',`extra',PRI(optional))
 Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
 BUILT_USING`'dnl
@@ -3373,8 +3364,8 @@
 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(`MULTIARCH', `Multi-Arch: same
+')`Provides: libgfortran'FORTRAN_SO`-dbg-armel [armel], libgfortran'FORTRAN_SO`-dbg-armhf [armhf]'
 Priority: extra
 Depends: BASEDEP, libdep(gfortran`'FORTRAN_SO,,=), libdbgdep(gcc`'GCC_SO-dbg,,>=,${libgcc:Version}), ${misc:Depends}
 BUILT_USING`'dnl
@@ -3585,9 +3576,9 @@
 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(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
-')`Provides: libgo'GO_SO`-armel [armel], libgo'GO_SO`-armhf [armhf]')
+')`Provides: libgo'GO_SO`-armel [armel], libgo'GO_SO`-armhf [armhf]'
 Priority: ifdef(`TARGET',`extra',PRI(optional))
 Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends}
 Replaces: libgo3`'LS
@@ -3599,8 +3590,8 @@
 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(`MULTIARCH', `Multi-Arch: same
+')`Provides: libgo'GO_SO`-dbg-armel [armel], libgo'GO_SO`-dbg-armhf [armhf]'
 Priority: extra
 Depends: BASEDEP, libdep(go`'GO_SO,,=), ${misc:Depends}
 BUILT_USING`'dnl
@@ -3944,11 +3935,11 @@
 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')
 ifdef(`MULTIARCH', `Multi-Arch: same
 Pre-Depends: multiarch-support
 Breaks: ${multiarch:breaks}
-')`Provides: libstdc++'CXX_SO`-armel [armel], libstdc++'CXX_SO`-armhf [armhf]')
+')`Provides: libstdc++'CXX_SO`-armel [armel], libstdc++'CXX_SO`-armhf [armhf]'
 Conflicts: scim (<< 1.4.2-1)
 BUILT_USING`'dnl
 Description: GNU Standard C++ Library v3`'ifdef(`TARGET)',` (TARGET)', `')
@@ -4120,8 +4111,8 @@
 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,,=),
@@ -4149,8 +4140,8 @@
 
 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,),
@@ -4175,10 +4166,9 @@
 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(`TARGET',`Provides: libstdc++CXX_SO-dbg-TARGET-dcv1')
 ifdef(`MULTIARCH', `Multi-Arch: same',`dnl')
-Provides: libstdc++'CXX_SO`'PV`-dbg-armel [armel], libstdc++'CXX_SO`'PV`-dbg-armhf [armhf]dnl
-')
+Provides: libstdc++'CXX_SO`'PV`-dbg-armel [armel], libstdc++'CXX_SO`'PV`-dbg-armhf [armhf]
 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,
@@ -4509,9 +4499,9 @@
 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
@@ -4527,9 +4517,9 @@
 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
@@ -4562,9 +4552,9 @@
 
 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}
@@ -4581,9 +4571,9 @@
 
 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}
@@ -4623,9 +4613,9 @@
 
 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}
@@ -4645,9 +4635,9 @@
 
 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}

Reply to: