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

Bug#798860: gcc-5-cross: add gnat support



Package: src:gcc-5-cross
Version: 9

In this patch:
      1. add packages in debian/control.in.{arch}
      2.  debian/patches/gcc-5/enable-ada-cross.diff:
                revert gnatlink find gcc command name,
                with this patch, it will look for {triplet}-gcc-5-5
                the different behavior with natvie build.
                No idea why to be more work
       3.  sed -i -e "/^Depends:/s/\(libgnat-[0-9]*\)
             gnat-5-{triplet} depends on libgnat-5, while it has no
             symbol files, so the dependency may be sed also.
             So black list it here.
             Maybe add a symbol file should be a better choice.
       4. quilt   --quiltrc /dev/null
              Fix problems when we have ~/.quiltrc


-- 
YunQiang Su
diff --git a/debian/control.arm64.in b/debian/control.arm64.in
index 427053b..6eb3816 100644
--- a/debian/control.arm64.in
+++ b/debian/control.arm64.in
@@ -2524,28 +2524,162 @@ Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), libgcc-GCC_VER-dev-
 Description: Phobos D standard library
  This is the Phobos standard library that comes with the D2 compiler.
 
-#Package: gnat-GCC_VER-GCC_VER-CROSS_GNU_TYPE
-#Architecture: any
-#Priority: extra
-#Depends: gcc-5-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), gcc-5-GCC_VER-CROSS_GNU_TYPE (>= ${gcc:SoftVersion}), ${dep:libgnat}, ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends}
-#Description: GNU Ada compiler
-# GNAT is a compiler for the Ada programming language. It produces optimized
-# code on platforms supported by the GNU Compiler Collection (GCC).
-
-#Package: libgnat-5-CROSS_ARCH-cross
-#Section: devel
-#Architecture: all
-#Priority: extra
-#Depends: gcc-5-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-#Description: runtime for applications compiled with GNAT (shared library)
-# GNAT is a compiler for the Ada programming language. It produces optimized
-# code on platforms supported by the GNU Compiler Collection (GCC).
-
-#Package: libgnat-5-dbg-CROSS_ARCH-cross
-#Section: debug
-#Architecture: all
-#Priority: extra
-#Depends: gcc-5-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), libgnat-5-CROSS_ARCH-cross (= ${gnat:Version}), ${misc:Depends}
-#Description: runtime for applications compiled with GNAT (debugging symbols)
-# GNAT is a compiler for the Ada programming language. It produces optimized
-# code on platforms supported by the GNU Compiler Collection (GCC).
+Package: gnat-GCC_VER-CROSS_GNU_TYPE
+Architecture: @host_archs@
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), gcc-GCC_VER-CROSS_GNU_TYPE (>= ${gcc:SoftVersion}), ${dep:libgnat}, ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends}
+Suggests: gnat-GCC_VER-doc, ada-reference-manual-html, ada-reference-manual-info, ada-reference-manual-pdf, ada-reference-manual-text, gnat-GCC_VER-sjlj-CROSS_GNU_TYPE
+Conflicts: gnat (<< 4.1), gnat-3.1, gnat-3.2, gnat-3.3, gnat-3.4, gnat-3.5, gnat-4.0, gnat-4.1, gnat-4.2, gnat-4.3, gnat-4.4, gnat-4.6
+Description: GNU Ada compiler
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ This package provides the compiler, tools and runtime library that handles
+ exceptions using the default zero-cost mechanism.
+
+Package: gnat-GCC_VER-sjlj-CROSS_GNU_TYPE
+Architecture: all
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), gnat-GCC_VER-CROSS_GNU_TYPE (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler (setjump/longjump runtime library)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ This package provides an alternative runtime library that handles
+ exceptions using the setjump/longjump mechanism (as a static library
+ only).  You can install it to supplement the normal compiler.
+
+Package: libgnat-GCC_VER-CROSS_ARCH-cross
+Section: devel
+Architecture: all
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
+Built-Using: ${Built-Using}
+Description: runtime for applications compiled with GNAT (shared library)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnat library provides runtime components needed by most
+ applications produced with GNAT.
+ .
+ This package contains the runtime shared library.
+
+Package: libgnat-GCC_VER-dbg-CROSS_ARCH-cross
+Section: debug
+Architecture: all
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), libgnat-GCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: runtime for applications compiled with GNAT (debugging symbols)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnat library provides runtime components needed by most
+ applications produced with GNAT.
+ .
+ This package contains the debugging symbols.
+
+Package: libgnatvsnGCC_VER-dev-CROSS_ARCH-cross
+Section: libdevel
+Architecture: all
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}),
+ libgnatvsnGCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler selected components (development files)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnatvsn library exports selected GNAT components for use in other
+ packages, most notably ASIS tools. It is licensed under the GNAT-Modified
+ GPL, allowing to link proprietary programs with it.
+ .
+ This package contains the development files and static library.
+
+Package: libgnatvsnGCC_VER-CROSS_ARCH-cross
+Architecture: all
+Priority: extra
+Section: devel
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), libgnat-GCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler selected components (shared library)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnatvsn library exports selected GNAT components for use in other
+ packages, most notably ASIS tools. It is licensed under the GNAT-Modified
+ GPL, allowing to link proprietary programs with it.
+ .
+ This package contains the runtime shared library.
+
+Package: libgnatvsnGCC_VER-dbg
+Architecture: all
+Priority: extra
+Section: debug
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), libgnatvsnGCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Built-Using: ${Built-Using}
+Description: GNU Ada compiler selected components (debugging symbols)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnatvsn library exports selected GNAT components for use in other
+ packages, most notably ASIS tools. It is licensed under the GNAT-Modified
+ GPL, allowing to link proprietary programs with it.
+ .
+ This package contains the debugging symbols.
+
+Package: libgnatprjGCC_VER-dev-CROSS_ARCH-cross
+Section: libdevel
+Architecture: all
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}),
+ libgnatprjGCC_VER-CROSS_ARCH-cross (= ${gcc:Version}),
+ libgnatvsnGCC_VER-dev-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler Project Manager (development files)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ GNAT uses project files to organise source and object files in large-scale
+ development efforts. The libgnatprj library exports GNAT project files
+ management for use in other packages, most notably ASIS tools (package
+ asis-programs) and GNAT Programming Studio (package gnat-gps). It is
+ licensed under the pure GPL; all programs that use it must also be
+ distributed under the GPL, or not distributed at all.
+ .
+ This package contains the development files and static library.
+
+Package: libgnatprjGCC_VER-CROSS_ARCH-cross
+Architecture: all
+Priority: extra
+Section: devel
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}),
+  libgnat-GCC_VER-CROSS_ARCH-cross (= ${gcc:Version}),
+  libgnatvsnGCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler Project Manager (shared library)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ GNAT uses project files to organise source and object files in large-scale
+ development efforts. The libgnatprj library exports GNAT project files
+ management for use in other packages, most notably ASIS tools (package
+ asis-programs) and GNAT Programming Studio (package gnat-gps). It is
+ licensed under the pure GPL; all programs that use it must also be
+ distributed under the GPL, or not distributed at all.
+ .
+ This package contains the runtime shared library.
+
+Package: libgnatprjGCC_VER-dbg-CROSS_ARCH-cross
+Architecture: all
+Priority: extra
+Section: debug
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}),
+  libgnatprjGCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler Project Manager (debugging symbols)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ GNAT uses project files to organise source and object files in large-scale
+ development efforts. The libgnatprj library exports GNAT project files
+ management for use in other packages, most notably ASIS tools (package
+ asis-programs) and GNAT Programming Studio (package gnat-gps). It is
+ licensed under the pure GPL; all programs that use it must also be
+ distributed under the GPL, or not distributed at all.
+ .
+ This package contains the debugging symbols.
diff --git a/debian/control.armel.in b/debian/control.armel.in
index 7e4d7c1..d883c9c 100644
--- a/debian/control.armel.in
+++ b/debian/control.armel.in
@@ -2524,28 +2524,162 @@ Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), libgcc-GCC_VER-dev-
 Description: Phobos D standard library
  This is the Phobos standard library that comes with the D2 compiler.
 
