[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.11.0-5-20-gbc78019
Stephane Glondu
steph at glondu.net
Sun Jun 7 14:09:28 UTC 2009
The following commit has been merged in the master branch:
commit bc78019ac79633b6ea6c3268994779c8d32f8b7e
Author: Stephane Glondu <steph at glondu.net>
Date: Sun Jun 7 16:08:41 2009 +0200
Various updates
diff --git a/debian/changelog b/debian/changelog
index c2daba0..671b3a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,20 +5,21 @@ ocaml (3.11.1~rc1-1) UNRELEASED; urgency=low
(Closes: #519916)
[ Stefano Zacchiroli ]
- * debian/control
+ * debian/control:
- remove recommends to ledit from ocaml-nox (does not ship "ocaml")
- - change recommends from ledit to "ledit | rlwrap" for ocaml-interp
- * debian/patches/
- - add new patch ocamldoc_natdynlink (from upstream): enable
- dynamic loading of ocamldoc custom printers also for ocamldoc.opt
[ Stephane Glondu ]
* New upstream release candidate:
- remove dbm_ldopts.dpatch (merged upstream)
- - remove ocamldoc_natdynlink.dpatch (merged upstream)
- switch patch system to quilt
+ * debian/control:
+ - update Standards-Version to 3.8.1
+ - move to new section ocaml
+ - change Recommends from ledit to "ledit | readline-editor" for
+ ocaml-interp
+ - remove various obsolete Conflicts and Replaces
- -- Stephane Glondu <steph at glondu.net> Wed, 03 Jun 2009 13:16:25 +0200
+ -- Stephane Glondu <steph at glondu.net> Sun, 07 Jun 2009 16:07:40 +0200
ocaml (3.11.0-5) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 60a9950..e5c2afd 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
Source: ocaml
-Section: devel
+Section: ocaml
Priority: optional
Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
Uploaders:
@@ -20,7 +20,7 @@ Build-Depends:
docbook-xml,
docbook-utils,
dh-ocaml (>= 0.4)
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
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/
@@ -45,12 +45,10 @@ Provides:
libnums-ocaml-dev
Replaces:
camlp4 (<< 3.10.0),
- focaml (<< 3.07.2a-3),
libnums-ocaml-dev
Conflicts:
camlp4 (<< 3.10.0),
camlidl (<< 1.04),
- ocaml (<< 3.07.2a-3),
libnums-ocaml-dev
Description: ML implementation with a class-based object system (no X)
Objective Caml (OCaml) is an implementation of the ML language, based on
@@ -162,8 +160,6 @@ Provides: ocaml-base-nox-${F:OCamlABI}, libnums-ocaml
Depends:
${shlibs:Depends},
${misc:Depends}
-Replaces: ocaml-base (<< 3.07.2a-3), libnums-ocaml
-Conflicts: ocaml (<< 3.04-2), ocaml-base (<< 3.07.2a-3), libnums-ocaml
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
@@ -230,9 +226,7 @@ Depends:
ocaml-base-nox (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
-Recommends: ledit | rlwrap
-Replaces: ocaml (<< 3.07.2a-3)
-Conflicts: ocaml (<< 3.07.2a-3)
+Recommends: ledit | readline-editor
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
--
OCaml packaging
More information about the Pkg-ocaml-maint-commits
mailing list