[gcc-6] 82/401: * libgccjit-6-doc: Really conflict with libgccjit-5-doc. Closes: #814527. * Update conflict for gnat cross build packages. Closes: #810809. * Disable the m68k gnat build, currently fails. See: #814221.

Wed Apr 5 15:48:05 UTC 2017

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.

commit 3c948d0e73f7cf21174310e2786c4710714449c6
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Sat Feb 13 09:47:33 2016 +0000

      * libgccjit-6-doc: Really conflict with libgccjit-5-doc. Closes: #814527.
      * Update conflict for gnat cross build packages. Closes: #810809.
      * Disable the m68k gnat build, currently fails. See: #814221.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8666 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog  | 7 +++++--
 debian/control    | 4 ++--
 debian/control.m4 | 8 ++++----
 debian/rules.defs | 1 +
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6e00282..528c480 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
-gcc-6 (6-20160211-1) UNRELEASED; urgency=medium
+gcc-6 (6-20160212-1) UNRELEASED; urgency=medium
 
-  * GCC 6 snapshot build, taken from the trunk 20160211.
+  * GCC 6 snapshot build, taken from the trunk 20160212.
   * Update symbols files.
+  * libgccjit-6-doc: Really conflict with libgccjit-5-doc. Closes: #814527.
+  * Update conflict for gnat cross build packages. Closes: #810809.
+  * Disable the m68k gnat build, currently fails. See: #814221.
 
  -- Matthias Klose <doko at debian.org>  Thu, 11 Feb 2016 22:36:28 +0100
 
diff --git a/debian/control b/debian/control
index d823f33..3adfc68 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 5.0.62), dpkg-dev (>= 1.17.11),
   gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, 
   gdb:native, 
   texinfo (>= 4.3), locales, sharutils, 
-  procps, zlib1g-dev, libantlr-java, python:native, libffi-dev, fastjar, libmagic-dev, libecj-java (>= 3.3.0-2), zip, libasound2-dev [ !hurd-any !kfreebsd-any], libxtst-dev, libxt-dev, libgtk2.0-dev (>= 2.4.4-2), libart-2.0-dev, libcairo2-dev, gnat-5:native [!m32r !sh3 !sh3eb !sh4eb !powerpcspe !mips64 !x32], g++-5:native, netbase, 
+  procps, zlib1g-dev, libantlr-java, python:native, libffi-dev, fastjar, libmagic-dev, libecj-java (>= 3.3.0-2), zip, libasound2-dev [ !hurd-any !kfreebsd-any], libxtst-dev, libxt-dev, libgtk2.0-dev (>= 2.4.4-2), libart-2.0-dev, libcairo2-dev, gnat-5:native [!m32r !sh3 !sh3eb !sh4eb !powerpcspe !m68k !mips64 !x32], g++-5:native, netbase, 
   libisl-dev (>= 0.14), libmpc-dev (>= 1.0), libmpfr-dev (>= 3.0.0-9~), libgmp-dev (>= 2:5.0.1~), 
   dejagnu [!m68k], realpath (>= 1.9.12), chrpath, lsb-release, quilt, 
    g++-6-alpha-linux-gnu [alpha] <cross>, gobjc-6-alpha-linux-gnu [alpha] <cross>, gfortran-6-alpha-linux-gnu [alpha] <cross>, gcj-6-alpha-linux-gnu [alpha] <cross>, gdc-6-alpha-linux-gnu [alpha] <cross>, gccgo-6-alpha-linux-gnu [alpha] <cross>, gnat-6-alpha-linux-gnu [alpha] <cross>, g++-6-x86-64-linux-gnu [amd64] <cross>, gobjc-6-x86-64-linux-gnu [amd64] <cross>, gfortran-6-x86-64-linux-gnu [amd64] <cross>, gcj-6-x86-64-linux-gnu [amd64] <cross>, gdc-6-x86-64-linux-gnu [amd64] <cross>, [...]
@@ -1311,7 +1311,7 @@ Section: doc
 Architecture: all
 Priority: extra
 Depends: gcc-6-base (= ${gcc:Version}), ${misc:Depends}
-Conflicts: libgccjit-6-doc
+Conflicts: libgccjit-5-doc
 Description: GCC just-in-time compilation (documentation)
  libgccjit provides an embeddable shared library with an API for adding
  compilation to existing programs using GCC.
diff --git a/debian/control.m4 b/debian/control.m4
index fa1baf2..f18069a 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -3230,7 +3230,7 @@ Section: doc
 Architecture: all
 Priority: extra
 Depends: BASEDEP, ${misc:Depends}
-Conflicts: libgccjit-6-doc
+Conflicts: libgccjit-5-doc
 Description: GCC just-in-time compilation (documentation)
  libgccjit provides an embeddable shared library with an API for adding
  compilation to existing programs using GCC.
@@ -4825,7 +4825,7 @@ Replaces: gnat (<< 4.6.1), dh-ada-library (<< 6.0), gnat-4.6-base (= 4.6.4-2),
 # Newer versions of gnat and dh-ada-library will not provide these files.
 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, gnat-4.7, gnat-4.8,
- gnat-4.9, gnat-5
+ gnat-4.9, gnat-5`'TS
 # These other packages will continue to provide /usr/bin/gnatmake and
 # other files.
 BUILT_USING`'dnl
@@ -4899,7 +4899,7 @@ Depends: BASELDEP, gnat`'PV`'TS (ifdef(`TARGET',`>= ${gnat:SoftVersion}',`= ${gn
 Conflicts: libgnatvsn-dev (<< `'GNAT_V),
  libgnatvsn4.1-dev, libgnatvsn4.3-dev, libgnatvsn4.4-dev,
  libgnatvsn4.5-dev, libgnatvsn4.6-dev, libgnatvsn4.9-dev,
- libgnatvsn5-dev,
+ libgnatvsn5-dev`'LS,
 BUILT_USING`'dnl
 Description: GNU Ada compiler selected components (development files)
  GNAT is a compiler for the Ada programming language. It produces optimized
@@ -4961,7 +4961,7 @@ Depends: BASELDEP, gnat`'PV`'TS (ifdef(`TARGET',`>= ${gnat:SoftVersion}',`= ${gn
 Conflicts: libgnatprj-dev (<< `'GNAT_V),
  libgnatprj4.1-dev, libgnatprj4.3-dev, libgnatprj4.4-dev,
  libgnatprj4.5-dev, libgnatprj4.6-dev, libgnatprj4.9-dev,
- libgnatprj5-dev,
+ libgnatprj5-dev`'LS,
 BUILT_USING`'dnl
 Description: GNU Ada compiler Project Manager (development files)
  GNAT is a compiler for the Ada programming language. It produces optimized
diff --git a/debian/rules.defs b/debian/rules.defs
index b66d258..73436d0 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -575,6 +575,7 @@ ifeq (,$(filter $(DEB_STAGE),stage1 stage2))
 ada_no_cpus	:= m32r sh3 sh3eb sh4eb
 # no Debian builds ... some of these should exist
 ada_no_cpus += powerpcspe
+ada_no_cpus += m68k # see https://bugs.debian.org/814221
 ada_no_cpus += mips64 # see https://gcc.gnu.org/PR65337
 ada_no_cpus += x32 # see https://gcc.gnu.org/PR61954
 ada_no_systems	:= 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-6.git