-#Package: gnat-GCC_VER-GCC_VER-CROSS_GNU_TYPE
-#Architecture: any
-#Priority: extra
-#Depends: gcc-5-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), gcc-5-GCC_VER-CROSS_GNU_TYPE (>= ${gcc:SoftVersion}), ${dep:libgnat}, ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends}
-#Description: GNU Ada compiler
-# GNAT is a compiler for the Ada programming language. It produces optimized
-# code on platforms supported by the GNU Compiler Collection (GCC).
-
-#Package: libgnat-5-CROSS_ARCH-cross
-#Section: devel
-#Architecture: all
-#Priority: extra
-#Depends: gcc-5-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-#Description: runtime for applications compiled with GNAT (shared library)
-# GNAT is a compiler for the Ada programming language. It produces optimized
-# code on platforms supported by the GNU Compiler Collection (GCC).
-
-#Package: libgnat-5-dbg-CROSS_ARCH-cross
-#Section: debug
-#Architecture: all
-#Priority: extra
-#Depends: gcc-5-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), libgnat-5-CROSS_ARCH-cross (= ${gnat:Version}), ${misc:Depends}
-#Description: runtime for applications compiled with GNAT (debugging symbols)
-# GNAT is a compiler for the Ada programming language. It produces optimized
-# code on platforms supported by the GNU Compiler Collection (GCC).
+Package: gnat-GCC_VER-CROSS_GNU_TYPE
+Architecture: @host_archs@
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), gcc-GCC_VER-CROSS_GNU_TYPE (>= ${gcc:SoftVersion}), ${dep:libgnat}, ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends}
+Suggests: gnat-GCC_VER-doc, ada-reference-manual-html, ada-reference-manual-info, ada-reference-manual-pdf, ada-reference-manual-text, gnat-GCC_VER-sjlj-CROSS_GNU_TYPE
+Conflicts: gnat (<< 4.1), gnat-3.1, gnat-3.2, gnat-3.3, gnat-3.4, gnat-3.5, gnat-4.0, gnat-4.1, gnat-4.2, gnat-4.3, gnat-4.4, gnat-4.6
+Description: GNU Ada compiler
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ This package provides the compiler, tools and runtime library that handles
+ exceptions using the default zero-cost mechanism.
+
+Package: gnat-GCC_VER-sjlj-CROSS_GNU_TYPE
+Architecture: all
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), gnat-GCC_VER-CROSS_GNU_TYPE (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler (setjump/longjump runtime library)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ This package provides an alternative runtime library that handles
+ exceptions using the setjump/longjump mechanism (as a static library
+ only).  You can install it to supplement the normal compiler.
+
+Package: libgnat-GCC_VER-CROSS_ARCH-cross
+Section: devel
+Architecture: all
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
+Built-Using: ${Built-Using}
+Description: runtime for applications compiled with GNAT (shared library)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnat library provides runtime components needed by most
+ applications produced with GNAT.
+ .
+ This package contains the runtime shared library.
+
+Package: libgnat-GCC_VER-dbg-CROSS_ARCH-cross
+Section: debug
+Architecture: all
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), libgnat-GCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: runtime for applications compiled with GNAT (debugging symbols)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnat library provides runtime components needed by most
+ applications produced with GNAT.
+ .
+ This package contains the debugging symbols.
+
+Package: libgnatvsnGCC_VER-dev-CROSS_ARCH-cross
+Section: libdevel
+Architecture: all
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}),
+ libgnatvsnGCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler selected components (development files)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnatvsn library exports selected GNAT components for use in other
+ packages, most notably ASIS tools. It is licensed under the GNAT-Modified
+ GPL, allowing to link proprietary programs with it.
+ .
+ This package contains the development files and static library.
+
+Package: libgnatvsnGCC_VER-CROSS_ARCH-cross
+Architecture: all
+Priority: extra
+Section: devel
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), libgnat-GCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler selected components (shared library)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnatvsn library exports selected GNAT components for use in other
+ packages, most notably ASIS tools. It is licensed under the GNAT-Modified
+ GPL, allowing to link proprietary programs with it.
+ .
+ This package contains the runtime shared library.
+
+Package: libgnatvsnGCC_VER-dbg
+Architecture: all
+Priority: extra
+Section: debug
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), libgnatvsnGCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Built-Using: ${Built-Using}
+Description: GNU Ada compiler selected components (debugging symbols)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnatvsn library exports selected GNAT components for use in other
+ packages, most notably ASIS tools. It is licensed under the GNAT-Modified
+ GPL, allowing to link proprietary programs with it.
+ .
+ This package contains the debugging symbols.
+
+Package: libgnatprjGCC_VER-dev-CROSS_ARCH-cross
+Section: libdevel
+Architecture: all
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}),
+ libgnatprjGCC_VER-CROSS_ARCH-cross (= ${gcc:Version}),
+ libgnatvsnGCC_VER-dev-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler Project Manager (development files)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ GNAT uses project files to organise source and object files in large-scale
+ development efforts. The libgnatprj library exports GNAT project files
+ management for use in other packages, most notably ASIS tools (package
+ asis-programs) and GNAT Programming Studio (package gnat-gps). It is
+ licensed under the pure GPL; all programs that use it must also be
+ distributed under the GPL, or not distributed at all.
+ .
+ This package contains the development files and static library.
+
+Package: libgnatprjGCC_VER-CROSS_ARCH-cross
+Architecture: all
+Priority: extra
+Section: devel
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}),
+  libgnat-GCC_VER-CROSS_ARCH-cross (= ${gcc:Version}),
+  libgnatvsnGCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler Project Manager (shared library)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ GNAT uses project files to organise source and object files in large-scale
+ development efforts. The libgnatprj library exports GNAT project files
+ management for use in other packages, most notably ASIS tools (package
+ asis-programs) and GNAT Programming Studio (package gnat-gps). It is
+ licensed under the pure GPL; all programs that use it must also be
+ distributed under the GPL, or not distributed at all.
+ .
+ This package contains the runtime shared library.
+
+Package: libgnatprjGCC_VER-dbg-CROSS_ARCH-cross
+Architecture: all
+Priority: extra
+Section: debug
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}),
+  libgnatprjGCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler Project Manager (debugging symbols)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ GNAT uses project files to organise source and object files in large-scale
+ development efforts. The libgnatprj library exports GNAT project files
+ management for use in other packages, most notably ASIS tools (package
+ asis-programs) and GNAT Programming Studio (package gnat-gps). It is
+ licensed under the pure GPL; all programs that use it must also be
+ distributed under the GPL, or not distributed at all.
+ .
+ This package contains the debugging symbols.
diff --git a/debian/control.armhf.in b/debian/control.armhf.in
index 2483a7f..9f672c7 100644
--- a/debian/control.armhf.in
+++ b/debian/control.armhf.in
@@ -2544,28 +2544,162 @@ Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), libsfgcc-GCC_VER-de
 Description: Phobos D standard library
  This is the Phobos standard library that comes with the D2 compiler.
 
