[gcc-7] 13/354: * Update conflicts with GCC 6 packages. Closes: #844296.
Ximin Luo
infinity0 at debian.org
Thu Nov 23 15:50:21 UTC 2017
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository gcc-7.
commit 3d17583dbafc952ac6b0b29f35a54741e260cb4a
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date: Mon Nov 14 18:14:17 2016 +0000
* Update conflicts with GCC 6 packages. Closes: #844296.
git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9053 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
debian/changelog | 1 +
debian/control | 14 +++++++-------
debian/control.m4 | 26 +++++++++++++-------------
3 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0eb6a0b..17e1ac1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ gcc-7 (7-20161112-2) UNRELEASED; urgency=medium
* More symbol files updates.
* Update gdc to the trunk 20161114.
+ * Update conflicts with GCC 6 packages. Closes: #844296.
-- Matthias Klose <doko at debian.org> Sun, 13 Nov 2016 13:04:49 +0100
diff --git a/debian/control b/debian/control
index 7f50337..98be65c 100644
--- a/debian/control
+++ b/debian/control
@@ -1300,7 +1300,7 @@ Section: doc
Architecture: all
Priority: extra
Depends: gcc-7-base (= ${gcc:Version}), ${misc:Depends}
-Conflicts: libgccjit-5-doc
+Conflicts: libgccjit-5-doc, libgccjit-6-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.
@@ -1908,7 +1908,7 @@ 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, libstdc++6-4.8-dbg,
- libstdc++6-4.9-dbg, libstdc++6-5-dbg
+ libstdc++6-4.9-dbg, libstdc++6-5-dbg, libstdc++6-6-dbg
Description: GNU Standard C++ Library v3 (debugging files)
This package contains the shared library of libstdc++ compiled with
debugging symbols.
@@ -1938,7 +1938,7 @@ Conflicts: lib32stdc++6-dbg, lib32stdc++6-4.0-dbg,
lib32stdc++6-4.1-dbg, lib32stdc++6-4.2-dbg, lib32stdc++6-4.3-dbg,
lib32stdc++6-4.4-dbg, lib32stdc++6-4.5-dbg, lib32stdc++6-4.6-dbg,
lib32stdc++6-4.7-dbg, lib32stdc++6-4.8-dbg, lib32stdc++6-4.9-dbg,
- lib32stdc++6-5-dbg
+ lib32stdc++6-5-dbg, lib32stdc++6-6-dbg
Description: GNU Standard C++ Library v3 (debugging files)
This package contains the shared library of libstdc++ compiled with
debugging symbols.
@@ -1968,7 +1968,7 @@ Conflicts: lib64stdc++6-dbg, lib64stdc++6-4.0-dbg,
lib64stdc++6-4.1-dbg, lib64stdc++6-4.2-dbg, lib64stdc++6-4.3-dbg,
lib64stdc++6-4.4-dbg, lib64stdc++6-4.5-dbg, lib64stdc++6-4.6-dbg,
lib64stdc++6-4.7-dbg, lib64stdc++6-4.8-dbg, lib64stdc++6-4.9-dbg,
- lib64stdc++6-5-dbg
+ lib64stdc++6-5-dbg, lib64stdc++6-6-dbg
Description: GNU Standard C++ Library v3 (debugging files)
This package contains the shared library of libstdc++ compiled with
debugging symbols.
@@ -1998,7 +1998,7 @@ Conflicts: libn32stdc++6-dbg, libn32stdc++6-4.0-dbg,
libn32stdc++6-4.1-dbg, libn32stdc++6-4.2-dbg, libn32stdc++6-4.3-dbg,
libn32stdc++6-4.4-dbg, libn32stdc++6-4.5-dbg, libn32stdc++6-4.6-dbg,
libn32stdc++6-4.7-dbg, libn32stdc++6-4.8-dbg, libn32stdc++6-4.9-dbg,
- libn32stdc++6-5-dbg
+ libn32stdc++6-5-dbg, libn32stdc++6-6-dbg
Description: GNU Standard C++ Library v3 (debugging files)
This package contains the shared library of libstdc++ compiled with
debugging symbols.
@@ -2026,7 +2026,7 @@ Depends: gcc-7-base (= ${gcc:Version}), libx32stdc++6 (>= ${gcc:Version}),
${shlibs:Depends}, ${misc:Depends}
Conflicts: libx32stdc++6-dbg, libx32stdc++6-4.6-dbg,
libx32stdc++6-4.7-dbg, libx32stdc++6-4.8-dbg, libx32stdc++6-4.9-dbg,
- libx32stdc++6-5-dbg
+ libx32stdc++6-5-dbg, libx32stdc++6-6-dbg
Description: GNU Standard C++ Library v3 (debugging files)
This package contains the shared library of libstdc++ compiled with
debugging symbols.
@@ -2039,7 +2039,7 @@ Depends: gcc-7-base (>= ${gcc:SoftVersion}), ${misc:Depends}
Conflicts: libstdc++5-doc, libstdc++5-3.3-doc, libstdc++6-doc,
libstdc++6-4.0-doc, libstdc++6-4.1-doc, libstdc++6-4.2-doc, libstdc++6-4.3-doc,
libstdc++6-4.4-doc, libstdc++6-4.5-doc, libstdc++6-4.6-doc, libstdc++6-4.7-doc,
- libstdc++-4.8-doc, libstdc++-4.9-doc, libstdc++-5-doc
+ libstdc++-4.8-doc, libstdc++-4.9-doc, libstdc++-5-doc, libstdc++-6-doc
Description: GNU Standard C++ Library v3 (documentation files)
This package contains documentation files for the GNU stdc++ library.
.
diff --git a/debian/control.m4 b/debian/control.m4
index e778230..b0c820a 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -3191,7 +3191,7 @@ Section: doc
Architecture: all
Priority: extra
Depends: BASEDEP, ${misc:Depends}
-Conflicts: libgccjit-5-doc
+Conflicts: libgccjit-5-doc, libgccjit-6-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.
@@ -4267,7 +4267,7 @@ 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, libstdc++6-4.8-dbg`'LS,
- libstdc++6-4.9-dbg`'LS, libstdc++6-5-dbg`'LS
+ libstdc++6-4.9-dbg`'LS, libstdc++6-5-dbg`'LS, libstdc++6-6-dbg`'LS
BUILT_USING`'dnl
Description: GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `')
This package contains the shared library of libstdc++ compiled with
@@ -4311,7 +4311,7 @@ Conflicts: lib32stdc++6-dbg`'LS, lib32stdc++6-4.0-dbg`'LS,
lib32stdc++6-4.1-dbg`'LS, lib32stdc++6-4.2-dbg`'LS, lib32stdc++6-4.3-dbg`'LS,
lib32stdc++6-4.4-dbg`'LS, lib32stdc++6-4.5-dbg`'LS, lib32stdc++6-4.6-dbg`'LS,
lib32stdc++6-4.7-dbg`'LS, lib32stdc++6-4.8-dbg`'LS, lib32stdc++6-4.9-dbg`'LS,
- lib32stdc++6-5-dbg`'LS
+ lib32stdc++6-5-dbg`'LS, lib32stdc++6-6-dbg`'LS
BUILT_USING`'dnl
Description: GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `')
This package contains the shared library of libstdc++ compiled with
@@ -4355,7 +4355,7 @@ Conflicts: lib64stdc++6-dbg`'LS, lib64stdc++6-4.0-dbg`'LS,
lib64stdc++6-4.1-dbg`'LS, lib64stdc++6-4.2-dbg`'LS, lib64stdc++6-4.3-dbg`'LS,
lib64stdc++6-4.4-dbg`'LS, lib64stdc++6-4.5-dbg`'LS, lib64stdc++6-4.6-dbg`'LS,
lib64stdc++6-4.7-dbg`'LS, lib64stdc++6-4.8-dbg`'LS, lib64stdc++6-4.9-dbg`'LS,
- lib64stdc++6-5-dbg`'LS
+ lib64stdc++6-5-dbg`'LS, lib64stdc++6-6-dbg`'LS
BUILT_USING`'dnl
Description: GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `')
This package contains the shared library of libstdc++ compiled with
@@ -4399,7 +4399,7 @@ Conflicts: libn32stdc++6-dbg`'LS, libn32stdc++6-4.0-dbg`'LS,
libn32stdc++6-4.1-dbg`'LS, libn32stdc++6-4.2-dbg`'LS, libn32stdc++6-4.3-dbg`'LS,
libn32stdc++6-4.4-dbg`'LS, libn32stdc++6-4.5-dbg`'LS, libn32stdc++6-4.6-dbg`'LS,
libn32stdc++6-4.7-dbg`'LS, libn32stdc++6-4.8-dbg`'LS, libn32stdc++6-4.9-dbg`'LS,
- libn32stdc++6-5-dbg`'LS
+ libn32stdc++6-5-dbg`'LS, libn32stdc++6-6-dbg`'LS
BUILT_USING`'dnl
Description: GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `')
This package contains the shared library of libstdc++ compiled with
@@ -4444,7 +4444,7 @@ ifdef(`TARGET',`Provides: libx32stdc++CXX_SO-dbg-TARGET-dcv1
',`')`'dnl
Conflicts: libx32stdc++6-dbg`'LS, libx32stdc++6-4.6-dbg`'LS,
libx32stdc++6-4.7-dbg`'LS, libx32stdc++6-4.8-dbg`'LS, libx32stdc++6-4.9-dbg`'LS,
- libx32stdc++6-5-dbg`'LS
+ libx32stdc++6-5-dbg`'LS, libx32stdc++6-6-dbg`'LS
BUILT_USING`'dnl
Description: GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `')
This package contains the shared library of libstdc++ compiled with
@@ -4486,7 +4486,7 @@ Depends: BASELDEP, libdep(stdc++CXX_SO,hf),
${shlibs:Depends}, ${misc:Depends}
ifdef(`TARGET',`Provides: libhfstdc++CXX_SO-dbg-TARGET-dcv1
',`')`'dnl
-ifdef(`TARGET',`dnl',`Conflicts: libhfstdc++6-dbg`'LS, libhfstdc++6-4.3-dbg`'LS, libhfstdc++6-4.4-dbg`'LS, libhfstdc++6-4.5-dbg`'LS, libhfstdc++6-4.6-dbg`'LS, libhfstdc++6-4.7-dbg`'LS, libhfstdc++6-4.8-dbg`'LS, libhfstdc++6-4.9-dbg`'LS, libhfstdc++6-5-dbg`'LS, libstdc++'CXX_SO`-armhf [biarchhf_archs]')
+ifdef(`TARGET',`dnl',`Conflicts: libhfstdc++6-dbg`'LS, libhfstdc++6-4.3-dbg`'LS, libhfstdc++6-4.4-dbg`'LS, libhfstdc++6-4.5-dbg`'LS, libhfstdc++6-4.6-dbg`'LS, libhfstdc++6-4.7-dbg`'LS, libhfstdc++6-4.8-dbg`'LS, libhfstdc++6-4.9-dbg`'LS, libhfstdc++6-5-dbg`'LS, libhfstdc++6-6-dbg`'LS, libstdc++'CXX_SO`-armhf [biarchhf_archs]')
BUILT_USING`'dnl
Description: GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `')
This package contains the shared library of libstdc++ compiled with
@@ -4528,7 +4528,7 @@ Depends: BASELDEP, libdep(stdc++CXX_SO,sf),
${shlibs:Depends}, ${misc:Depends}
ifdef(`TARGET',`Provides: libsfstdc++CXX_SO-dbg-TARGET-dcv1
',`')`'dnl
-ifdef(`TARGET',`dnl',`Conflicts: libsfstdc++6-dbg`'LS, libsfstdc++6-4.3-dbg`'LS, libsfstdc++6-4.4-dbg`'LS, libsfstdc++6-4.5-dbg`'LS, libsfstdc++6-4.6-dbg`'LS, libsfstdc++6-4.7-dbg`'LS, libsfstdc++6-4.8-dbg`'LS, libsfstdc++6-4.9-dbg`'LS, libsfstdc++6-5-dbg`'LS, libstdc++'CXX_SO`-armel [biarchsf_archs]')
+ifdef(`TARGET',`dnl',`Conflicts: libsfstdc++6-dbg`'LS, libsfstdc++6-4.3-dbg`'LS, libsfstdc++6-4.4-dbg`'LS, libsfstdc++6-4.5-dbg`'LS, libsfstdc++6-4.6-dbg`'LS, libsfstdc++6-4.7-dbg`'LS, libsfstdc++6-4.8-dbg`'LS, libsfstdc++6-4.9-dbg`'LS, libsfstdc++6-5-dbg`'LS, libhfstdc++6-6-dbg`'LS, libstdc++'CXX_SO`-armel [biarchsf_archs]')
BUILT_USING`'dnl
Description: GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `')
This package contains the shared library of libstdc++ compiled with
@@ -4549,7 +4549,7 @@ Depends: gcc`'PV-base (>= ${gcc:SoftVersion}), ${misc:Depends}
Conflicts: libstdc++5-doc, libstdc++5-3.3-doc, libstdc++6-doc,
libstdc++6-4.0-doc, libstdc++6-4.1-doc, libstdc++6-4.2-doc, libstdc++6-4.3-doc,
libstdc++6-4.4-doc, libstdc++6-4.5-doc, libstdc++6-4.6-doc, libstdc++6-4.7-doc,
- libstdc++-4.8-doc, libstdc++-4.9-doc, libstdc++-5-doc
+ libstdc++-4.8-doc, libstdc++-4.9-doc, libstdc++-5-doc, libstdc++-6-doc
Description: GNU Standard C++ Library v3 (documentation files)
This package contains documentation files for the GNU stdc++ library.
.
@@ -4581,7 +4581,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`'TS
+ gnat-4.9, gnat-5`'TS, gnat-6`'TS
# These other packages will continue to provide /usr/bin/gnatmake and
# other files.
BUILT_USING`'dnl
@@ -4659,7 +4659,7 @@ ifdef(`TARGET',`Recommends: gnat`'PV`'TS (>= ${gnat:SoftVersion})
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`'LS,
+ libgnatvsn5-dev`'LS, libgnatvsn6-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
@@ -4723,7 +4723,7 @@ ifdef(`TARGET',`Recommends: gnat`'PV`'TS (>= ${gnat:SoftVersion})
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`'LS,
+ libgnatprj5-dev`'LS, libgnatprj6-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
@@ -4813,7 +4813,7 @@ Suggests: gnat`'PV
Conflicts: gnat-4.1-doc, gnat-4.2-doc,
gnat-4.3-doc, gnat-4.4-doc,
gnat-4.6-doc, gnat-4.9-doc,
- gnat-5-doc,
+ gnat-5-doc, gnat-6-doc,
BUILT_USING`'dnl
Description: GNU Ada compiler (documentation)
GNAT is a compiler for the Ada programming language. It produces optimized
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git
More information about the Reproducible-commits
mailing list