[Python-modules-commits] [simplejson] 08/11: Changed Conflicts to Replaces+Breaks

[Ondřej Nový]

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

onovy-guest pushed a commit to branch master
in repository simplejson.

commit a57965844196772e3478bf61d70117724825f987
Author: Ondřej Nový <novy at ondrej.org>
Date:   Thu Apr 14 22:27:12 2016 +0200

    Changed Conflicts to Replaces+Breaks
---
 debian/changelog | 1 +
 debian/control   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0caa12d..8fbc601 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ simplejson (3.8.2-1) UNRELEASED; urgency=medium
   * Standards-Version is 3.9.8 now (no change)
   * Added doc-base
   * Cleanup of package descriptions
+  * Changed Conflicts to Replaces+Breaks
 
  -- Ondřej Nový <novy at ondrej.org>  Tue, 29 Mar 2016 22:31:44 +0200
 
diff --git a/debian/control b/debian/control
index d35db07..61c2e4a 100644
--- a/debian/control
+++ b/debian/control
@@ -107,7 +107,8 @@ Architecture: all
 Priority: extra
 Depends: ${misc:Depends}, ${sphinxdoc:Depends}
 Recommends: python-simplejson
-Conflicts: python-simplejson (<= 3)
+Replaces: python-simplejson (<= 3)
+Breaks: python-simplejson (<= 3)
 Description: simple, fast, extensible JSON encoder/decoder for Python - documentation
  simplejson is a simple, fast, complete, correct and extensible JSON
  <http://json.org> encoder and decoder.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/simplejson.git