-#Package: gnat-GCC_VER-GCC_VER-CROSS_GNU_TYPE
-#Architecture: any
-#Priority: extra
-#Depends: gcc-5-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), gcc-5-GCC_VER-CROSS_GNU_TYPE (>= ${gcc:SoftVersion}), ${dep:libgnat}, ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends}
-#Description: GNU Ada compiler
-# GNAT is a compiler for the Ada programming language. It produces optimized
-# code on platforms supported by the GNU Compiler Collection (GCC).
-
-#Package: libgnat-5-CROSS_ARCH-cross
-#Section: devel
-#Architecture: all
-#Priority: extra
-#Depends: gcc-5-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-#Description: runtime for applications compiled with GNAT (shared library)
-# GNAT is a compiler for the Ada programming language. It produces optimized
-# code on platforms supported by the GNU Compiler Collection (GCC).
-
-#Package: libgnat-5-dbg-CROSS_ARCH-cross
-#Section: debug
-#Architecture: all
-#Priority: extra
-#Depends: gcc-5-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), libgnat-5-CROSS_ARCH-cross (= ${gnat:Version}), ${misc:Depends}
-#Description: runtime for applications compiled with GNAT (debugging symbols)
-# GNAT is a compiler for the Ada programming language. It produces optimized
-# code on platforms supported by the GNU Compiler Collection (GCC).
+Package: gnat-GCC_VER-CROSS_GNU_TYPE
+Architecture: @host_archs@
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), gcc-GCC_VER-CROSS_GNU_TYPE (>= ${gcc:SoftVersion}), ${dep:libgnat}, ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends}
+Suggests: gnat-GCC_VER-doc, ada-reference-manual-html, ada-reference-manual-info, ada-reference-manual-pdf, ada-reference-manual-text, gnat-GCC_VER-sjlj-CROSS_GNU_TYPE
+Conflicts: gnat (<< 4.1), gnat-3.1, gnat-3.2, gnat-3.3, gnat-3.4, gnat-3.5, gnat-4.0, gnat-4.1, gnat-4.2, gnat-4.3, gnat-4.4, gnat-4.6
+Description: GNU Ada compiler
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ This package provides the compiler, tools and runtime library that handles
+ exceptions using the default zero-cost mechanism.
+
+Package: gnat-GCC_VER-sjlj-CROSS_GNU_TYPE
+Architecture: all
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), gnat-GCC_VER-CROSS_GNU_TYPE (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler (setjump/longjump runtime library)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ This package provides an alternative runtime library that handles
+ exceptions using the setjump/longjump mechanism (as a static library
+ only).  You can install it to supplement the normal compiler.
+
+Package: libgnat-GCC_VER-CROSS_ARCH-cross
+Section: devel
+Architecture: all
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
+Built-Using: ${Built-Using}
+Description: runtime for applications compiled with GNAT (shared library)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnat library provides runtime components needed by most
+ applications produced with GNAT.
+ .
+ This package contains the runtime shared library.
+
+Package: libgnat-GCC_VER-dbg-CROSS_ARCH-cross
+Section: debug
+Architecture: all
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), libgnat-GCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: runtime for applications compiled with GNAT (debugging symbols)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnat library provides runtime components needed by most
+ applications produced with GNAT.
+ .
+ This package contains the debugging symbols.
+
+Package: libgnatvsnGCC_VER-dev-CROSS_ARCH-cross
+Section: libdevel
+Architecture: all
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}),
+ libgnatvsnGCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler selected components (development files)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnatvsn library exports selected GNAT components for use in other
+ packages, most notably ASIS tools. It is licensed under the GNAT-Modified
+ GPL, allowing to link proprietary programs with it.
+ .
+ This package contains the development files and static library.
+
+Package: libgnatvsnGCC_VER-CROSS_ARCH-cross
+Architecture: all
+Priority: extra
+Section: devel
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), libgnat-GCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler selected components (shared library)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnatvsn library exports selected GNAT components for use in other
+ packages, most notably ASIS tools. It is licensed under the GNAT-Modified
+ GPL, allowing to link proprietary programs with it.
+ .
+ This package contains the runtime shared library.
+
+Package: libgnatvsnGCC_VER-dbg
+Architecture: all
+Priority: extra
+Section: debug
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), libgnatvsnGCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Built-Using: ${Built-Using}
+Description: GNU Ada compiler selected components (debugging symbols)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnatvsn library exports selected GNAT components for use in other
+ packages, most notably ASIS tools. It is licensed under the GNAT-Modified
+ GPL, allowing to link proprietary programs with it.
+ .
+ This package contains the debugging symbols.
+
+Package: libgnatprjGCC_VER-dev-CROSS_ARCH-cross
+Section: libdevel
+Architecture: all
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}),
+ libgnatprjGCC_VER-CROSS_ARCH-cross (= ${gcc:Version}),
+ libgnatvsnGCC_VER-dev-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler Project Manager (development files)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ GNAT uses project files to organise source and object files in large-scale
+ development efforts. The libgnatprj library exports GNAT project files
+ management for use in other packages, most notably ASIS tools (package
+ asis-programs) and GNAT Programming Studio (package gnat-gps). It is
+ licensed under the pure GPL; all programs that use it must also be
+ distributed under the GPL, or not distributed at all.
+ .
+ This package contains the development files and static library.
+
+Package: libgnatprjGCC_VER-CROSS_ARCH-cross
+Architecture: all
+Priority: extra
+Section: devel
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}),
+  libgnat-GCC_VER-CROSS_ARCH-cross (= ${gcc:Version}),
+  libgnatvsnGCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler Project Manager (shared library)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ GNAT uses project files to organise source and object files in large-scale
+ development efforts. The libgnatprj library exports GNAT project files
+ management for use in other packages, most notably ASIS tools (package
+ asis-programs) and GNAT Programming Studio (package gnat-gps). It is
+ licensed under the pure GPL; all programs that use it must also be
+ distributed under the GPL, or not distributed at all.
+ .
+ This package contains the runtime shared library.
+
+Package: libgnatprjGCC_VER-dbg-CROSS_ARCH-cross
+Architecture: all
+Priority: extra
+Section: debug
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}),
+  libgnatprjGCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler Project Manager (debugging symbols)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ GNAT uses project files to organise source and object files in large-scale
+ development efforts. The libgnatprj library exports GNAT project files
+ management for use in other packages, most notably ASIS tools (package
+ asis-programs) and GNAT Programming Studio (package gnat-gps). It is
+ licensed under the pure GPL; all programs that use it must also be
+ distributed under the GPL, or not distributed at all.
+ .
+ This package contains the debugging symbols.
diff --git a/debian/control.hppa64.in b/debian/control.hppa64.in
index 0740dec..dd66dd1 100644
--- a/debian/control.hppa64.in
+++ b/debian/control.hppa64.in
@@ -2,7 +2,7 @@
 Package: gcc-GCC_VER-hppa64
 Architecture: @host_archs@
 Section: devel
