Synchronize debian/control and debian/control.in

diff --git a/debian/changelog b/debian/changelog
index 66a98ae6f4150fbb3b7d0095a5490ce0ed3284fc..348e9f967ecf58bc0d42821bd6906ceece6204c5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ocaml (3.11.1-3) UNRELEASED; urgency=low
     - ocamlbyteinfo to read content of bytecode binaries
     - ocamlplugininfo to read content of shared object files (.cmxs)
   * Move some files from ocaml-interp to ocaml-nox and ocaml-base-nox
+  * Synchronize debian/control and debian/control.in
   * Add myself to Uploaders
 
  -- Mehdi Dogguy <dogguy@pps.jussieu.fr>  Tue, 21 Jul 2009 17:09:31 +0200

diff --git a/debian/control.in b/debian/control.in
index ce3144c3462d8a3bcea90db01dba7620a6f81d30..0966b07f49a50d6cd346f1a7949f34fd37751426 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -18,10 +18,8 @@ Build-Depends:
  libgdbm-dev,
  quilt,
  bzip2,
- docbook-xml,
- docbook-utils,
  dh-ocaml (>= 0.4)
-Standards-Version: 3.8.0
+Standards-Version: 3.8.2
 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
 Homepage: http://caml.inria.fr/
@@ -106,7 +104,7 @@ Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
- ocaml-nox (= ${binary:Version})
+ ocaml-nox (= ${binary:Version}),
  camlp4 (= ${binary:Version})
 Description: Pre Processor Pretty Printer for OCaml - extras
  Objective Caml (OCaml) is an implementation of the ML language,
@@ -240,7 +238,7 @@ Depends:
  ocaml-base-nox (= ${binary:Version}),
  ${shlibs:Depends},
  ${misc:Depends}
-Recommends: ledit | rlwrap
+Recommends: ledit | readline-editor
 Replaces: ocaml (<< 3.07.2a-3)
 Conflicts: ocaml (<< 3.07.2a-3)
 Description: OCaml interactive interpreter and standard libraries

diff --git a/debian/rules b/debian/rules
index 44c42d9173db92e32bc034c7f82f628dbda41efe..c81234d4396f45a6cf58478479180c1dca559eec 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -54,6 +54,7 @@ ocamlinit-stamp: debian/$(SRCTARBALL)
 
 # Generate ocaml-native-compilers' Architecture field.
 # Should never be called automatically.
+.PHONY: debian/control
 debian/control:
        sed -e 's/@OCamlNativeArchs@/$(OCAML_NATIVE_ARCHS)/g' debian/control.in > $@