[gcc-6] 22/401: * Update libstdc++-dbg conflicts. Closes: #807885.

[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 fa44d37ee3ad72927c457e1e0a7d4e972b4693c9
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Mon Dec 14 12:59:33 2015 +0000

      * Update libstdc++-dbg conflicts. Closes: #807885.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8524 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog  | 6 ++++++
 debian/control    | 2 +-
 debian/control.m4 | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3055649..b1382f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gcc-6 (6-20151213-2) UNRELEASED; urgency=medium
+
+  * Update libstdc++-dbg conflicts. Closes: #807885.
+
+ -- Matthias Klose <doko at debian.org>  Mon, 14 Dec 2015 13:55:03 +0100
+
 gcc-6 (6-20151213-1) experimental; urgency=medium
 
   * GCC 6 snapshot build, taken from the trunk 20151213.
diff --git a/debian/control b/debian/control
index ce85284..97c8a7c 100644
--- a/debian/control
+++ b/debian/control
@@ -2049,7 +2049,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-4.9-dbg, libstdc++6-5-dbg
 Description: GNU Standard C++ Library v3 (debugging files)
  This package contains the shared library of libstdc++ compiled with
  debugging symbols.
diff --git a/debian/control.m4 b/debian/control.m4
index bd88149..14c0eaf 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -4508,7 +4508,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-4.9-dbg`'LS, libstdc++6-5-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

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