-Priority: optional
+Priority: extra
 Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
 Conflicts: gcc-3.3-hppa64 (<= 1:3.3.4-5), gcc-3.4-hppa64 (<= 3.4.1-3)
 Description: GNU C compiler (cross compiler for hppa64)
diff --git a/debian/control.mips.in b/debian/control.mips.in
index 03e7a72..794286b 100644
--- a/debian/control.mips.in
+++ b/debian/control.mips.in
@@ -2535,3 +2535,163 @@ Priority: extra
 Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), libgcc-GCC_VER-dev-CROSS_ARCH-cross (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: Phobos D standard library
  This is the Phobos standard library that comes with the D2 compiler.
+
+Package: gnat-GCC_VER-CROSS_GNU_TYPE
+Architecture: @host_archs@
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), gcc-GCC_VER-CROSS_GNU_TYPE (>= ${gcc:SoftVersion}), ${dep:libgnat}, ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends}
+Suggests: gnat-GCC_VER-doc, ada-reference-manual-html, ada-reference-manual-info, ada-reference-manual-pdf, ada-reference-manual-text, gnat-GCC_VER-sjlj-CROSS_GNU_TYPE
+Conflicts: gnat (<< 4.1), gnat-3.1, gnat-3.2, gnat-3.3, gnat-3.4, gnat-3.5, gnat-4.0, gnat-4.1, gnat-4.2, gnat-4.3, gnat-4.4, gnat-4.6
+Description: GNU Ada compiler
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ This package provides the compiler, tools and runtime library that handles
+ exceptions using the default zero-cost mechanism.
+
+Package: gnat-GCC_VER-sjlj-CROSS_GNU_TYPE
+Architecture: all
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), gnat-GCC_VER-CROSS_GNU_TYPE (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler (setjump/longjump runtime library)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ This package provides an alternative runtime library that handles
+ exceptions using the setjump/longjump mechanism (as a static library
+ only).  You can install it to supplement the normal compiler.
+
+Package: libgnat-GCC_VER-CROSS_ARCH-cross
+Section: devel
+Architecture: all
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
+Built-Using: ${Built-Using}
+Description: runtime for applications compiled with GNAT (shared library)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnat library provides runtime components needed by most
+ applications produced with GNAT.
+ .
+ This package contains the runtime shared library.
+
+Package: libgnat-GCC_VER-dbg-CROSS_ARCH-cross
+Section: debug
+Architecture: all
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), libgnat-GCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: runtime for applications compiled with GNAT (debugging symbols)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnat library provides runtime components needed by most
+ applications produced with GNAT.
+ .
+ This package contains the debugging symbols.
+
+Package: libgnatvsnGCC_VER-dev-CROSS_ARCH-cross
+Section: libdevel
+Architecture: all
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}),
+ libgnatvsnGCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler selected components (development files)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnatvsn library exports selected GNAT components for use in other
+ packages, most notably ASIS tools. It is licensed under the GNAT-Modified
+ GPL, allowing to link proprietary programs with it.
+ .
+ This package contains the development files and static library.
+
+Package: libgnatvsnGCC_VER-CROSS_ARCH-cross
+Architecture: all
+Priority: extra
+Section: devel
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), libgnat-GCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler selected components (shared library)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnatvsn library exports selected GNAT components for use in other
+ packages, most notably ASIS tools. It is licensed under the GNAT-Modified
+ GPL, allowing to link proprietary programs with it.
+ .
+ This package contains the runtime shared library.
+
+Package: libgnatvsnGCC_VER-dbg
+Architecture: all
+Priority: extra
+Section: debug
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), libgnatvsnGCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Built-Using: ${Built-Using}
+Description: GNU Ada compiler selected components (debugging symbols)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnatvsn library exports selected GNAT components for use in other
+ packages, most notably ASIS tools. It is licensed under the GNAT-Modified
+ GPL, allowing to link proprietary programs with it.
+ .
+ This package contains the debugging symbols.
+
+Package: libgnatprjGCC_VER-dev-CROSS_ARCH-cross
+Section: libdevel
+Architecture: all
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}),
+ libgnatprjGCC_VER-CROSS_ARCH-cross (= ${gcc:Version}),
+ libgnatvsnGCC_VER-dev-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler Project Manager (development files)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ GNAT uses project files to organise source and object files in large-scale
+ development efforts. The libgnatprj library exports GNAT project files
+ management for use in other packages, most notably ASIS tools (package
+ asis-programs) and GNAT Programming Studio (package gnat-gps). It is
+ licensed under the pure GPL; all programs that use it must also be
+ distributed under the GPL, or not distributed at all.
+ .
+ This package contains the development files and static library.
+
+Package: libgnatprjGCC_VER-CROSS_ARCH-cross
+Architecture: all
+Priority: extra
+Section: devel
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}),
+  libgnat-GCC_VER-CROSS_ARCH-cross (= ${gcc:Version}),
+  libgnatvsnGCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler Project Manager (shared library)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ GNAT uses project files to organise source and object files in large-scale
+ development efforts. The libgnatprj library exports GNAT project files
+ management for use in other packages, most notably ASIS tools (package
+ asis-programs) and GNAT Programming Studio (package gnat-gps). It is
+ licensed under the pure GPL; all programs that use it must also be
+ distributed under the GPL, or not distributed at all.
+ .
+ This package contains the runtime shared library.
+
+Package: libgnatprjGCC_VER-dbg-CROSS_ARCH-cross
+Architecture: all
+Priority: extra
+Section: debug
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}),
+  libgnatprjGCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler Project Manager (debugging symbols)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ GNAT uses project files to organise source and object files in large-scale
+ development efforts. The libgnatprj library exports GNAT project files
+ management for use in other packages, most notably ASIS tools (package
+ asis-programs) and GNAT Programming Studio (package gnat-gps). It is
+ licensed under the pure GPL; all programs that use it must also be
+ distributed under the GPL, or not distributed at all.
+ .
+ This package contains the debugging symbols.
diff --git a/debian/control.powerpc.in b/debian/control.powerpc.in
index 4582b6d..794286b 100644
--- a/debian/control.powerpc.in
+++ b/debian/control.powerpc.in
@@ -2536,28 +2536,162 @@ Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), libgcc-GCC_VER-dev-
 Description: Phobos D standard library
  This is the Phobos standard library that comes with the D2 compiler.
 
