Add Replaces, lintian-overrides to d/control, reduce dpkg-gencontrol warnings

diff --git a/debian/control b/debian/control
index c1305ee3a9ffe699cfd576df43c478b8cbff6ba2..fc3c50b8561015071a4870449968e5e580839af4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -46,7 +46,7 @@ Suggests:
 Recommends:
  camlp4,
  file
-Replaces: ocaml-interp (<< 3.11.1-3)
+Replaces: ocaml-interp (<< 3.11.1-3), ocaml-native-compilers (<< 4.04.0-1)
 Breaks:
  dh-ocaml (<< 1.0.0),
  ocaml-interp (<< 3.11.1-3),
@@ -79,7 +79,6 @@ Package: ocaml
 Architecture: any
 Depends:
  ocaml-base-nox,
- ${shlibs:Depends},
  ${misc:Depends},
  ${ocaml:Depends},
  libx11-dev
@@ -112,9 +111,8 @@ Description: ML language implementation with a class-based object system
 Package: ocaml-base-nox
 Architecture: any
 Depends:
- ${shlibs:Depends},
  ${misc:Depends},
- ${ocaml:Depends}
+ ${shlibs:Depends},
 Provides:
  ${ocaml:Provides}
 Replaces: ocaml-interp (<< 3.11.1-3)
@@ -165,7 +163,6 @@ Architecture: any
 Depends:
  ocaml-compiler-libs (= ${binary:Version}),
  ${ocaml:Depends},
- ${shlibs:Depends},
  ${misc:Depends}
 Provides:
  ocaml-interp-${F:OCamlABI}
@@ -181,8 +178,6 @@ Description: OCaml interactive interpreter and standard libraries
 Package: ocaml-compiler-libs
 Architecture: any
 Depends:
- ${ocaml:Depends},
- ${shlibs:Depends},
  ${misc:Depends},
  ocaml-nox-${F:OCamlABI}
 Provides:
@@ -202,7 +197,6 @@ Package: ocaml-mode
 Architecture: all
 Depends:
  emacs | emacsen, emacsen-common (>= 2.0.8),
- ${shlibs:Depends},
  ${misc:Depends}
 Suggests: ocaml
 Description: major mode for editing Objective Caml in Emacs

diff --git a/debian/control.in b/debian/control.in
index ba3dae372acab5c7ec4058d9a7a56320c909293b..fc3c50b8561015071a4870449968e5e580839af4 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -37,7 +37,7 @@ Depends:
  binutils
 Provides:
  ${ocaml:Provides},
- ocaml-best-compilers,
+ ocaml-best-compilers (= ${binary:Version}),
  ${F:NativeProvides},
  libnums-ocaml-dev
 Suggests:
@@ -46,7 +46,7 @@ Suggests:
 Recommends:
  camlp4,
  file
-Replaces: ocaml-interp (<< 3.11.1-3)
+Replaces: ocaml-interp (<< 3.11.1-3), ocaml-native-compilers (<< 4.04.0-1)
 Breaks:
  dh-ocaml (<< 1.0.0),
  ocaml-interp (<< 3.11.1-3),
@@ -79,7 +79,6 @@ Package: ocaml
 Architecture: any
 Depends:
  ocaml-base-nox,
- ${shlibs:Depends},
  ${misc:Depends},
  ${ocaml:Depends},
  libx11-dev
@@ -112,9 +111,8 @@ Description: ML language implementation with a class-based object system
 Package: ocaml-base-nox
 Architecture: any
 Depends:
- ${shlibs:Depends},
  ${misc:Depends},
- ${ocaml:Depends}
+ ${shlibs:Depends},
 Provides:
  ${ocaml:Provides}
 Replaces: ocaml-interp (<< 3.11.1-3)
@@ -165,7 +163,6 @@ Architecture: any
 Depends:
  ocaml-compiler-libs (= ${binary:Version}),
  ${ocaml:Depends},
- ${shlibs:Depends},
  ${misc:Depends}
 Provides:
  ocaml-interp-${F:OCamlABI}
@@ -181,8 +178,6 @@ Description: OCaml interactive interpreter and standard libraries
 Package: ocaml-compiler-libs
 Architecture: any
 Depends:
- ${ocaml:Depends},
- ${shlibs:Depends},
  ${misc:Depends},
  ocaml-nox-${F:OCamlABI}
 Provides:
@@ -202,7 +197,6 @@ Package: ocaml-mode
 Architecture: all
 Depends:
  emacs | emacsen, emacsen-common (>= 2.0.8),
- ${shlibs:Depends},
  ${misc:Depends}
 Suggests: ocaml
 Description: major mode for editing Objective Caml in Emacs

diff --git a/debian/ocaml-nox.lintian-overrides.in b/debian/ocaml-nox.lintian-overrides.in
index e14317894c0e9a62666acdd729fe26f98952c214..084588410428d464766b28dce37ebebd59e19565 100644 (file)
--- a/debian/ocaml-nox.lintian-overrides.in
+++ b/debian/ocaml-nox.lintian-overrides.in
@@ -1 +1,3 @@
 ocaml-nox: script-not-executable .@OCamlStdlibDir@/camlheader
+ocaml-nox: binary-without-manpage usr/bin/ocaml*.byte
+ocaml-nox: binary-without-manpage usr/bin/ocaml*.opt

diff --git a/debian/rules b/debian/rules
index f3acc20c6da497ac218ce2fe423f0d8cdc7a3b2b..842ac388f6edf7ad0e16a2dcb183fc7c8d97a397 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -241,7 +241,7 @@ endif
 
 .PHONY: override_dh_gencontrol
 override_dh_gencontrol:
-       for u in $(ALL_PACKAGES); do \
+       for u in ocaml-source ocaml-interp ocaml-compiler-libs; do \
          echo 'F:OCamlABI=$(OCAML_ABI)' >> debian/$$u.substvars; \
        done
 ifeq (,$(OCAML_OPT_ARCH))