[Crosstoolchain-logs] [gdb] 02/03: d/control.in, d/control: Make gdb and gdb-minimal conflict as policy says

[Samuel Bronson]

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

naesten-guest pushed a commit to branch master
in repository gdb.

commit 1fa1f84c1045aba5360dfe4f7fca6c353911a4e9
Author: Samuel Bronson <naesten at gmail.com>
Date:   Wed May 14 15:53:51 2014 -0400

    d/control.in, d/control: Make gdb and gdb-minimal conflict as policy says
    
    See section: 7.4. Conflicting binary packages - `Conflicts'
---
 debian/control    | 4 +++-
 debian/control.in | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index e72c487..cd7faa5 100644
--- a/debian/control
+++ b/debian/control
@@ -47,6 +47,8 @@ Depends: ${misc:Depends},
 Recommends: libc-dbg,
             gdbserver [amd64 armel armhf arm64 i386 ia64 m32r m68k mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x x32]
 Suggests: gdb-doc
+Conflicts: gdb
+Replaces: gdb
 Description: GNU Debugger
  GDB is a source-level debugger, capable of breaking programs at
  any specific line, displaying variable values, and determining
@@ -58,7 +60,7 @@ Package: gdb-minimal
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Provides: gdb
-Breaks: gdb
+Conflicts: gdb
 Replaces: gdb
 Description: GNU Debugger (minimal version)
  GDB is a source-level debugger, capable of breaking programs at
diff --git a/debian/control.in b/debian/control.in
index 16a7f17..ae37763 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -47,6 +47,8 @@ Depends: ${misc:Depends},
 Recommends: libc-dbg,
             gdbserver [amd64 armel armhf arm64 i386 ia64 m32r m68k mips mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x x32]
 Suggests: gdb-doc
+Conflicts: gdb
+Replaces: gdb
 Description: GNU Debugger
  GDB is a source-level debugger, capable of breaking programs at
  any specific line, displaying variable values, and determining
@@ -58,7 +60,7 @@ Package: gdb-minimal
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Provides: gdb
-Breaks: gdb
+Conflicts: gdb
 Replaces: gdb
 Description: GNU Debugger (minimal version)
  GDB is a source-level debugger, capable of breaking programs at

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gdb/gdb.git