-#Package: gnat-GCC_VER-GCC_VER-CROSS_GNU_TYPE
-#Architecture: any
-#Priority: extra
-#Depends: gcc-5-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), gcc-5-GCC_VER-CROSS_GNU_TYPE (>= ${gcc:SoftVersion}), ${dep:libgnat}, ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends}
-#Description: GNU Ada compiler
-# GNAT is a compiler for the Ada programming language. It produces optimized
-# code on platforms supported by the GNU Compiler Collection (GCC).
-
-#Package: libgnat-5-CROSS_ARCH-cross
-#Section: devel
-#Architecture: all
-#Priority: extra
-#Depends: gcc-5-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-#Description: runtime for applications compiled with GNAT (shared library)
-# GNAT is a compiler for the Ada programming language. It produces optimized
-# code on platforms supported by the GNU Compiler Collection (GCC).
-
-#Package: libgnat-5-dbg-CROSS_ARCH-cross
-#Section: debug
-#Architecture: all
-#Priority: extra
-#Depends: gcc-5-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), libgnat-5-CROSS_ARCH-cross (= ${gnat:Version}), ${misc:Depends}
-#Description: runtime for applications compiled with GNAT (debugging symbols)
-# GNAT is a compiler for the Ada programming language. It produces optimized
-# code on platforms supported by the GNU Compiler Collection (GCC).
+Package: gnat-GCC_VER-CROSS_GNU_TYPE
+Architecture: @host_archs@
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), gcc-GCC_VER-CROSS_GNU_TYPE (>= ${gcc:SoftVersion}), ${dep:libgnat}, ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends}
+Suggests: gnat-GCC_VER-doc, ada-reference-manual-html, ada-reference-manual-info, ada-reference-manual-pdf, ada-reference-manual-text, gnat-GCC_VER-sjlj-CROSS_GNU_TYPE
+Conflicts: gnat (<< 4.1), gnat-3.1, gnat-3.2, gnat-3.3, gnat-3.4, gnat-3.5, gnat-4.0, gnat-4.1, gnat-4.2, gnat-4.3, gnat-4.4, gnat-4.6
+Description: GNU Ada compiler
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ This package provides the compiler, tools and runtime library that handles
+ exceptions using the default zero-cost mechanism.
+
+Package: gnat-GCC_VER-sjlj-CROSS_GNU_TYPE
+Architecture: all
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), gnat-GCC_VER-CROSS_GNU_TYPE (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler (setjump/longjump runtime library)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ This package provides an alternative runtime library that handles
+ exceptions using the setjump/longjump mechanism (as a static library
+ only).  You can install it to supplement the normal compiler.
+
+Package: libgnat-GCC_VER-CROSS_ARCH-cross
+Section: devel
+Architecture: all
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
+Built-Using: ${Built-Using}
+Description: runtime for applications compiled with GNAT (shared library)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnat library provides runtime components needed by most
+ applications produced with GNAT.
+ .
+ This package contains the runtime shared library.
+
+Package: libgnat-GCC_VER-dbg-CROSS_ARCH-cross
+Section: debug
+Architecture: all
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), libgnat-GCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: runtime for applications compiled with GNAT (debugging symbols)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnat library provides runtime components needed by most
+ applications produced with GNAT.
+ .
+ This package contains the debugging symbols.
+
+Package: libgnatvsnGCC_VER-dev-CROSS_ARCH-cross
+Section: libdevel
+Architecture: all
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}),
+ libgnatvsnGCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler selected components (development files)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnatvsn library exports selected GNAT components for use in other
+ packages, most notably ASIS tools. It is licensed under the GNAT-Modified
+ GPL, allowing to link proprietary programs with it.
+ .
+ This package contains the development files and static library.
+
+Package: libgnatvsnGCC_VER-CROSS_ARCH-cross
+Architecture: all
+Priority: extra
+Section: devel
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), libgnat-GCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler selected components (shared library)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnatvsn library exports selected GNAT components for use in other
+ packages, most notably ASIS tools. It is licensed under the GNAT-Modified
+ GPL, allowing to link proprietary programs with it.
+ .
+ This package contains the runtime shared library.
+
+Package: libgnatvsnGCC_VER-dbg
+Architecture: all
+Priority: extra
+Section: debug
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), libgnatvsnGCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Built-Using: ${Built-Using}
+Description: GNU Ada compiler selected components (debugging symbols)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnatvsn library exports selected GNAT components for use in other
+ packages, most notably ASIS tools. It is licensed under the GNAT-Modified
+ GPL, allowing to link proprietary programs with it.
+ .
+ This package contains the debugging symbols.
+
+Package: libgnatprjGCC_VER-dev-CROSS_ARCH-cross
+Section: libdevel
+Architecture: all
+Priority: extra
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}),
+ libgnatprjGCC_VER-CROSS_ARCH-cross (= ${gcc:Version}),
+ libgnatvsnGCC_VER-dev-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler Project Manager (development files)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ GNAT uses project files to organise source and object files in large-scale
+ development efforts. The libgnatprj library exports GNAT project files
+ management for use in other packages, most notably ASIS tools (package
+ asis-programs) and GNAT Programming Studio (package gnat-gps). It is
+ licensed under the pure GPL; all programs that use it must also be
+ distributed under the GPL, or not distributed at all.
+ .
+ This package contains the development files and static library.
+
+Package: libgnatprjGCC_VER-CROSS_ARCH-cross
+Architecture: all
+Priority: extra
+Section: devel
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}),
+  libgnat-GCC_VER-CROSS_ARCH-cross (= ${gcc:Version}),
+  libgnatvsnGCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler Project Manager (shared library)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ GNAT uses project files to organise source and object files in large-scale
+ development efforts. The libgnatprj library exports GNAT project files
+ management for use in other packages, most notably ASIS tools (package
+ asis-programs) and GNAT Programming Studio (package gnat-gps). It is
+ licensed under the pure GPL; all programs that use it must also be
+ distributed under the GPL, or not distributed at all.
+ .
+ This package contains the runtime shared library.
+
+Package: libgnatprjGCC_VER-dbg-CROSS_ARCH-cross
+Architecture: all
+Priority: extra
+Section: debug
+Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}),
+  libgnatprjGCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
+Description: GNU Ada compiler Project Manager (debugging symbols)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ GNAT uses project files to organise source and object files in large-scale
+ development efforts. The libgnatprj library exports GNAT project files
+ management for use in other packages, most notably ASIS tools (package
+ asis-programs) and GNAT Programming Studio (package gnat-gps). It is
+ licensed under the pure GPL; all programs that use it must also be
+ distributed under the GPL, or not distributed at all.
+ .
+ This package contains the debugging symbols.
diff --git a/debian/control.ppc64el.in b/debian/control.ppc64el.in
index f5978fa..6eb3816 100644
--- a/debian/control.ppc64el.in
+++ b/debian/control.ppc64el.in
@@ -2550,7 +2550,7 @@ Description: GNU Ada compiler (setjump/longjump runtime library)
  only).  You can install it to supplement the normal compiler.
 
 Package: libgnat-GCC_VER-CROSS_ARCH-cross
