[Pkg-ocaml-maint-commits] [tuareg-mode] 03/06: drop conflict with ocaml-tools in a very old version

[Ralf Treinen]

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

treinen pushed a commit to branch master
in repository tuareg-mode.

commit 2863baf28e72e831c3631f368a7a11fb6ae998cd
Author: Ralf Treinen <treinen at free.fr>
Date:   Mon Jul 7 08:44:38 2014 +0200

    drop conflict with ocaml-tools in a very old version
---
 debian/changelog | 4 +++-
 debian/control   | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 14d0fd4..8f9b9e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ tuareg-mode (1:2.0.6-4) UNRELEASED; urgency=low
   [ Ralf Treinen ]
   * change dependency on emacs23 to emacs (closes: #754032)
   * Standards-Version 3.9.5 (no change)
+  * Drop conflict with ocaml-tools (<=1.1-2) which is no longer distributed
+    since october 2001.
 
- -- Ralf Treinen <treinen at debian.org>  Mon, 07 Jul 2014 08:08:50 +0200
+ -- Ralf Treinen <treinen at debian.org>  Mon, 07 Jul 2014 08:43:09 +0200
 
 tuareg-mode (1:2.0.6-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index e8375e8..5028b71 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,6 @@ Architecture: all
 Depends: emacs | emacsen, ${misc:Depends}
 Recommends: ocaml-interp, ocaml-mode
 Enhances: ocaml-interp
-Conflicts: ocaml-tools (<= 1.1-2)
 Description: emacs-mode for ocaml programs
  It handles automatic indentation of Objective Caml and Caml-Light
  code.  Key parts of the code are highlighted using Font-Lock. It

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