[gcc-6] 43/401: * Update libgnatvsn/libgnatprj conflicts. Closes: #810809.

[Ximin Luo]

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 0db9300e91fce51a850634f252f62e420ed2345f
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Tue Jan 12 16:45:19 2016 +0000

      * Update libgnatvsn/libgnatprj conflicts. Closes: #810809.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8579 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog  |  6 ++++++
 debian/control    | 10 ++++++++--
 debian/control.m4 | 13 ++++++++++---
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f743501..2eed500 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gcc-6 (6-20160109-2) UNRELEASED; urgency=medium
+
+  * Update libgnatvsn/libgnatprj conflicts. Closes: #810809.
+
+ -- Matthias Klose <doko at debian.org>  Tue, 12 Jan 2016 17:44:54 +0100
+
 gcc-6 (6-20160109-1) experimental; urgency=medium
 
   * GCC 6 snapshot build, taken from the trunk 20160109.
diff --git a/debian/control b/debian/control
index 8530686..34731c6 100644
--- a/debian/control
+++ b/debian/control
@@ -2263,7 +2263,10 @@ Architecture: any
 Priority: extra
 Depends: gcc-6-base (= ${gcc:Version}), gnat-6 (= ${gnat:Version}),
  libgnatvsn6 (= ${gnat:Version}), ${misc:Depends}
-Conflicts: libgnatvsn-dev (<< 6), libgnatvsn4.1-dev, libgnatvsn4.3-dev, libgnatvsn4.4-dev, libgnatvsn4.5-dev, libgnatvsn4.6-dev
+Conflicts: libgnatvsn-dev (<< 6),
+ libgnatvsn4.1-dev, libgnatvsn4.3-dev, libgnatvsn4.4-dev,
+ libgnatvsn4.5-dev, libgnatvsn4.6-dev, libgnatvsn4.9-dev,
+ libgnatvsn5-dev,
 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).
@@ -2317,7 +2320,10 @@ Priority: extra
 Depends: gcc-6-base (= ${gcc:Version}), gnat-6 (= ${gnat:Version}),
  libgnatprj6 (= ${gnat:Version}),
  libgnatvsn6-dev (= ${gnat:Version}), ${misc:Depends}
-Conflicts: libgnatprj-dev (<< 6), libgnatprj4.1-dev, libgnatprj4.3-dev, libgnatprj4.4-dev, libgnatprj4.5-dev, libgnatprj4.6-dev
+Conflicts: libgnatprj-dev (<< 6),
+ libgnatprj4.1-dev, libgnatprj4.3-dev, libgnatprj4.4-dev,
+ libgnatprj4.5-dev, libgnatprj4.6-dev, libgnatprj4.9-dev,
+ libgnatprj5-dev,
 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).
diff --git a/debian/control.m4 b/debian/control.m4
index 277c586..751f975 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -4888,7 +4888,10 @@ Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
 Priority: extra
 Depends: BASELDEP, gnat`'PV`'TS (ifdef(`TARGET',`>= ${gnat:SoftVersion}',`= ${gnat:Version}')),
  libgnatvsn`'GNAT_V`'LS (= ${gnat:Version}), ${misc:Depends}
-Conflicts: libgnatvsn-dev (<< `'GNAT_V), libgnatvsn4.1-dev, libgnatvsn4.3-dev, libgnatvsn4.4-dev, libgnatvsn4.5-dev, libgnatvsn4.6-dev
+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,
 BUILT_USING`'dnl
 Description: GNU Ada compiler selected components (development files)
  GNAT is a compiler for the Ada programming language. It produces optimized
@@ -4947,7 +4950,10 @@ Priority: extra
 Depends: BASELDEP, gnat`'PV`'TS (ifdef(`TARGET',`>= ${gnat:SoftVersion}',`= ${gnat:Version}')),
  libgnatprj`'GNAT_V`'LS (= ${gnat:Version}),
  libgnatvsn`'GNAT_V-dev`'LS (= ${gnat:Version}), ${misc:Depends}
-Conflicts: libgnatprj-dev (<< `'GNAT_V), libgnatprj4.1-dev, libgnatprj4.3-dev, libgnatprj4.4-dev, libgnatprj4.5-dev, libgnatprj4.6-dev
+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,
 BUILT_USING`'dnl
 Description: GNU Ada compiler Project Manager (development files)
  GNAT is a compiler for the Ada programming language. It produces optimized
@@ -5036,7 +5042,8 @@ Depends: dpkg (>= 1.15.4) | install-info, ${misc:Depends}
 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-4.6-doc, gnat-4.9-doc,
+  gnat-5-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-6.git