-Section: libs
+Section: devel
 Architecture: all
 Priority: extra
 Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
@@ -2597,7 +2597,7 @@ Description: GNU Ada compiler selected components (development files)
 Package: libgnatvsnGCC_VER-CROSS_ARCH-cross
 Architecture: all
 Priority: extra
-Section: libs
+Section: devel
 Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), libgnat-GCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
 Description: GNU Ada compiler selected components (shared library)
  GNAT is a compiler for the Ada programming language. It produces optimized
@@ -2648,7 +2648,7 @@ Description: GNU Ada compiler Project Manager (development files)
 Package: libgnatprjGCC_VER-CROSS_ARCH-cross
 Architecture: all
 Priority: extra
-Section: libs
+Section: devel
 Depends: gcc-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}),
   libgnat-GCC_VER-CROSS_ARCH-cross (= ${gcc:Version}),
   libgnatvsnGCC_VER-CROSS_ARCH-cross (= ${gcc:Version}), ${misc:Depends}
@@ -2683,29 +2683,3 @@ Description: GNU Ada compiler Project Manager (debugging symbols)
  distributed under the GPL, or not distributed at all.
  .
  This package contains the debugging symbols.
-
-#Package: gnat-GCC_VER-GCC_VER-CROSS_GNU_TYPE
-#Architecture: any
-#Priority: extra
-#Depends: gcc-5-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), gcc-5-GCC_VER-CROSS_GNU_TYPE (>= ${gcc:SoftVersion}), ${dep:libgnat}, ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends}
-#Description: GNU Ada compiler
-# GNAT is a compiler for the Ada programming language. It produces optimized
-# code on platforms supported by the GNU Compiler Collection (GCC).
-
-#Package: libgnat-5-CROSS_ARCH-cross
-#Section: devel
-#Architecture: all
-#Priority: extra
-#Depends: gcc-5-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
-#Description: runtime for applications compiled with GNAT (shared library)
-# GNAT is a compiler for the Ada programming language. It produces optimized
-# code on platforms supported by the GNU Compiler Collection (GCC).
-
-#Package: libgnat-5-dbg-CROSS_ARCH-cross
-#Section: debug
-#Architecture: all
-#Priority: extra
-#Depends: gcc-5-GCC_VER-CROSS_GNU_TYPE-base (= ${gcc:Version}), libgnat-5-CROSS_ARCH-cross (= ${gnat:Version}), ${misc:Depends}
-#Description: runtime for applications compiled with GNAT (debugging symbols)
-# GNAT is a compiler for the Ada programming language. It produces optimized
-# code on platforms supported by the GNU Compiler Collection (GCC).
diff --git a/debian/packages.invalid b/debian/packages.invalid
index 74f498a..0e77b18 100644
--- a/debian/packages.invalid
+++ b/debian/packages.invalid
@@ -15,8 +15,6 @@ gccgo-5-multilib-arm-linux-gnueabihf
 gccgo-5-multilib-powerpc64le-linux-gnu
 gfortran-5-multilib-aarch64-linux-gnu
 gfortran-5-multilib-powerpc64le-linux-gnu
