[protozero] 05/06: Use versioned Breaks instead of Conflicts for libosmium2-dev.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository protozero.

commit a3ee9d63d3ad1686f3ed25916c5705f718f05669
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Aug 22 22:16:55 2015 +0200

    Use versioned Breaks instead of Conflicts for libosmium2-dev.
---
 debian/changelog | 1 +
 debian/control   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index de0279b..9e654b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ protozero (1.1.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Install CHANGELOG.md as upstream changelog.
+  * Use versioned Breaks instead of Conflicts for libosmium2-dev.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 22 Aug 2015 22:07:02 +0200
 
diff --git a/debian/control b/debian/control
index 6527dd0..34e3119 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Package: libprotozero-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends}
-Conficts: libosmium2-dev
+Breaks: libosmium2-dev (>= 2.3.0-1~)
 Suggests: protozero-doc
 Description: Minimalistic protocol buffer decoder and encoder in C++
  protozero is a minimalistic protocol buffer decoder and encoder in C++.

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