This is an automated email from the git hooks/post-receive script.
treinen pushed a commit to branch master
in repository cmigrep.
commit 63cb72e071aee25b7b9544811d8949e357139db6
Author: Ralf Treinen <trei...@free.fr>
Date: Fri Dec 9 20:43:47 2016 +0100
Conflicts ocamltools => Breals
---
debian/changelog | 3 ++-
debian/control | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c645163..5de95c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,8 +14,9 @@ cmigrep (1.5-14) UNRELEASED; urgency=medium
* Standards-Version 3.9.8 (no change)
* debian/copyright: converted to machine-readable format 1.0
* cmigrep.1: correct spelling
+ * Change Conflicts ocaml-tools to Breaks
- -- Ralf Treinen <trei...@debian.org> Fri, 09 Dec 2016 20:39:08 +0100
+ -- Ralf Treinen <trei...@debian.org> Fri, 09 Dec 2016 20:43:01 +0100
cmigrep (1.5-13) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index a8083b8..c65f0ad 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Package: cmigrep
Architecture: all
Depends: ${misc:Depends},
ocaml-base-nox-${F:OCamlABI}, libpcre-ocaml (>= 6.2.2-1)
-Conflicts: ocaml-tools (<= 2007.02.04-2)
+Breaks: ocaml-tools (<= 2007.02.04-2)
Replaces: ocaml-tools
Description: search in OCaml compiled interface files
This program allows you to search for items (like for instance types,
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/cmigrep.git
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