-gnat-5-powerpc64le-linux-gnu
-gnat-5-sjlj-powerpc64le-linux-gnu
 gobjc-5-multilib-aarch64-linux-gnu
 gobjc++-5-multilib-aarch64-linux-gnu
 gobjc-5-multilib-powerpc64le-linux-gnu
@@ -261,11 +259,6 @@ libgcc4-mips-cross
 libgcc4-mipsel-cross
 libgcc4-powerpc-cross
 libgcc4-ppc64el-cross
-libgnat-5-ppc64el-cross
-libgnatprj5-dev-ppc64el-cross
-libgnatprj5-ppc64el-cross
-libgnatvsn5-dev-ppc64el-cross
-libgnatvsn5-ppc64el-cross
 libhfasan2-arm64-cross
 libhfasan2-armhf-cross
 libhfasan2-mips-cross
diff --git a/debian/patches/gcc-5/enable-ada-cross.diff b/debian/patches/gcc-5/enable-ada-cross.diff
new file mode 100644
index 0000000..4be654e
--- /dev/null
+++ b/debian/patches/gcc-5/enable-ada-cross.diff
@@ -0,0 +1,33 @@
+Index: gcc/debian/patches/ada-gcc-name.diff
+===================================================================
+--- gcc.orig/debian/patches/ada-gcc-name.diff	2015-09-13 15:08:29.788151346 +0800
++++ gcc/debian/patches/ada-gcc-name.diff	2015-09-13 15:08:29.784151355 +0800
+@@ -1,28 +1,5 @@
+ # DP: use gcc-5 instead of gcc as the command name.
+ 
+-Index: b/src/gcc/ada/gnatlink.adb
+-===================================================================
+---- a/src/gcc/ada/gnatlink.adb
+-+++ b/src/gcc/ada/gnatlink.adb
+-@@ -136,7 +136,7 @@ procedure Gnatlink is
+-    --  This table collects the arguments to be passed to compile the binder
+-    --  generated file.
+- 
+--   Gcc : String_Access := Program_Name ("gcc", "gnatlink");
+-+   Gcc : String_Access := Program_Name ("gcc-5", "gnatlink");
+- 
+-    Read_Mode : constant String := "r" & ASCII.NUL;
+- 
+-@@ -1412,7 +1412,8 @@ procedure Gnatlink is
+-       end if;
+- 
+-       Write_Line ("  --GCC=comp Use comp as the compiler");
+--      Write_Line ("  --LINK=nam Use 'nam' for the linking rather than 'gcc'");
+-+      Write_Line ("  --LINK=nam Use 'nam' for the linking rather " &
+-+                  "than 'gcc-5'");
+-       Write_Eol;
+-       Write_Line ("  [non-Ada-objects]  list of non Ada object files");
+-       Write_Line ("  [linker-options]   other options for the linker");
+ Index: b/src/gcc/ada/make.adb
+ ===================================================================
+ --- a/src/gcc/ada/make.adb
diff --git a/debian/patches/gcc-5/series b/debian/patches/gcc-5/series
index a559d72..eb694b9 100644
--- a/debian/patches/gcc-5/series
+++ b/debian/patches/gcc-5/series
@@ -1,2 +1,3 @@
 # empty file
 stripped-exes.diff
