[Pkg-ocaml-maint-commits] [ocaml-estring] 01/02: Add missing Conflicts/Replaces and upload to Sid

[Mehdi Dogguy]

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

mehdi pushed a commit to branch master
in repository ocaml-estring.

commit 496939b9ca165abd35972317c15f19977a77f982
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Fri May 9 00:40:16 2014 +0200

    Add missing Conflicts/Replaces and upload to Sid
---
 debian/changelog | 8 ++++++++
 debian/control   | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5481269..e02e407 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ocaml-estring (20130822-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * libestring-ocaml now Conflicts/Replaces libbatteries-ocaml-dev (< 2.0)
+    (Closes: #722559).
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Fri, 09 May 2014 00:39:14 +0200
+
 ocaml-estring (20130822-2) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 289bada..2bca1be 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,10 @@ Depends:
  ${shlibs:Depends}
 Provides:
  ${ocaml:Provides}
+Conflicts:
+ libbatteries-ocaml-dev (<< 2.0)
+Replaces:
+ libbatteries-ocaml-dev (<< 2.0)
 Description: Estring: OCaml development platform (runtime)
  estring, which stands for `extended strings' is a syntax extension
  allowing to prefix string literals with a specifier to change their

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml-estring.git