From: Mike Furr <mfurr@debian.org>
Date: Mon, 5 Jul 2004 18:54:52 +0000 (+0000)
Subject: Fixed the dependency mess.
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~804
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7c2c9fc35e8db0428920222966b8b2571dd5ec24;p=ocaml.git

Fixed the dependency mess.
---

diff --git a/debian/changelog b/debian/changelog
index b050dbed..7422bfdf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ocaml (3.07.2a-4) unstable; urgency=low
+
+  * *-nox and -interp now conflict with the package which previously
+    distributed their files as suggested in policy 7.5.1
+  * Fixed the Conflicts entries to use the proper version of ocaml:
+    3.07.2a instead of 3.07.
+
+ -- Mike Furr <mfurr@debian.org>  Mon,  5 Jul 2004 14:13:55 -0400
+
 ocaml (3.07.2a-3) unstable; urgency=low
 
   * Split out the ocaml interpreter and all required files into ocaml-interp
diff --git a/debian/control b/debian/control
index 8d676b39..b7c14ca1 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,8 @@ Depends: libncurses5-dev, ocaml-base-nox (=${Source-Version}), ocaml-base-nox-3.
 Suggests: ocaml-doc, libgdbm-dev, emacsen
 Recommends: ledit, file
 Provides: ocaml-nox-3.07 ${F:BestProvides}
-Replaces: camlp4
-Conflicts: camlp4, camlidl (<< 1.04), ocaml (<< 3.07-3)
+Replaces: camlp4, ocaml (<< 3.07.2a-3)
+Conflicts: camlp4, camlidl (<< 1.04), ocaml (<< 3.07.2a-3)
 Description: ML language implementation with a class-based object system
  Objective Caml is an implementation of the ML language, based on
  the Caml Light dialect extended with a complete class-based object system
@@ -68,7 +68,8 @@ Package: ocaml-base-nox
 Architecture: any
 Provides: ocaml-base-nox-3.07
 Depends: ${shlibs:Depends}
-Conflicts: ocaml (<< 3.04-2), ocaml-base (<< 3.07-3)
+Replaces: ocaml-base (<< 3.07.2a-3)
+Conflicts: ocaml (<< 3.04-2), ocaml-base (<< 3.07.2a-3)
 Description: Runtime system for ocaml bytecode executables
  Objective Caml is an implementation of the ML language, based on
  the Caml Light dialect extended with a complete class-based object system
@@ -123,7 +124,8 @@ Package: ocaml-interp
 Architecture: any
 Provides: ocaml-interp-3.07
 Depends: ocaml-base-nox-3.07
-Conflicts: ocaml-base (<< 3.07-3)
+Replaces: ocaml (<< 3.07.2a-3)
+Conflicts: ocaml (<< 3.07.2a-3)
 Description: Ocaml interpreter and standard libraries
  Objective Caml is an implementation of the ML language, based on
  the Caml Light dialect extended with a complete class-based object system
@@ -143,4 +145,4 @@ Description: Ocaml interpreter and standard libraries
  .
  This package contains several modules used internally by the ocaml
  compilers.  They are not needed for normal ocaml development, but may
- be helpful in the development of certain applications.
\ No newline at end of file
+ be helpful in the development of certain applications.