* libgraphics.a is built for ocamlc, not ocamlopt. Install it

  unconditionally in the ocaml package.  Have ocaml replace ocaml-nox
  because of this move (closes: #457569).  Thanks, Peter Palfrader!

diff --git a/debian/changelog b/debian/changelog
index e5b89919323ef4d613bd0896cbf880aa27bb3d35..6485b7102d32bb3891795057a9cd1b29af54f818 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ocaml (3.10.0-12) UNRELEASED; urgency=low
+
+  * libgraphics.a is built for ocamlc, not ocamlopt.  Install it
+    unconditionally in the ocaml package.  Have ocaml replace ocaml-nox
+    because of this move (closes: #457569).  Thanks, Peter Palfrader!
+
+ -- Julien Cristau <jcristau@debian.org>  Mon, 24 Dec 2007 00:47:43 +0100
+
 ocaml (3.10.0-11) unstable; urgency=low
 
   [ Stefano Zacchiroli ]

diff --git a/debian/control b/debian/control
index 5a45cf1922cf34a0c677cd0f87f6e7cb0ea3da6d..1ee3ec55d612e407dcbd96babbb4b0e9e2c682d2 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -82,6 +82,7 @@ Architecture: any
 Depends: ocaml-base (= ${binary:Version}), ocaml-base-${F:OCamlABI}, ocaml-nox-${F:OCamlABI}
 Suggests: tcl8.4-dev, tk8.4-dev
 Provides: ocaml-${F:OCamlABI}
+Replaces: ocaml-nox (<< 3.10.0-12)
 Description: ML language implementation with a class-based object system
  Objective Caml (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/ocaml-nox.optfiles.in b/debian/ocaml-nox.optfiles.in
index 3871d144338f424d83b4d2fffab7caf34a66899b..1622f996e9ff84ebf0a3c49298cf8aa509d043b6 100644 (file)
--- a/debian/ocaml-nox.optfiles.in
+++ b/debian/ocaml-nox.optfiles.in
@@ -1,5 +1,4 @@
 usr/bin/labltk
-usr/lib/ocaml/#OcamlABI#/libgraphics.a
 usr/lib/ocaml/#OcamlABI#/labltk
 usr/lib/ocaml/#OcamlABI#/graphics.cmx
 usr/lib/ocaml/#OcamlABI#/graphics.cmxa

diff --git a/debian/ocaml.files.in b/debian/ocaml.files.in
index bfb4bede74017cd7024e66f27277c496a4d196b0..d7c4e14c1065fb918924fd26aeb278725140b186 100644 (file)
--- a/debian/ocaml.files.in
+++ b/debian/ocaml.files.in
@@ -6,3 +6,4 @@ usr/lib/ocaml/#OcamlABI#/graphicsX11.cmi
 usr/lib/ocaml/#OcamlABI#/graphics.mli
 usr/lib/ocaml/#OcamlABI#/graphicsX11.mli
 usr/lib/ocaml/#OcamlABI#/labltk
+usr/lib/ocaml/#OcamlABI#/libgraphics.a