+enable-ada-cross.diff
diff --git a/debian/rules b/debian/rules
index 39c53c4..ee4190d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -173,7 +173,7 @@ $(stamp)init-gcc:
 	ln -sf ${GCC_DIR}/gcc-${VER_GCC}.tar.xz gcc-${VER_GCC}.tar.xz ;\
 	cp -a  ${GCC_DIR}/debian/ . ; \
 	if [ -n "$$(grep -v '^\#' ${CURDIR}/debian/patches/gcc-${GCC_VER}/series)" ]; then \
-	  QUILT_PATCHES=${CURDIR}/debian/patches/gcc-${GCC_VER} quilt push -a ; \
+	  QUILT_PATCHES=${CURDIR}/debian/patches/gcc-${GCC_VER} quilt push --quiltrc /dev/null -a ; \
 	fi
 	touch $@
 
@@ -211,6 +211,8 @@ define repack_debs
 	      -e "/^Suggests:/s/$(DEB_VER_GCC)/$(DEB_VER_GCC)$(CROSS_EXT)/g" \
 	      -e "/^Version:/s/$(DEB_VER_GCC)/$(DEB_VER_GCC)$(CROSS_EXT)/" \
 	      tmp/DEBIAN/control ; \
+	    sed -i -e "/^Depends:/s/\(libgnat-[0-9]*\) (>= $(DEB_VER_GCC)$(CROSS_EXT))/\1 (>= $(DEB_VER_GCC))/g" \
+	      tmp/DEBIAN/control ; \
 	    case $$pkgname in \
 	      gcc-$(GCC_VER)-$(call _gnu_type,$1)) \
 	        sed -i -e '/Depends/s/\(libcc1[^,]*\)$(CROSS_EXT)/\1/' \

Reply to: