Rework versioned dependencies

 * remove old versioned dependencies
 * this version removes ocamldumpapprox, therefore breaks old dh-ocaml
 * refresh control.in

diff --git a/debian/control b/debian/control
index 5fb55ed2847afcdec3701fa4b0f12874e900f876..2b490aa251f497d87af9c865852ebd40d5d91e70 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -45,17 +45,11 @@ Suggests:
 Recommends:
  camlp4,
  file
-Replaces:
+Replaces: ocaml-interp (<< 3.11.1-3)
+Breaks:
  ocaml-interp (<< 3.11.1-3),
  camlp4 (<< 3.10.0),
- focaml (<< 3.07.2a-3),
- libnums-ocaml-dev
-Conflicts:
- ocaml-interp (<< 3.11.1-3),
- camlp4 (<< 3.10.0),
- camlidl (<< 1.04),
- ocaml (<< 3.07.2a-3),
- libnums-ocaml-dev
+ camlidl (<< 1.04)
 Description: ML implementation with a class-based object system (no X)
  Objective Caml (OCaml) is an implementation of the ML language, based on
  the Caml Light dialect extended with a complete class-based object system
@@ -169,15 +163,8 @@ Depends:
  ${ocaml:Depends}
 Provides:
  ${ocaml:Provides}
-Replaces:
- ocaml-interp (<< 3.11.1-3),
- ocaml-base (<< 3.07.2a-3),
- libnums-ocaml
-Conflicts:
- ocaml-interp (<< 3.11.1-3),
- ocaml (<< 3.04-2),
- ocaml-base (<< 3.07.2a-3),
- libnums-ocaml
+Replaces: ocaml-interp (<< 3.11.1-3)
+Breaks: ocaml-interp (<< 3.11.1-3)
 Description: Runtime system for OCaml bytecode executables (no X)
  Objective Caml (OCaml) is an implementation of the ML language, based on
  the Caml Light dialect extended with a complete class-based object system
@@ -247,8 +234,6 @@ Depends:
 Provides:
  ocaml-interp-${F:OCamlABI}
 Recommends: ledit | readline-editor
-Replaces: ocaml (<< 3.07.2a-3)
-Conflicts: ocaml (<< 3.07.2a-3)
 Description: OCaml interactive interpreter and standard libraries
  Objective Caml (OCaml) is an implementation of the ML language, based on
  the Caml Light dialect extended with a complete class-based object system
@@ -282,7 +267,6 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends}
 Suggests: ocaml
-Conflicts: ocaml-nox (<< 3.08.3-8)
 Description: A major mode for editing Objective Caml in Emacs
  Objective (OCaml) is an implementation of the ML language, based on
  the Caml Light dialect extended with a complete class-based object system

diff --git a/debian/control.in b/debian/control.in
index 34c05eb0930db6ebd332f642bf6f5a04bb5c7fdf..54d0ad0105dcf811e50c30ebee961c1fd2ad7191 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -10,15 +10,15 @@ Uploaders:
  Stéphane Glondu <glondu@debian.org>,
  Mehdi Dogguy <mehdi@debian.org>
 Build-Depends:
- debhelper (>= 7),
+ debhelper (>= 7.1.0~),
  autotools-dev,
+ binutils-dev,
  tcl8.5-dev,
  tk8.5-dev,
  libncurses5-dev,
  libgdbm-dev,
- quilt,
  bzip2,
- dh-ocaml (>= 0.9)
+ dh-ocaml (>= 1.0.0~)
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml.git
@@ -45,17 +45,11 @@ Suggests:
 Recommends:
  camlp4,
  file
-Replaces:
+Replaces: ocaml-interp (<< 3.11.1-3)
+Breaks:
  ocaml-interp (<< 3.11.1-3),
  camlp4 (<< 3.10.0),
- focaml (<< 3.07.2a-3),
- libnums-ocaml-dev
-Conflicts:
- ocaml-interp (<< 3.11.1-3),
- camlp4 (<< 3.10.0),
- camlidl (<< 1.04),
- ocaml (<< 3.07.2a-3),
- libnums-ocaml-dev
+ camlidl (<< 1.04)
 Description: ML implementation with a class-based object system (no X)
  Objective Caml (OCaml) is an implementation of the ML language, based on
  the Caml Light dialect extended with a complete class-based object system
@@ -169,15 +163,8 @@ Depends:
  ${ocaml:Depends}
 Provides:
  ${ocaml:Provides}
-Replaces:
- ocaml-interp (<< 3.11.1-3),
- ocaml-base (<< 3.07.2a-3),
- libnums-ocaml
-Conflicts:
- ocaml-interp (<< 3.11.1-3),
- ocaml (<< 3.04-2),
- ocaml-base (<< 3.07.2a-3),
- libnums-ocaml
+Replaces: ocaml-interp (<< 3.11.1-3)
+Breaks: ocaml-interp (<< 3.11.1-3)
 Description: Runtime system for OCaml bytecode executables (no X)
  Objective Caml (OCaml) is an implementation of the ML language, based on
  the Caml Light dialect extended with a complete class-based object system
@@ -247,8 +234,6 @@ Depends:
 Provides:
  ocaml-interp-${F:OCamlABI}
 Recommends: ledit | readline-editor
-Replaces: ocaml (<< 3.07.2a-3)
-Conflicts: ocaml (<< 3.07.2a-3)
 Description: OCaml interactive interpreter and standard libraries
  Objective Caml (OCaml) is an implementation of the ML language, based on
  the Caml Light dialect extended with a complete class-based object system
@@ -282,7 +267,6 @@ Depends:
  ${shlibs:Depends},
  ${misc:Depends}
 Suggests: ocaml
-Conflicts: ocaml-nox (<< 3.08.3-8)
 Description: A major mode for editing Objective Caml in Emacs
  Objective (OCaml) is an implementation of the ML language, based on
  the Caml Light dialect extended with a complete class-based object system